From 1cf9e2843a5ab4e814f502cd3d5fee0b5fe6a9a6 Mon Sep 17 00:00:00 2001 From: "Philip M. Gollucci" Date: Wed, 20 Oct 2010 21:16:45 +0000 Subject: - Update to apr: 0.9.19, apr-util 0.9.19 Security: http://www.vuxml.org/freebsd/dd943fbb-d0fe-11df-95a8-00219b0fc4d8.html Changes: http://www.apache.org/dist/apr/CHANGES-APR-0.9 Changes: http://www.apache.org/dist/apr/CHANGES-APR-UTIL-0.9 With Hat: apache@ --- devel/apr0/Makefile | 40 +---------- devel/apr0/distinfo | 12 ++-- .../files/patch-apr-0.9.18__build__buildcheck.sh | 11 --- devel/apr0/files/patch-apr-0.9.18__config.layout | 10 --- devel/apr0/files/patch-apr-0.9.18__configure.in | 43 ------------ .../patch-apr-0.9.18__threadproc__unix__procsup.c | 18 ----- .../files/patch-apr-0.9.19__build__buildcheck.sh | 11 +++ devel/apr0/files/patch-apr-0.9.19__buildconf | 75 ++++++++++++++++++++ devel/apr0/files/patch-apr-0.9.19__config.layout | 10 +++ devel/apr0/files/patch-apr-0.9.19__configure.in | 43 ++++++++++++ .../patch-apr-0.9.19__threadproc__unix__procsup.c | 18 +++++ .../files/patch-apr-util-0.9.17__build__dbm.m4 | 80 ---------------------- .../files/patch-apr-util-0.9.17__config.layout | 10 --- .../files/patch-apr-util-0.9.19__config.layout | 10 +++ devel/apr0/files/patch-apr_buildconf | 75 -------------------- 15 files changed, 175 insertions(+), 291 deletions(-) delete mode 100644 devel/apr0/files/patch-apr-0.9.18__build__buildcheck.sh delete mode 100644 devel/apr0/files/patch-apr-0.9.18__config.layout delete mode 100644 devel/apr0/files/patch-apr-0.9.18__configure.in delete mode 100644 devel/apr0/files/patch-apr-0.9.18__threadproc__unix__procsup.c create mode 100644 devel/apr0/files/patch-apr-0.9.19__build__buildcheck.sh create mode 100644 devel/apr0/files/patch-apr-0.9.19__buildconf create mode 100644 devel/apr0/files/patch-apr-0.9.19__config.layout create mode 100644 devel/apr0/files/patch-apr-0.9.19__configure.in create mode 100644 devel/apr0/files/patch-apr-0.9.19__threadproc__unix__procsup.c delete mode 100644 devel/apr0/files/patch-apr-util-0.9.17__build__dbm.m4 delete mode 100644 devel/apr0/files/patch-apr-util-0.9.17__config.layout create mode 100644 devel/apr0/files/patch-apr-util-0.9.19__config.layout delete mode 100644 devel/apr0/files/patch-apr_buildconf (limited to 'devel/apr0') diff --git a/devel/apr0/Makefile b/devel/apr0/Makefile index 73a805b25026..3d8b333f6626 100644 --- a/devel/apr0/Makefile +++ b/devel/apr0/Makefile @@ -6,7 +6,6 @@ PORTNAME= apr PORTVERSION= ${APR_VERSION}.${APU_VERSION} -PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_APACHE} MASTER_SITE_SUBDIR= apr @@ -27,8 +26,8 @@ OPTIONS= THREADS "Enable Threads in apr" on \ NDBM "Enable NDBM support in apr-util" off \ DEVRANDOM "Use /dev/random or compatible in apr" on -APR_VERSION= 0.9.18 -APU_VERSION= 0.9.17 +APR_VERSION= 0.9.19 +APU_VERSION= 0.9.19 NO_LATEST_LINK= yes @@ -58,11 +57,6 @@ APU_CONF_ARGS= --with-apr=${APR_WRKDIR} \ ########## APR Options .if defined(WITHOUT_THREADS) APR_CONF_ARGS+= --disable-threads -.if defined(PKGNAMESUFFIX) -PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-nothr -.else -PKGNAMESUFFIX= -nothr -.endif .else APR_CONF_ARGS+= --enable-threads .endif @@ -71,22 +65,12 @@ APR_CONF_ARGS+= --enable-threads APR_CONF_ARGS+= --disable-ipv6 .else APR_CONF_ARGS+= --enable-ipv6 -.if defined(PKGNAMESUFFIX) -PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-ipv6 -.else -PKGNAMESUFFIX= -ipv6 -.endif .endif .if defined(WITHOUT_DEVRANDOM) APR_CONF_ARGS+= --without-devrandom .else APR_CONF_ARGS+= --with-devrandom -.if defined(PKGNAMESUFFIX) -PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-devrandom -.else -PKGNAMESUFFIX= -devrandom -.endif .endif ######### APR-Util Options @@ -97,11 +81,6 @@ APU_CONF_ARGS+= --without-gdbm PLIST_SUB+= GDBM="" LIB_DEPENDS+= gdbm.3:${PORTSDIR}/databases/gdbm APU_CONF_ARGS+= --with-gdbm=${LOCALBASE} -.if defined(PKGNAMESUFFIX) -PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-gdbm -.else -PKGNAMESUFFIX= -gdbm -.endif .endif .if defined(WITHOUT_BDB) @@ -112,21 +91,11 @@ PLIST_SUB+= BDB="" USE_BDB= 42+ INVALID_BDB_VER= 50 APU_CONF_ARGS+= --with-berkeley-db=${BDB_INCLUDE_DIR}:${BDB_LIB_DIR} -.if defined(PKGNAMESUFFIX) -PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-${BDB_INCLUDE_DIR:S,^${LOCALBASE}/include/,,} -.else -PKGNAMESUFFIX= -${BDB_INCLUDE_DIR:S,^${LOCALBASE}/include/,,} -.endif .endif .if defined(WITH_NDBM) PLIST_SUB+= NDBM="" APU_CONF_ARGS+= --with-ndbm=/usr -.if defined(PKGNAMESUFFIX) -PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-ndbm -.else -PKGNAMESUFFIX= -ndbm -.endif .else PLIST_SUB+= NDBM="@comment " APU_CONF_ARGS+= --without-ndbm @@ -137,11 +106,6 @@ PLIST_SUB+= LDAP="" USE_OPENLDAP= yes APU_CONF_ARGS+= --with-ldap-include=${LOCALBASE}/include \ --with-ldap-lib=${LOCALBASE}/lib --with-ldap=ldap -.if defined(PKGNAMESUFFIX) -PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-ldap${OPENLDAP_VER} -.else -PKGNAMESUFFIX= -ldap -.endif .else PLIST_SUB+= LDAP="@comment " .endif diff --git a/devel/apr0/distinfo b/devel/apr0/distinfo index 5327bb44f52a..7df24ad8425b 100644 --- a/devel/apr0/distinfo +++ b/devel/apr0/distinfo @@ -1,6 +1,6 @@ -MD5 (apr-0.9.18.tar.gz) = d5e7642baf892fb532968340f37aeabb -SHA256 (apr-0.9.18.tar.gz) = dad08e2156f3d5dd31f2d9cc24f9dfbcf952531077b7fae2b7f0ae50e2de7cc6 -SIZE (apr-0.9.18.tar.gz) = 1074982 -MD5 (apr-util-0.9.17.tar.gz) = 2d819c1c95e324f4fb05d13cac008fc8 -SHA256 (apr-util-0.9.17.tar.gz) = 7b994cf80e54104f0f19eb35a8d4fafe4f90b383b0303f1184218448d276a4e1 -SIZE (apr-util-0.9.17.tar.gz) = 613970 +MD5 (apr-0.9.19.tar.gz) = 65f48c67b92f6bd669fae6fe1a418cec +SHA256 (apr-0.9.19.tar.gz) = bd2124a53fdc2a3ff2868554bef6381b96a1f9e0bdb20d1a71dbe5497025c8e4 +SIZE (apr-0.9.19.tar.gz) = 1068153 +MD5 (apr-util-0.9.19.tar.gz) = 56c6ab1f728dae7528ffaef62ddc6fbf +SHA256 (apr-util-0.9.19.tar.gz) = 9ffa9f5a1a0d2eddddd1c114e99a8f5e49aa8018db6f0bc6eeab4724d9eaa085 +SIZE (apr-util-0.9.19.tar.gz) = 591729 diff --git a/devel/apr0/files/patch-apr-0.9.18__build__buildcheck.sh b/devel/apr0/files/patch-apr-0.9.18__build__buildcheck.sh deleted file mode 100644 index 59898637b6e5..000000000000 --- a/devel/apr0/files/patch-apr-0.9.18__build__buildcheck.sh +++ /dev/null @@ -1,11 +0,0 @@ ---- ./apr-0.9.18/build/buildcheck.sh.orig 2004-11-24 18:10:04.000000000 -0500 -+++ ./apr-0.9.18/build/buildcheck.sh 2010-05-13 16:34:13.409617834 -0400 -@@ -26,7 +26,7 @@ - # output is multiline from 1.5 onwards - - # Require libtool 1.3.3 or newer --libtool=`build/PrintPath glibtool libtool` -+libtool=${LIBTOOL} - lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'` - if test -z "$lt_pversion"; then - echo "buildconf: libtool not found." diff --git a/devel/apr0/files/patch-apr-0.9.18__config.layout b/devel/apr0/files/patch-apr-0.9.18__config.layout deleted file mode 100644 index 26ca03741d1b..000000000000 --- a/devel/apr0/files/patch-apr-0.9.18__config.layout +++ /dev/null @@ -1,10 +0,0 @@ ---- ./apr-0.9.18/config.layout.orig 2004-11-24 18:02:04.000000000 -0500 -+++ ./apr-0.9.18/config.layout 2010-05-13 16:34:13.416618739 -0400 -@@ -229,3 +229,7 @@ - infodir: ${exec_prefix}/share/info - libsuffix: -${APR_MAJOR_VERSION} - -+ -+ -+ libsuffix: -+ diff --git a/devel/apr0/files/patch-apr-0.9.18__configure.in b/devel/apr0/files/patch-apr-0.9.18__configure.in deleted file mode 100644 index e156abd6d609..000000000000 --- a/devel/apr0/files/patch-apr-0.9.18__configure.in +++ /dev/null @@ -1,43 +0,0 @@ ---- ./apr-0.9.18/configure.in.orig 2008-06-20 13:32:47.000000000 -0400 -+++ ./apr-0.9.18/configure.in 2010-05-13 16:34:13.421618268 -0400 -@@ -7,6 +7,7 @@ - AC_INIT(build/apr_common.m4) - AC_CONFIG_HEADER(include/arch/unix/apr_private.h) - AC_CONFIG_AUX_DIR(build) -+AC_CONFIG_MACRO_DIR(build) - - dnl - dnl Include our own M4 macros along with those for libtool -@@ -16,6 +17,11 @@ - sinclude(build/apr_threads.m4) - sinclude(build/apr_hints.m4) - sinclude(build/libtool.m4) -+sinclude(build/ltsugar.m4) -+sinclude(build/argz.m4) -+sinclude(build/ltoptions.m4) -+sinclude(build/ltversion.m4) -+sinclude(build/lt~obsolete.m4) - - dnl Save user-defined environment settings for later restoration - dnl -@@ -98,6 +104,8 @@ - dnl preload section from invoking the macro to get compiler info. - AC_PROG_CC - -+AC_PROG_SED -+ - dnl Preload - APR_PRELOAD - -@@ -141,6 +149,11 @@ - AC_ARG_ENABLE(experimental-libtool,[ --experimental-libtool Use experimental custom libtool (not included in source distribution)], - [experimental_libtool=$enableval],[experimental_libtool=no]) - -+dnl Workarounds for busted Libtool 2.x when we don't call AC_PROG_LIBTOOL -+if test "x$Xsed" = "x"; then -+ Xsed="$SED -e 1s/^X//" -+fi -+ - case $host in - *os2*) - # Use a custom-made libtool replacement diff --git a/devel/apr0/files/patch-apr-0.9.18__threadproc__unix__procsup.c b/devel/apr0/files/patch-apr-0.9.18__threadproc__unix__procsup.c deleted file mode 100644 index c9ccf13bda48..000000000000 --- a/devel/apr0/files/patch-apr-0.9.18__threadproc__unix__procsup.c +++ /dev/null @@ -1,18 +0,0 @@ ---- ./apr-0.9.18/threadproc/unix/procsup.c.orig 2006-09-20 12:04:09.000000000 -0400 -+++ ./apr-0.9.18/threadproc/unix/procsup.c 2010-05-13 16:34:13.426619474 -0400 -@@ -21,6 +21,7 @@ - int x; - - chdir("/"); -+#ifndef FREEBSD_THREAD_HACK - #if !defined(MPE) && !defined(OS2) && !defined(TPF) && !defined(BEOS) - /* Don't detach for MPE because child processes can't survive the death of - * the parent. */ -@@ -56,6 +57,7 @@ - return errno; - } - #endif -+#endif - - /* close out the standard file descriptors */ - if (freopen("/dev/null", "r", stdin) == NULL) { diff --git a/devel/apr0/files/patch-apr-0.9.19__build__buildcheck.sh b/devel/apr0/files/patch-apr-0.9.19__build__buildcheck.sh new file mode 100644 index 000000000000..b6b4ab1dba0c --- /dev/null +++ b/devel/apr0/files/patch-apr-0.9.19__build__buildcheck.sh @@ -0,0 +1,11 @@ +--- ./apr-0.9.19/build/buildcheck.sh.orig 2004-11-24 23:10:04.000000000 +0000 ++++ ./apr-0.9.19/build/buildcheck.sh 2010-10-20 21:08:11.853623919 +0000 +@@ -26,7 +26,7 @@ + # output is multiline from 1.5 onwards + + # Require libtool 1.3.3 or newer +-libtool=`build/PrintPath glibtool libtool` ++libtool=${LIBTOOL} + lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'` + if test -z "$lt_pversion"; then + echo "buildconf: libtool not found." diff --git a/devel/apr0/files/patch-apr-0.9.19__buildconf b/devel/apr0/files/patch-apr-0.9.19__buildconf new file mode 100644 index 000000000000..69b4a7eb9878 --- /dev/null +++ b/devel/apr0/files/patch-apr-0.9.19__buildconf @@ -0,0 +1,75 @@ +--- ./apr-0.9.19/buildconf.orig 2006-09-20 16:04:09.000000000 +0000 ++++ ./apr-0.9.19/buildconf 2010-10-20 21:08:11.863623823 +0000 +@@ -23,7 +23,7 @@ + # + build/buildcheck.sh || exit 1 + +-libtoolize=`build/PrintPath glibtoolize libtoolize` ++libtoolize="${LIBTOOLIZE}" + if [ "x$libtoolize" = "x" ]; then + echo "libtoolize not found in path" + exit 1 +@@ -35,29 +35,48 @@ + # Note: APR supplies its own config.guess and config.sub -- we do not + # rely on libtool's versions + # +-echo "Copying libtool helper files ..." ++echo "buildconf: copying libtool helper files using $libtoolize" + + # Remove any libtool files so one can switch between libtool 1.3 + # and libtool 1.4 by simply rerunning the buildconf script. +-(cd build ; rm -f ltconfig ltmain.sh libtool.m4) +- +-$libtoolize --copy --automake +- +-ltpath=`dirname $libtoolize` +-ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/libtool.m4} ++(cd build ; rm -f ltconfig ltmain.sh libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4) + +-if [ ! -f $ltfile ]; then ++lt_pversion=`$libtoolize --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'` ++lt_version=`echo $lt_pversion|sed -e 's/\([a-z]*\)$/.\1/'` ++IFS=.; set $lt_version; IFS=' ' ++if test "$1" = "1"; then ++ $libtoolize --copy --automake ++ if [ -f libtool.m4 ]; then ++ ltfile=`pwd`/libtool.m4 ++ else ++ ltfindcmd="`sed -n \"/=[^\\\`]/p;/libtool_m4=/{s/.*=/echo /p;q;}\" \ ++ < $libtoolize`" ++ ltfile=${LIBTOOL_M4-`eval "$ltfindcmd"`} ++ # Expecting the code above to be very portable, but just in case... ++ if [ -z "$ltfile" -o ! -f "$ltfile" ]; then ++ ltpath=`dirname $libtoolize` ++ ltfile=${LIBTOOL_M4} ++ fi ++ fi ++ if [ ! -f $ltfile ]; then + echo "$ltfile not found" + exit 1 ++ fi ++ # Do we need this anymore? ++ echo "buildconf: Using libtool.m4 at ${ltfile}." ++ cat $ltfile | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4 ++fi ++if test "$1" = "2"; then ++ $libtoolize --copy ++ # Wouldn't it just be better to define top_builddir?? ++ mv build/libtool.m4 build/libtool.m4.$$ ++ cat build/libtool.m4.$$ | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4 ++ chmod 664 build/libtool.m4.$$ ++ rm build/libtool.m4.$$ + fi + +-echo "buildconf: Using libtool.m4 at ${ltfile}." +- +-cat $ltfile | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4 +- +-# This is just temporary until people's workspaces are cleared -- remove +-# any old aclocal.m4 left over from prior build so it doesn't cause errors. +-rm -f aclocal.m4 ++# Clean up any leftovers ++rm -f aclocal.m4 libtool.m4 + + # + # Generate the autoconf header and ./configure diff --git a/devel/apr0/files/patch-apr-0.9.19__config.layout b/devel/apr0/files/patch-apr-0.9.19__config.layout new file mode 100644 index 000000000000..17374250fada --- /dev/null +++ b/devel/apr0/files/patch-apr-0.9.19__config.layout @@ -0,0 +1,10 @@ +--- ./apr-0.9.19/config.layout.orig 2004-11-24 23:02:04.000000000 +0000 ++++ ./apr-0.9.19/config.layout 2010-10-20 21:08:11.854622653 +0000 +@@ -229,3 +229,7 @@ + infodir: ${exec_prefix}/share/info + libsuffix: -${APR_MAJOR_VERSION} + ++ ++ ++ libsuffix: ++ diff --git a/devel/apr0/files/patch-apr-0.9.19__configure.in b/devel/apr0/files/patch-apr-0.9.19__configure.in new file mode 100644 index 000000000000..3bed2536ac27 --- /dev/null +++ b/devel/apr0/files/patch-apr-0.9.19__configure.in @@ -0,0 +1,43 @@ +--- ./apr-0.9.19/configure.in.orig 2008-06-20 17:32:47.000000000 +0000 ++++ ./apr-0.9.19/configure.in 2010-10-20 21:08:11.857624440 +0000 +@@ -7,6 +7,7 @@ + AC_INIT(build/apr_common.m4) + AC_CONFIG_HEADER(include/arch/unix/apr_private.h) + AC_CONFIG_AUX_DIR(build) ++AC_CONFIG_MACRO_DIR(build) + + dnl + dnl Include our own M4 macros along with those for libtool +@@ -16,6 +17,11 @@ + sinclude(build/apr_threads.m4) + sinclude(build/apr_hints.m4) + sinclude(build/libtool.m4) ++sinclude(build/ltsugar.m4) ++sinclude(build/argz.m4) ++sinclude(build/ltoptions.m4) ++sinclude(build/ltversion.m4) ++sinclude(build/lt~obsolete.m4) + + dnl Save user-defined environment settings for later restoration + dnl +@@ -98,6 +104,8 @@ + dnl preload section from invoking the macro to get compiler info. + AC_PROG_CC + ++AC_PROG_SED ++ + dnl Preload + APR_PRELOAD + +@@ -141,6 +149,11 @@ + AC_ARG_ENABLE(experimental-libtool,[ --experimental-libtool Use experimental custom libtool (not included in source distribution)], + [experimental_libtool=$enableval],[experimental_libtool=no]) + ++dnl Workarounds for busted Libtool 2.x when we don't call AC_PROG_LIBTOOL ++if test "x$Xsed" = "x"; then ++ Xsed="$SED -e 1s/^X//" ++fi ++ + case $host in + *os2*) + # Use a custom-made libtool replacement diff --git a/devel/apr0/files/patch-apr-0.9.19__threadproc__unix__procsup.c b/devel/apr0/files/patch-apr-0.9.19__threadproc__unix__procsup.c new file mode 100644 index 000000000000..acbb2b4cf7f0 --- /dev/null +++ b/devel/apr0/files/patch-apr-0.9.19__threadproc__unix__procsup.c @@ -0,0 +1,18 @@ +--- ./apr-0.9.19/threadproc/unix/procsup.c.orig 2006-09-20 16:04:09.000000000 +0000 ++++ ./apr-0.9.19/threadproc/unix/procsup.c 2010-10-20 21:08:11.859622744 +0000 +@@ -21,6 +21,7 @@ + int x; + + chdir("/"); ++#ifndef FREEBSD_THREAD_HACK + #if !defined(MPE) && !defined(OS2) && !defined(TPF) && !defined(BEOS) + /* Don't detach for MPE because child processes can't survive the death of + * the parent. */ +@@ -56,6 +57,7 @@ + return errno; + } + #endif ++#endif + + /* close out the standard file descriptors */ + if (freopen("/dev/null", "r", stdin) == NULL) { diff --git a/devel/apr0/files/patch-apr-util-0.9.17__build__dbm.m4 b/devel/apr0/files/patch-apr-util-0.9.17__build__dbm.m4 deleted file mode 100644 index c58d317c5cb4..000000000000 --- a/devel/apr0/files/patch-apr-util-0.9.17__build__dbm.m4 +++ /dev/null @@ -1,80 +0,0 @@ ---- ./apr-util-0.9.17/build/dbm.m4.orig 2008-11-24 02:30:29.000000000 -0500 -+++ ./apr-util-0.9.17/build/dbm.m4 2010-05-13 16:34:13.400617508 -0400 -@@ -298,8 +298,8 @@ - fi - APU_CHECK_BERKELEY_DB(1, -1, -1, - "$places", -- "db_185.h", -- "db" -+ "db.h", -+ "c" - ) - if test "$apu_have_db" = "1"; then - apu_db_version=185 -@@ -341,7 +341,7 @@ - APU_CHECK_BERKELEY_DB(3, -1, -1, - "$places", - "db3/db.h db.h", -- "db3 db" -+ "db3" - ) - if test "$apu_have_db" = "1"; then - apu_db_version=3 -@@ -361,8 +361,8 @@ - fi - APU_CHECK_BERKELEY_DB("4", "0", "-1", - "$places", -- "db4/db.h db.h", -- "db-4.0 db4 db" -+ "db4/db.h", -+ "db4" - ) - if test "$apu_have_db" = "1"; then - apu_db_version=4 -@@ -382,8 +382,8 @@ - fi - APU_CHECK_BERKELEY_DB("4", "1", "-1", - "$places", -- "db41/db.h db4/db.h db.h", -- "db-4.1 db4 db" -+ "db41/db.h", -+ "db41" - ) - if test "$apu_have_db" = "1"; then - apu_db_version=4 -@@ -403,13 +403,14 @@ - fi - APU_CHECK_BERKELEY_DB("4", "2", "-1", - "$places", -- "db42/db.h db4/db.h db.h", -- "db-4.2 db4 db" -+ "db42/db.h", -+ "db-4.2" - ) - if test "$apu_have_db" = "1"; then - apu_db_version=4 - fi - ]) -+ - dnl - dnl APU_CHECK_DB43: is DB4.3 present? - dnl -@@ -422,8 +423,8 @@ - fi - APU_CHECK_BERKELEY_DB("4", "3", "-1", - "$places", -- "db43/db.h db4/db.h db.h", -- "db-4.3 db43 db4 db" -+ "db43/db.h", -+ "db-4.3" - ) - if test "$apu_have_db" = "1"; then - apu_db_version=4 -@@ -579,6 +580,7 @@ - fi - fi - fi -+ - AC_MSG_CHECKING(for Berkeley DB) - if test "$apu_have_db" = "1"; then - AC_MSG_RESULT(found db$apu_db_version) diff --git a/devel/apr0/files/patch-apr-util-0.9.17__config.layout b/devel/apr0/files/patch-apr-util-0.9.17__config.layout deleted file mode 100644 index 5c76ba73bb5e..000000000000 --- a/devel/apr0/files/patch-apr-util-0.9.17__config.layout +++ /dev/null @@ -1,10 +0,0 @@ ---- ./apr-util-0.9.17/config.layout.orig 2004-11-24 18:45:40.000000000 -0500 -+++ ./apr-util-0.9.17/config.layout 2010-05-13 16:34:13.405620669 -0400 -@@ -229,3 +229,7 @@ - infodir: ${exec_prefix}/share/info - libsuffix -${APRUTIL_MAJOR_VERSION} - -+ -+ -+ libsuffix: -+ diff --git a/devel/apr0/files/patch-apr-util-0.9.19__config.layout b/devel/apr0/files/patch-apr-util-0.9.19__config.layout new file mode 100644 index 000000000000..9d05446f3ca7 --- /dev/null +++ b/devel/apr0/files/patch-apr-util-0.9.19__config.layout @@ -0,0 +1,10 @@ +--- ./apr-util-0.9.19/config.layout.orig 2004-11-24 23:45:40.000000000 +0000 ++++ ./apr-util-0.9.19/config.layout 2010-10-20 21:08:11.861623284 +0000 +@@ -229,3 +229,7 @@ + infodir: ${exec_prefix}/share/info + libsuffix -${APRUTIL_MAJOR_VERSION} + ++ ++ ++ libsuffix: ++ diff --git a/devel/apr0/files/patch-apr_buildconf b/devel/apr0/files/patch-apr_buildconf deleted file mode 100644 index 242a802e108a..000000000000 --- a/devel/apr0/files/patch-apr_buildconf +++ /dev/null @@ -1,75 +0,0 @@ ---- ./apr-0.9.18/buildconf.orig 2006-09-20 12:04:09.000000000 -0400 -+++ ./apr-0.9.18/buildconf 2010-05-13 16:34:13.412618222 -0400 -@@ -23,7 +23,7 @@ - # - build/buildcheck.sh || exit 1 - --libtoolize=`build/PrintPath glibtoolize libtoolize` -+libtoolize="${LIBTOOLIZE}" - if [ "x$libtoolize" = "x" ]; then - echo "libtoolize not found in path" - exit 1 -@@ -35,29 +35,48 @@ - # Note: APR supplies its own config.guess and config.sub -- we do not - # rely on libtool's versions - # --echo "Copying libtool helper files ..." -+echo "buildconf: copying libtool helper files using $libtoolize" - - # Remove any libtool files so one can switch between libtool 1.3 - # and libtool 1.4 by simply rerunning the buildconf script. --(cd build ; rm -f ltconfig ltmain.sh libtool.m4) -- --$libtoolize --copy --automake -- --ltpath=`dirname $libtoolize` --ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/libtool.m4} -+(cd build ; rm -f ltconfig ltmain.sh libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4) - --if [ ! -f $ltfile ]; then -+lt_pversion=`$libtoolize --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'` -+lt_version=`echo $lt_pversion|sed -e 's/\([a-z]*\)$/.\1/'` -+IFS=.; set $lt_version; IFS=' ' -+if test "$1" = "1"; then -+ $libtoolize --copy --automake -+ if [ -f libtool.m4 ]; then -+ ltfile=`pwd`/libtool.m4 -+ else -+ ltfindcmd="`sed -n \"/=[^\\\`]/p;/libtool_m4=/{s/.*=/echo /p;q;}\" \ -+ < $libtoolize`" -+ ltfile=${LIBTOOL_M4-`eval "$ltfindcmd"`} -+ # Expecting the code above to be very portable, but just in case... -+ if [ -z "$ltfile" -o ! -f "$ltfile" ]; then -+ ltpath=`dirname $libtoolize` -+ ltfile=${LIBTOOL_M4} -+ fi -+ fi -+ if [ ! -f $ltfile ]; then - echo "$ltfile not found" - exit 1 -+ fi -+ # Do we need this anymore? -+ echo "buildconf: Using libtool.m4 at ${ltfile}." -+ cat $ltfile | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4 -+fi -+if test "$1" = "2"; then -+ $libtoolize --copy -+ # Wouldn't it just be better to define top_builddir?? -+ mv build/libtool.m4 build/libtool.m4.$$ -+ cat build/libtool.m4.$$ | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4 -+ chmod 664 build/libtool.m4.$$ -+ rm build/libtool.m4.$$ - fi - --echo "buildconf: Using libtool.m4 at ${ltfile}." -- --cat $ltfile | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4 -- --# This is just temporary until people's workspaces are cleared -- remove --# any old aclocal.m4 left over from prior build so it doesn't cause errors. --rm -f aclocal.m4 -+# Clean up any leftovers -+rm -f aclocal.m4 libtool.m4 - - # - # Generate the autoconf header and ./configure -- cgit v1.2.3