aboutsummaryrefslogtreecommitdiff
path: root/devel/apr
diff options
context:
space:
mode:
authorAde Lovett <ade@FreeBSD.org>2004-06-04 17:29:38 +0000
committerAde Lovett <ade@FreeBSD.org>2004-06-04 17:29:38 +0000
commit1a628ded35ecbbc5eeb75598dd844d830aca8cb2 (patch)
tree128ce8505dc266bea10a8cf389f38de197424aed /devel/apr
parent639a61155c89af6b9b01d796a82cbd2ad643a299 (diff)
downloadports-1a628ded35ecbbc5eeb75598dd844d830aca8cb2.tar.gz
ports-1a628ded35ecbbc5eeb75598dd844d830aca8cb2.zip
Notes
Diffstat (limited to 'devel/apr')
-rw-r--r--devel/apr/Makefile13
1 files changed, 6 insertions, 7 deletions
diff --git a/devel/apr/Makefile b/devel/apr/Makefile
index 568b308a26a2..acf2479c9074 100644
--- a/devel/apr/Makefile
+++ b/devel/apr/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}