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 /devel/apr2 | |
| 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 'devel/apr2')
| -rw-r--r-- | devel/apr2/Makefile | 9 | ||||
| -rw-r--r-- | devel/apr2/files/patch-buildconf | 7 | ||||
| -rw-r--r-- | devel/apr2/pkg-plist | 2 |
3 files changed, 12 insertions, 6 deletions
diff --git a/devel/apr2/Makefile b/devel/apr2/Makefile index cd35ce630a3c..3072f3b6312a 100644 --- a/devel/apr2/Makefile +++ b/devel/apr2/Makefile @@ -14,7 +14,6 @@ DISTFILES= apr-${PORTVERSION}.tar.gz apr-util-${PORTVERSION}.tar.gz MAINTAINER= rodrigc@attbi.com COMMENT= The Apache Group's Portability Library -BUILD_DEPENDS+= libtool:${PORTSDIR}/devel/libtool LIB_DEPENDS+= expat.4:${PORTSDIR}/textproc/expat2 \ iconv.3:${PORTSDIR}/converters/libiconv @@ -22,7 +21,8 @@ WANT_AUTOCONF_VER= 253 USE_PERL5= yes USE_GMAKE= yes -GNU_CONFIGURE= yes +USE_LIBTOOL_VER= 14 +LIBTOOLFILES= # none INSTALLS_SHLIB= yes WRKSRC= ${WRKDIR} @@ -40,8 +40,9 @@ APR_UTIL_CONF_ARGS= --with-apr=../apr-${PORTVERSION} \ --with-iconv=${PREFIX} pre-configure: - cd ${WRKDIR}/apr-${PORTVERSION}; ./buildconf - cd ${WRKDIR}/apr-util-${PORTVERSION}; ./buildconf \ + cd ${WRKDIR}/apr-${PORTVERSION}; ${SETENV} ${SCRIPTS_ENV} ./buildconf + cd ${WRKDIR}/apr-util-${PORTVERSION}; \ + ${SETENV} ${SCRIPTS_ENV} ./buildconf \ --with-apr=../apr-${PORTVERSION} do-configure: diff --git a/devel/apr2/files/patch-buildconf b/devel/apr2/files/patch-buildconf new file mode 100644 index 000000000000..9d06665e6300 --- /dev/null +++ b/devel/apr2/files/patch-buildconf @@ -0,0 +1,7 @@ +--- apr-0.9.3/buildconf.orig Wed May 15 16:47:09 2002 ++++ apr-0.9.3/buildconf Wed Feb 19 23:24:35 2003 +@@ -83,3 +83,3 @@ + ltpath=`dirname $libtoolize` +-ltfile=`cd $ltpath/../share/aclocal ; pwd`/libtool.m4 ++ltfile=`cd $ltpath/../../share/aclocal ; pwd`/libtool14.m4 + diff --git a/devel/apr2/pkg-plist b/devel/apr2/pkg-plist index 4d3dddda0e39..ae682db4c52d 100644 --- a/devel/apr2/pkg-plist +++ b/devel/apr2/pkg-plist @@ -66,11 +66,9 @@ include/apr-0/apu_version.h lib/apr.exp lib/aprutil.exp lib/libapr-0.a -lib/libapr-0.la lib/libapr-0.so lib/libapr-0.so.9 lib/libaprutil-0.a -lib/libaprutil-0.la lib/libaprutil-0.so lib/libaprutil-0.so.9 @dirrm build |