summaryrefslogtreecommitdiff
path: root/devel/apr1
diff options
context:
space:
mode:
authorAde Lovett <ade@FreeBSD.org>2004-07-01 17:06:41 +0000
committerAde Lovett <ade@FreeBSD.org>2004-07-01 17:06:41 +0000
commit328b757bf2b6c173ce65d3872ea462f25a5d5f9b (patch)
tree9a761809da3b45684b09bc2f0d6091132e77c78a /devel/apr1
parent- Update xpenguins-daemon addon to 1.2 (diff)
Autotools cleanup. Remove autoconf257 (259), automake17 (18), and
libtool14 (13/15). PR: 67768 Submitted by: ade Approved by: 4-exp bento runs (thanks, kris!)
Notes
Notes: svn path=/head/; revision=112679
Diffstat (limited to 'devel/apr1')
-rw-r--r--devel/apr1/Makefile10
1 files changed, 4 insertions, 6 deletions
diff --git a/devel/apr1/Makefile b/devel/apr1/Makefile
index 6959b03be4a8..0839b490ad35 100644
--- a/devel/apr1/Makefile
+++ b/devel/apr1/Makefile
@@ -29,8 +29,8 @@ COMMENT= The Apache Group's Portability Library
LIB_DEPENDS+= expat.5:${PORTSDIR}/textproc/expat2
USE_ICONV= yes
-USE_AUTOMAKE_VER= 17
-USE_AUTOCONF_VER= 257
+USE_AUTOMAKE_VER= 18
+USE_AUTOCONF_VER= 259
WANT_LIBTOOL_VER= 15
USE_PERL5= yes
USE_GMAKE= yes
@@ -77,8 +77,6 @@ PKGNAMESUFFIX= -db4
.endif
.endif
-LIBTOOL_M4=${LOCALBASE}/share/aclocal/libtool${LIBTOOL_VERSION}.m4
-
pre-extract:
@${ECHO_MSG} ""
.if defined(APR_UTIL_WITHOUT_THREADS)
@@ -128,11 +126,11 @@ pre-configure:
.endfor
run-autotools:
- cd ${WRKDIR}/apr-${PORTVERSION}; ${SETENV} ${SCRIPTS_ENV} LIBTOOL_M4=${LIBTOOL_M4} ${SH} ./buildconf
+ cd ${WRKDIR}/apr-${PORTVERSION}; ${SETENV} ${SCRIPTS_ENV} ${SH} ./buildconf
cd ${WRKDIR}/apr-util-${PORTVERSION} ; \
${RM} -fr xml/expat
cd ${WRKDIR}/apr-util-${PORTVERSION} ; \
- ${SETENV} ${SCRIPTS_ENV} LIBTOOL_M4=${LIBTOOL_M4} ${SH} ./buildconf \
+ ${SETENV} ${SCRIPTS_ENV} ${SH} ./buildconf \
--with-apr=../apr-${PORTVERSION}
cd ${WRKDIR}/apr-${PORTVERSION}; \
${SETENV} ${SCRIPTS_ENV} ${SH} ./configure ${CONFIGURE_ARGS}