From 88cc2bcdb995d1810905c848d2afa60fa458ff4d Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 30 Apr 2013 21:37:58 +0200 Subject: [PATCH] Update apr_util recipe * Rename patch to match package name. * Specify patch explicitly. Previously patch wasn't picked up anymore due to its name not matching the package name. * Add cmd:apu_1_config to provides. * Move patch command from BUILD to PATCH. * Use runConfigure. * Use jobArgs. * Fix developLibDir paths in apu-1-config. * Patch build/apu-conf.m4 so the correct include and library path is used for expat. * Remove old patches. --- dev-libs/apr_util/apr_util-1.4.1.recipe | 24 +++++++--- .../patches/apr-util-0.9.x-haiku.diff | 24 ---------- dev-libs/apr_util/patches/apr-util-0.9.x.diff | 13 ------ .../apr_util/patches/apr-util-1.3.10.patch | 27 ----------- .../apr_util/patches/apr-util-1.3.11.patch | 27 ----------- .../apr_util/patches/apr-util-1.3.12.patch | 27 ----------- .../apr_util/patches/apr-util-1.4.1.patch | 27 ----------- .../apr_util/patches/apr_util-1.4.1.patch | 45 +++++++++++++++++++ 8 files changed, 62 insertions(+), 152 deletions(-) delete mode 100644 dev-libs/apr_util/patches/apr-util-0.9.x-haiku.diff delete mode 100644 dev-libs/apr_util/patches/apr-util-0.9.x.diff delete mode 100644 dev-libs/apr_util/patches/apr-util-1.3.10.patch delete mode 100644 dev-libs/apr_util/patches/apr-util-1.3.11.patch delete mode 100644 dev-libs/apr_util/patches/apr-util-1.3.12.patch delete mode 100644 dev-libs/apr_util/patches/apr-util-1.4.1.patch create mode 100644 dev-libs/apr_util/patches/apr_util-1.4.1.patch diff --git a/dev-libs/apr_util/apr_util-1.4.1.recipe b/dev-libs/apr_util/apr_util-1.4.1.recipe index bb4b7243e..9eb2a0d83 100644 --- a/dev-libs/apr_util/apr_util-1.4.1.recipe +++ b/dev-libs/apr_util/apr_util-1.4.1.recipe @@ -4,11 +4,14 @@ SRC_URI="http://archive.apache.org/dist/apr/apr-util-1.4.1.tar.gz" LICENSE="Apache v2" COPYRIGHT="2011 The Apache Software Foundation." CHECKSUM_MD5="666a5d56098a9debf998510e304c8095" -REVISION="1" +REVISION="2" ARCHITECTURES="x86_gcc2 ?x86" +PATCHES="apr_util-1.4.1.patch" + PROVIDES=" apr_util = $portVersion compat >= 1 + cmd:apu_1_config = $portVersion compat >= 1 lib:libaprutil = $portVersion compat >= 1 lib:libaprutil_1 = $portVersion compat >= 1 " @@ -33,20 +36,24 @@ BUILD_PREREQUIRES=" SOURCE_DIR="$portVersionedName" +PATCH() +{ + echo 'AM_INIT_AUTOMAKE' >> xml/expat/configure.in +} + BUILD() { - aprUtilPackageLinksDir=$(finddir B_PACKAGE_LINKS_DIRECTORY)/$portRevisionedName - aprInstallDir=$aprUtilPackageLinksDir/apr - expatInstallDir=$aprUtilPackageLinksDir/expat + aprInstallDir=$portPackageLinksDir/apr + expatInstallDir=$portPackageLinksDir/expat rm -rf aclocal.m4 mkdir -p m4 libtoolize -fci aclocal --install -I m4 autoconf -f + cd xml/expat mkdir -p m4 - echo 'AM_INIT_AUTOMAKE' >> configure.in libtoolize -fci aclocal --install -I m4 autoconf --force @@ -58,10 +65,10 @@ BUILD() cp /boot/common/bin/libtool . ln -sfn $sourceDir/libtool /libtool - ./configure $configureDirArgs \ + runConfigure ./configure \ --with-apr=$aprInstallDir \ --with-expat=$expatInstallDir - make + make $jobArgs } INSTALL() @@ -71,6 +78,9 @@ INSTALL() # prepare develop/lib prepareInstalledDevelLibs libaprutil-1 fixPkgconfig + + # fix apu-1-config + fixDevelopLibDirReferences $binDir/apu-1-config } DESCRIPTION=" diff --git a/dev-libs/apr_util/patches/apr-util-0.9.x-haiku.diff b/dev-libs/apr_util/patches/apr-util-0.9.x-haiku.diff deleted file mode 100644 index 3c692e083..000000000 --- a/dev-libs/apr_util/patches/apr-util-0.9.x-haiku.diff +++ /dev/null @@ -1,24 +0,0 @@ -diff -u apr-util-0.9.15-orig/config.layout apr-util-0.9.15/config.layout ---- apr-util-0.9.15-orig/config.layout 2004-11-24 23:45:40.000000000 +0000 -+++ apr-util-0.9.15/config.layout 2008-05-14 15:03:22.000000000 +0000 -@@ -229,3 +229,20 @@ - infodir: ${exec_prefix}/share/info - libsuffix -${APRUTIL_MAJOR_VERSION} - -+ -+# Haiku layout -+ -+ prefix: /boot/common -+ exec_prefix: ${prefix} -+ bindir: ${exec_prefix}/bin -+ sbindir: ${exec_prefix}/bin -+ libdir: ${exec_prefix}/lib -+ libexecdir: ${exec_prefix}/bin -+ mandir: ${prefix}/man -+ sysconfdir: ${prefix}/conf -+ datadir: ${prefix} -+ installbuilddir: ${datadir}/build -+ includedir: ${prefix}/include/apr-${APRUTIL_MAJOR_VERSION} -+ localstatedir: ${prefix} -+ libsuffix: -${APRUTIL_MAJOR_VERSION} -+ diff --git a/dev-libs/apr_util/patches/apr-util-0.9.x.diff b/dev-libs/apr_util/patches/apr-util-0.9.x.diff deleted file mode 100644 index 804a56435..000000000 --- a/dev-libs/apr_util/patches/apr-util-0.9.x.diff +++ /dev/null @@ -1,13 +0,0 @@ -Index: configure.in -=================================================================== ---- configure.in (revision 645316) -+++ configure.in (working copy) -@@ -145,7 +145,7 @@ - dnl ### apr and expat libraries to the build or it'll die a truly horrible - dnl ### death. We now use the apr-config tool to determine the correct - dnl ### library to link against :) --*AIX*|*Darwin*|*BeOS*|CYGWIN*) -+*AIX*|*Darwin*|*BeOS*|*Haiku*|CYGWIN*) - dnl need such stuff as -liconv to be specified when building libaprutil.la - EXTRA_OS_LINK='$(APRUTIL_LDFLAGS) $(APRUTIL_LIBS)' - ;; diff --git a/dev-libs/apr_util/patches/apr-util-1.3.10.patch b/dev-libs/apr_util/patches/apr-util-1.3.10.patch deleted file mode 100644 index 638694741..000000000 --- a/dev-libs/apr_util/patches/apr-util-1.3.10.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -urN apr-util-1.3.10/config.layout apr-util-1.3.10-haiku/config.layout ---- apr-util-1.3.10/config.layout 2005-02-09 12:18:43.049283072 +0000 -+++ apr-util-1.3.10-haiku/config.layout 2011-03-25 11:04:46.549453824 +0000 -@@ -60,6 +60,23 @@ - runtimedir: ${localstatedir}/run - - -+# Haiku Layout making use of finddir -+ -+ prefix: /boot/common -+ exec_prefix: /boot/common -+ bindir: /boot/common/bin -+ sbindir: /boot/common/servers -+ libdir: /boot/common/lib -+ libexecdir: /boot/common/servers -+ mandir: /boot/common/documentation/man -+ sysconfdir: /boot/common/settings -+ datadir: /boot/common/data -+ installbuilddir: /boot/develop/build -+ includedir: /boot/common/include -+ localstatedir: /boot/common/var -+ runtimedir: ${localstatedir}/log -+ -+ - # Mac OS X Server (Rhapsody) - - prefix: /Local/Library/WebServer diff --git a/dev-libs/apr_util/patches/apr-util-1.3.11.patch b/dev-libs/apr_util/patches/apr-util-1.3.11.patch deleted file mode 100644 index 26633b67c..000000000 --- a/dev-libs/apr_util/patches/apr-util-1.3.11.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -urN apr-util-1.3.11/config.layout apr-util-1.3.11-haiku/config.layout ---- apr-util-1.3.11/config.layout 2005-02-09 12:18:43.049283072 +0000 -+++ apr-util-1.3.11-haiku/config.layout 2011-03-25 11:04:46.549453824 +0000 -@@ -60,6 +60,23 @@ - runtimedir: ${localstatedir}/run - - -+# Haiku Layout making use of finddir -+ -+ prefix: /boot/common -+ exec_prefix: /boot/common -+ bindir: /boot/common/bin -+ sbindir: /boot/common/servers -+ libdir: /boot/common/lib -+ libexecdir: /boot/common/servers -+ mandir: /boot/common/documentation/man -+ sysconfdir: /boot/common/settings -+ datadir: /boot/common/data -+ installbuilddir: /boot/develop/build -+ includedir: /boot/common/include -+ localstatedir: /boot/common/var -+ runtimedir: ${localstatedir}/log -+ -+ - # Mac OS X Server (Rhapsody) - - prefix: /Local/Library/WebServer diff --git a/dev-libs/apr_util/patches/apr-util-1.3.12.patch b/dev-libs/apr_util/patches/apr-util-1.3.12.patch deleted file mode 100644 index c9873f4b3..000000000 --- a/dev-libs/apr_util/patches/apr-util-1.3.12.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -urN apr-util-1.3.12/config.layout apr-util-1.3.12-haiku/config.layout ---- apr-util-1.3.12/config.layout 2005-02-09 12:18:43.049283072 +0000 -+++ apr-util-1.3.12-haiku/config.layout 2011-03-25 11:04:46.549453824 +0000 -@@ -60,6 +60,23 @@ - runtimedir: ${localstatedir}/run - - -+# Haiku Layout making use of finddir -+ -+ prefix: /boot/common -+ exec_prefix: /boot/common -+ bindir: /boot/common/bin -+ sbindir: /boot/common/servers -+ libdir: /boot/common/lib -+ libexecdir: /boot/common/servers -+ mandir: /boot/common/documentation/man -+ sysconfdir: /boot/common/settings -+ datadir: /boot/common/data -+ installbuilddir: /boot/develop/build -+ includedir: /boot/common/include -+ localstatedir: /boot/common/var -+ runtimedir: ${localstatedir}/log -+ -+ - # Mac OS X Server (Rhapsody) - - prefix: /Local/Library/WebServer diff --git a/dev-libs/apr_util/patches/apr-util-1.4.1.patch b/dev-libs/apr_util/patches/apr-util-1.4.1.patch deleted file mode 100644 index 799676743..000000000 --- a/dev-libs/apr_util/patches/apr-util-1.4.1.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -urN apr-util-1.4.1/config.layout apr-util-1.4.1-haiku/config.layout ---- apr-util-1.4.1/config.layout 2005-02-09 12:18:43.049283072 +0000 -+++ apr-util-1.4.1-haiku/config.layout 2011-03-25 11:04:46.549453824 +0000 -@@ -60,6 +60,23 @@ - runtimedir: ${localstatedir}/run - - -+# Haiku Layout making use of finddir -+ -+ prefix: /boot/common -+ exec_prefix: /boot/common -+ bindir: /boot/common/bin -+ sbindir: /boot/common/servers -+ libdir: /boot/common/lib -+ libexecdir: /boot/common/servers -+ mandir: /boot/common/documentation/man -+ sysconfdir: /boot/common/settings -+ datadir: /boot/common/data -+ installbuilddir: /boot/develop/build -+ includedir: /boot/common/include -+ localstatedir: /boot/common/var -+ runtimedir: ${localstatedir}/log -+ -+ - # Mac OS X Server (Rhapsody) - - prefix: /Local/Library/WebServer diff --git a/dev-libs/apr_util/patches/apr_util-1.4.1.patch b/dev-libs/apr_util/patches/apr_util-1.4.1.patch new file mode 100644 index 000000000..64006262e --- /dev/null +++ b/dev-libs/apr_util/patches/apr_util-1.4.1.patch @@ -0,0 +1,45 @@ +diff -ur orig/apr-util-1.4.1/build/apu-conf.m4 apr_util-1.4.1/build/apu-conf.m4 +--- orig/apr-util-1.4.1/build/apu-conf.m4 2011-08-08 11:32:27.026738688 +0200 ++++ apr_util-1.4.1/build/apu-conf.m4 2013-04-30 21:28:37.100401152 +0200 +@@ -145,10 +145,10 @@ + else + # Add given path to standard search paths if appropriate: + if test "$withval" != "/usr"; then +- APR_ADDTO(LDFLAGS, [-L$withval/lib]) +- APR_ADDTO(CPPFLAGS, [-I$withval/include]) +- APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/include]) +- APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib]) ++ APR_ADDTO(LDFLAGS, [-L$withval/develop/lib]) ++ APR_ADDTO(CPPFLAGS, [-I$withval/develop/headers]) ++ APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/develop/headers]) ++ APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/develop/lib]) + fi + # ...and refuse to fall back on the builtin expat. + apu_try_builtin_expat=0 +diff -ur orig/apr-util-1.4.1/config.layout apr_util-1.4.1/config.layout +--- orig/apr-util-1.4.1/config.layout 2005-02-09 13:18:43.064749568 +0100 ++++ apr_util-1.4.1/config.layout 2013-04-30 21:27:27.079953920 +0200 +@@ -60,6 +60,23 @@ + runtimedir: ${localstatedir}/run + + ++# Haiku Layout making use of finddir ++ ++ prefix: /boot/common ++ exec_prefix: /boot/common ++ bindir: /boot/common/bin ++ sbindir: /boot/common/servers ++ libdir: /boot/common/lib ++ libexecdir: /boot/common/servers ++ mandir: /boot/common/documentation/man ++ sysconfdir: /boot/common/settings ++ datadir: /boot/common/data ++ installbuilddir: /boot/develop/build ++ includedir: /boot/common/include ++ localstatedir: /boot/common/var ++ runtimedir: ${localstatedir}/log ++ ++ + # Mac OS X Server (Rhapsody) + + prefix: /Local/Library/WebServer