From 2c577f8a041049feb0bad6cf7f6b632bd7d2e62c Mon Sep 17 00:00:00 2001
From: Ade Lovett <ade@FreeBSD.org>
Date: Wed, 24 Mar 2004 20:59:17 +0000
Subject: Convert all but one port that uses libtool14 to use libtool15, in
 readiness for the destruction of devel/libtool14

---
 devel/apr/Makefile              |  4 ++--
 devel/apr/files/patch-buildconf | 22 ++++++++++++++--------
 2 files changed, 16 insertions(+), 10 deletions(-)

(limited to 'devel/apr')

diff --git a/devel/apr/Makefile b/devel/apr/Makefile
index 67173ae54e5d..2b60b96b01cc 100644
--- a/devel/apr/Makefile
+++ b/devel/apr/Makefile
@@ -29,10 +29,10 @@ COMMENT=	The Apache Group's Portability Library
 LIB_DEPENDS+=	expat.5:${PORTSDIR}/textproc/expat2 \
 		iconv.3:${PORTSDIR}/converters/libiconv
 
-USE_AUTOCONF_VER=	253
+USE_AUTOCONF_VER=	257
 USE_PERL5=		yes
 USE_GMAKE=		yes
-USE_LIBTOOL_VER=	14
+USE_LIBTOOL_VER=	15
 LIBTOOLFILES=		# none
 INSTALLS_SHLIB=		yes
 GNU_CONFIGURE=		yes
diff --git a/devel/apr/files/patch-buildconf b/devel/apr/files/patch-buildconf
index a8d5f6549af1..b4aab3e2d063 100644
--- a/devel/apr/files/patch-buildconf
+++ b/devel/apr/files/patch-buildconf
@@ -1,11 +1,17 @@
---- apr-0.9.4/buildconf.orig	Wed Jun 18 05:44:25 2003
-+++ apr-0.9.4/buildconf	Thu Oct  2 15:58:45 2003
-@@ -81,7 +81,7 @@
- $libtoolize --copy --automake
- 
+--- apr-0.9.4/buildconf.orig	Tue Jun 17 13:44:25 2003
++++ apr-0.9.4/buildconf	Tue Mar 23 21:53:36 2004
+@@ -83,3 +83,3 @@
  ltpath=`dirname $libtoolize`
 -ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/libtool.m4}
-+ltfile=${LIBTOOL_M4-`cd $ltpath/../../share/aclocal ; pwd`/libtool14.m4}
++ltfile=${LIBTOOL_M4-`cd $ltpath/../../share/aclocal ; pwd`/libtool15.m4}
+ 
+@@ -102,3 +102,3 @@
+ echo "Creating include/arch/unix/apr_private.h.in ..."
+-${AUTOHEADER:-autoheader}
++${AUTOHEADER:-autoheader257}
+ 
+@@ -106,3 +106,3 @@
+ ### do some work to toss config.cache?
+-${AUTOCONF:-autoconf}
++${AUTOCONF:-autoconf257}
  
- if [ ! -f $ltfile ]; then
-     echo "$ltfile not found"
-- 
cgit v1.2.3