From ca808f0eaebe5bce7acf4b82ce3d8c4b67f1a02a Mon Sep 17 00:00:00 2001
From: ade <ade@FreeBSD.org>
Date: Fri, 4 Jun 2004 17:29:38 +0000
Subject: Sync with new bsd.autotools.mk

---
 devel/apr0/Makefile | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'devel/apr0')

diff --git a/devel/apr0/Makefile b/devel/apr0/Makefile
index 568b308a26a2..acf2479c9074 100644
--- a/devel/apr0/Makefile
+++ b/devel/apr0/Makefile
@@ -28,13 +28,12 @@ COMMENT=	The Apache Group's Portability Library
 
 LIB_DEPENDS+=	expat.5:${PORTSDIR}/textproc/expat2
 
-USE_ICONV=	yes
+USE_ICONV=		yes
+USE_AUTOMAKE_VER=	17
 USE_AUTOCONF_VER=	257
+WANT_LIBTOOL_VER=	15
 USE_PERL5=		yes
 USE_GMAKE=		yes
-USE_LIBTOOL_VER=	15
-LIBTOOLFILES=		# none
-USE_AUTOMAKE_VER=	17
 INSTALLS_SHLIB=		yes
 GNU_CONFIGURE=		yes
 WRKSRC=	${WRKDIR}
@@ -78,7 +77,7 @@ PKGNAMESUFFIX=	-db4
 .endif
 .endif
 
-LIBTOOL_M4=${LOCALBASE}/share/aclocal/libtool${USE_LIBTOOL_VER}.m4
+LIBTOOL_M4=${LOCALBASE}/share/aclocal/libtool${LIBTOOL_VERSION}.m4
 
 pre-extract:
 	@${ECHO_MSG} ""
@@ -124,11 +123,11 @@ pre-configure:
 	${DO_NADA}
 
 run-autotools:
-	cd ${WRKDIR}/apr-${PORTVERSION}; ${SETENV} ${SCRIPTS_ENV} AUTOCONF=${AUTOCONF} AUTOHEADER=${AUTOHEADER} LIBTOOL_M4=${LIBTOOL_M4} ${SH} ./buildconf
+	cd ${WRKDIR}/apr-${PORTVERSION}; ${SETENV} ${SCRIPTS_ENV} LIBTOOL_M4=${LIBTOOL_M4} ${SH} ./buildconf
 	cd ${WRKDIR}/apr-util-${PORTVERSION} ; \
 	${RM} -fr xml/expat
 	cd ${WRKDIR}/apr-util-${PORTVERSION} ; \
-		${SETENV} ${SCRIPTS_EV} AUTOCONF=${AUTOCONF} AUTOHEADER=${AUTOHEADER} LIBTOOL_M4=${LIBTOOL_M4} ${SH} ./buildconf \
+		${SETENV} ${SCRIPTS_ENV} LIBTOOL_M4=${LIBTOOL_M4} ${SH} ./buildconf \
 		--with-apr=../apr-${PORTVERSION}
 	cd ${WRKDIR}/apr-${PORTVERSION}; \
 		${SETENV} ${SCRIPTS_ENV} ${SH} ./configure ${CONFIGURE_ARGS}
-- 
cgit