summaryrefslogtreecommitdiff
path: root/www/apache22/files/patch-srclib-apr-buildconf
diff options
context:
space:
mode:
authorJeremy Messenger <mezz@FreeBSD.org>2009-08-02 19:36:34 +0000
committerJeremy Messenger <mezz@FreeBSD.org>2009-08-02 19:36:34 +0000
commit789d75c728ef23566a07bf5b9bc2190bf34ff4f1 (patch)
treedc7540d42fa2d5d7c1c74515e3bdbf6ab842cd17 /www/apache22/files/patch-srclib-apr-buildconf
parent- Mark BROKEN on i386, does not build (diff)
-Repocopy devel/libtool15 -> libtool22 and libltdl15 -> libltdl22.
-Update libtool and libltdl to 2.2.6a. -Remove devel/libtool15 and devel/libltdl15. -Fix ports build with libtool22/libltdl22. -Bump ports that depend on libltdl22 due to shared library version change. -Explain what to do update in the UPDATING. It has been tested with GNOME2, XFCE4, KDE3, KDE4 and other many wm/desktop and applications in the runtime. With help: marcus and kwm Pointyhat-exp: a few times by pav Tested by: pgollucci, "Romain Tartière" <romain@blogreen.org>, and a few MarcusCom CVS users. Also, I might have missed a few. Repocopy by: marcus Approved by: portmgr
Diffstat (limited to 'www/apache22/files/patch-srclib-apr-buildconf')
-rw-r--r--www/apache22/files/patch-srclib-apr-buildconf11
1 files changed, 1 insertions, 10 deletions
diff --git a/www/apache22/files/patch-srclib-apr-buildconf b/www/apache22/files/patch-srclib-apr-buildconf
index 61d311890e74..f8638d7f4634 100644
--- a/www/apache22/files/patch-srclib-apr-buildconf
+++ b/www/apache22/files/patch-srclib-apr-buildconf
@@ -14,19 +14,10 @@
if [ -z "$ltfile" -o ! -f "$ltfile" ]; then
ltpath=`dirname $libtoolize`
- ltfile=`cd $ltpath/../share/aclocal ; pwd`/libtool.m4
-+ ltfile=${LIBTOOL_M4-`cd $ltpath/../../share/aclocal ; pwd`/${LIBTOOL_VERSION}.m4}
++ ltfile=${LIBTOOL_M4}
fi
fi
-@@ -61,7 +61,7 @@
- exit 1
- fi
-
--echo "buildconf: Using libtool.m4 at ${ltfile}."
-+echo "buildconf: Using libtool${LIBTOOL_VERSION}.m4 at ${ltfile}."
-
- cat $ltfile | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4
-
@@ -87,8 +87,11 @@
# Remove autoconf 2.5x's cache directory
rm -rf autom4te*.cache