diff options
| author | Ade Lovett <ade@FreeBSD.org> | 2003-06-26 22:58:32 +0000 |
|---|---|---|
| committer | Ade Lovett <ade@FreeBSD.org> | 2003-06-26 22:58:32 +0000 |
| commit | b2fd75e43812932b61dab72c80fedba5f9715b82 (patch) | |
| tree | c06ec55813ad4aa528be251b248e0309e8332282 /www | |
| parent | Fix WWW. (diff) | |
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)
Notes
Notes:
svn path=/head/; revision=83696
Diffstat (limited to 'www')
| -rw-r--r-- | www/mod_jk/Makefile | 2 | ||||
| -rw-r--r-- | www/mod_webapp/Makefile | 6 | ||||
| -rw-r--r-- | www/tidy-devel/Makefile | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/www/mod_jk/Makefile b/www/mod_jk/Makefile index bda0caa93c96..903641181a16 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 db2b7ad20fa3..f24123644d4c 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 93fd9386fce9..62d86779aa72 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 |