summaryrefslogtreecommitdiffstats
path: root/www
diff options
context:
space:
mode:
authorade <ade@FreeBSD.org>2003-06-26 22:58:32 +0000
committerade <ade@FreeBSD.org>2003-06-26 22:58:32 +0000
commit9487d820b3247d8654d99544f8144188dcec810a (patch)
tree740462af7ed8e371913ea7f6b12533a99dd524ac /www
parentdfe03c1be7cf9f1612091e1e697a7e74f7002416 (diff)
downloadFreeBSD-ports-9487d820b3247d8654d99544f8144188dcec810a.zip
FreeBSD-ports-9487d820b3247d8654d99544f8144188dcec810a.tar.gz
libtool uber-patch
* kill devel/libtool and move to devel/libtool13, upgrading to 1.3.5 * upgrade repo-copied devel/libtool14 to 1.4.3 * break out libltdl into its own separate port * move to version-numbered binaries/scripts (ie: there is *no* 'libtool' any more -- USE_LIBTOOL and USE_LIBTOOL_VER are your friends) Approved by: portmgr (kris) - for the bsd.port.mk hooks Tested by: bento 4-exp builds (repeatedly)
Diffstat (limited to 'www')
-rw-r--r--www/mod_jk/Makefile2
-rw-r--r--www/mod_webapp/Makefile6
-rw-r--r--www/tidy-devel/Makefile2
3 files changed, 5 insertions, 5 deletions
diff --git a/www/mod_jk/Makefile b/www/mod_jk/Makefile
index bda0caa..9036411 100644
--- a/www/mod_jk/Makefile
+++ b/www/mod_jk/Makefile
@@ -37,7 +37,7 @@ APACHE_VER?= 1.3
PLIST_SUB= APACHE2=${APACHE2}
post-patch:
- cd ${WRKSRC}; ${ACLOCAL}; ${LOCALBASE}/bin/libtoolize
+ cd ${WRKSRC}; ${ACLOCAL}; ${LIBTOOLIZE}
do-install:
${APXS} -i -A -n jk ${WRKSRC}/apache-${APACHE_VER}/mod_jk.so
diff --git a/www/mod_webapp/Makefile b/www/mod_webapp/Makefile
index db2b7ad..f241236 100644
--- a/www/mod_webapp/Makefile
+++ b/www/mod_webapp/Makefile
@@ -18,10 +18,11 @@ COMMENT= Apache module mounts Tomcat web applications
BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 \
${NONEXISTANT}:${PORTSDIR}/devel/apr:extract \
- ${AUTOCONF}:${PORTSDIR}/devel/autoconf \
- ${LIBTOOL}:${PORTSDIR}/devel/libtool
+ ${AUTOCONF}:${PORTSDIR}/devel/autoconf
RUN_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
+USE_LIBTOOL= yes
+LIBTOOLFILES= # none
USE_GMAKE= yes
INSTALLS_SHLIB= yes
@@ -38,7 +39,6 @@ APR_LIB?= ${LOCALBASE}/lib/
APR_INCLUDE?= ${LOCALBASE}/include/apr-0/
APACHE_MODULES?= libexec/apache/
APR_SRC?= ${WRKDIRPREFIX}${PORTSDIR}/devel/apr/work/apr-?\.?\.?/
-LIBTOOL?= ${LOCALBASE}/bin/libtool
AUTOCONF?= ${LOCALBASE}/bin/autoconf
# If the user's changed the modules directory, pack things correctly.
diff --git a/www/tidy-devel/Makefile b/www/tidy-devel/Makefile
index 93fd938..62d8677 100644
--- a/www/tidy-devel/Makefile
+++ b/www/tidy-devel/Makefile
@@ -56,7 +56,7 @@ post-patch:
.else
@${CP} -R -f ${WRKSRC}/build/gnuauto/* ${WRKSRC}
(cd ${WRKSRC} \
- && ${LOCALBASE}/bin/libtoolize --force --copy \
+ && ${LIBTOOLIZE} --force --copy \
&& ${ACLOCAL})
.endif
OpenPOWER on IntegriCloud