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 | |
| 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)
Diffstat (limited to 'devel')
86 files changed, 989 insertions, 2411 deletions
diff --git a/devel/Makefile b/devel/Makefile index c931513d6a47..d7bd7ed0d67b 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -333,6 +333,7 @@ SUBDIR += libhash SUBDIR += libhoard SUBDIR += libical + SUBDIR += libltdl SUBDIR += libmba SUBDIR += libmcve SUBDIR += libmtrie @@ -356,7 +357,8 @@ SUBDIR += libtai SUBDIR += libtar SUBDIR += libtecla - SUBDIR += libtool + SUBDIR += libtool13 + SUBDIR += libtool14 SUBDIR += libukcprog SUBDIR += libunicode SUBDIR += libusb diff --git a/devel/apr/Makefile b/devel/apr/Makefile index cd35ce630a3c..3072f3b6312a 100644 --- a/devel/apr/Makefile +++ b/devel/apr/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/apr/files/patch-buildconf b/devel/apr/files/patch-buildconf new file mode 100644 index 000000000000..9d06665e6300 --- /dev/null +++ b/devel/apr/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/apr/pkg-plist b/devel/apr/pkg-plist index 4d3dddda0e39..ae682db4c52d 100644 --- a/devel/apr/pkg-plist +++ b/devel/apr/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 diff --git a/devel/apr0/Makefile b/devel/apr0/Makefile index cd35ce630a3c..3072f3b6312a 100644 --- a/devel/apr0/Makefile +++ b/devel/apr0/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/apr0/files/patch-buildconf b/devel/apr0/files/patch-buildconf new file mode 100644 index 000000000000..9d06665e6300 --- /dev/null +++ b/devel/apr0/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/apr0/pkg-plist b/devel/apr0/pkg-plist index 4d3dddda0e39..ae682db4c52d 100644 --- a/devel/apr0/pkg-plist +++ b/devel/apr0/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 diff --git a/devel/apr1/Makefile b/devel/apr1/Makefile index cd35ce630a3c..3072f3b6312a 100644 --- a/devel/apr1/Makefile +++ b/devel/apr1/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/apr1/files/patch-buildconf b/devel/apr1/files/patch-buildconf new file mode 100644 index 000000000000..9d06665e6300 --- /dev/null +++ b/devel/apr1/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/apr1/pkg-plist b/devel/apr1/pkg-plist index 4d3dddda0e39..ae682db4c52d 100644 --- a/devel/apr1/pkg-plist +++ b/devel/apr1/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 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 diff --git a/devel/directfb/Makefile b/devel/directfb/Makefile index f2d48b0798d6..7ede9914fea3 100644 --- a/devel/directfb/Makefile +++ b/devel/directfb/Makefile @@ -7,6 +7,7 @@ PORTNAME= directfb PORTVERSION= 0.9.16 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://www.directfb.org/download/DirectFB/ DISTNAME= DirectFB-${PORTVERSION} diff --git a/devel/directfb/pkg-plist b/devel/directfb/pkg-plist index d00f1d302f86..a97efcf96b05 100644 --- a/devel/directfb/pkg-plist +++ b/devel/directfb/pkg-plist @@ -62,13 +62,18 @@ include/directfb-internal/misc/utf8.h include/directfb-internal/misc/util.h include/directfb-internal/windows/idirectfbwindow.h lib/libdirectfb-0.9.so.16 -lib/libdirectfb.a lib/libdirectfb.so +lib/directfb-%%DIRECTFB_VERSION%%/interfaces/IDirectFBFont/libidirectfbfont_default.la lib/directfb-%%DIRECTFB_VERSION%%/interfaces/IDirectFBFont/libidirectfbfont_default.so +%%WITH_FREETYPE2%%lib/directfb-%%DIRECTFB_VERSION%%/interfaces/IDirectFBFont/libidirectfbfont_ft2.la %%WITH_FREETYPE2%%lib/directfb-%%DIRECTFB_VERSION%%/interfaces/IDirectFBFont/libidirectfbfont_ft2.so +lib/directfb-%%DIRECTFB_VERSION%%/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.la lib/directfb-%%DIRECTFB_VERSION%%/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.so +lib/directfb-%%DIRECTFB_VERSION%%/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.la lib/directfb-%%DIRECTFB_VERSION%%/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.so +lib/directfb-%%DIRECTFB_VERSION%%/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_mpeg2.la lib/directfb-%%DIRECTFB_VERSION%%/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_mpeg2.so +lib/directfb-%%DIRECTFB_VERSION%%/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.la lib/directfb-%%DIRECTFB_VERSION%%/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.so libdata/pkgconfig/directfb.pc libdata/pkgconfig/directfb-internal.pc diff --git a/devel/gnu-libtool/Makefile b/devel/gnu-libtool/Makefile index fe6e1d76b734..573ac0226009 100644 --- a/devel/gnu-libtool/Makefile +++ b/devel/gnu-libtool/Makefile @@ -5,26 +5,53 @@ # $FreeBSD$ # -PORTNAME= libtool -PORTVERSION= 1.3.4 -PORTREVISION= 4 +PORTNAME?= libtool +PORTVERSION= 1.4.3 +PORTREVISION?= 0 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= libtool +DISTNAME= libtool-${PORTVERSION} MAINTAINER= ade@FreeBSD.org -COMMENT= Generic shared library support script - -# This port has not been upgraded to 1.4 because it is used by about 30% of -# the ports collection, and more testing is needed. If someone can supply a -# working patch then it will be upgraded. +COMMENT?= Generic shared library support script +LATEST_LINK?= libtool14 +GNU_CONFIGURE= yes +CONFIGURE_ARGS?= --disable-ltdl-install +CONFIGURE_ARGS+= --program-suffix=14 INSTALLS_SHLIB= yes -GNU_CONFIGURE= yes -CONFIGURE_ENV= PREFIX=${PREFIX} +CONFIGURE_ENV= PREFIX=${PREFIX} PACKAGE=libtool14 +USE_REINPLACE= yes + +.if defined(USE_LIBTOOL) || defined(USE_LIBTOOL_VER) +pre-everything: + @${ECHO} =========================================================== + @${ECHO} "You have 'USE_LIBTOOL' or 'USE_LIBTOOL_VER' variables" + @${ECHO} "defined either in environment or in make(1) arguments." + @${ECHO} "Please undefine them and try again." + @${ECHO} =========================================================== + @${FALSE} +.endif # defined(USE_LIBTOOL) || defined(USE_LIBTOOL_VER) + +post-extract: + @${MV} -f ${WRKSRC}/libtool.m4 ${WRKSRC}/libtool14.m4 + @${MV} -f ${WRKSRC}/ltdl.m4 ${WRKSRC}/ltdl14.m4 + @${REINPLACE_CMD} -e 's|libtool.m4|libtool14.m4|g' \ + -e 's|ltdl.m4|ltdl14.m4|g' ${WRKSRC}/Makefile.in + @${MV} -f ${WRKSRC}/doc/libtool.info ${WRKSRC}/doc/libtool14.info + @${MV} -f ${WRKSRC}/doc/libtool.texi ${WRKSRC}/doc/libtool14.texi -.ifdef USE_LIBTOOL -.error You have `USE_LIBTOOL' variable defined either in environment or in make(1) arguments. Please undefine and try again. +.if ${PORTNAME} == "libtool" +post-install: + @-${RM} -fr ${PREFIX}/libexec/libtool14 + ${MKDIR} ${PREFIX}/libexec/libtool14 +.for i in libtool libtoolize + ${LN} -sf ${PREFIX}/bin/${i}14 ${PREFIX}/libexec/libtool14/${i} +.endfor +.for i in config.guess config.sub + ${MV} ${PREFIX}/share/libtool14/${i}14 ${PREFIX}/share/libtool14/${i} +.endfor .endif .include <bsd.port.mk> diff --git a/devel/gnu-libtool/distinfo b/devel/gnu-libtool/distinfo index c39e3aaff92d..7cace71782d6 100644 --- a/devel/gnu-libtool/distinfo +++ b/devel/gnu-libtool/distinfo @@ -1 +1 @@ -MD5 (libtool-1.3.4.tar.gz) = 0c3844fedd382e5796865ca58842713e +MD5 (libtool-1.4.3.tar.gz) = d11a3c835449d7fa50a025dc9c01ad81 diff --git a/devel/gnu-libtool/files/patch-aa b/devel/gnu-libtool/files/patch-aa index 91ff871e5ae3..8ba2b3510563 100644 --- a/devel/gnu-libtool/files/patch-aa +++ b/devel/gnu-libtool/files/patch-aa @@ -1,11 +1,15 @@ ---- doc/libtool.texi.orig Tue Jun 29 15:48:12 1999 -+++ doc/libtool.texi Tue Aug 31 23:41:25 1999 -@@ -11,7 +11,7 @@ - @set MAILLIST the libtool mailing list @email{libtool@@gnu.org} - @set objdir .libs +--- doc/libtool14.info.orig Wed Oct 23 02:26:36 2002 ++++ doc/libtool14.info Mon Feb 17 01:46:42 2003 +@@ -3,5 +3,5 @@ --@dircategory GNU programming tools -+@dircategory Programming & development tools - @direntry - * Libtool: (libtool). Generic shared library support script. - @end direntry +-INFO-DIR-SECTION GNU programming tools ++INFO-DIR-SECTION Programming & development tools + START-INFO-DIR-ENTRY +-* Libtool: (libtool). Generic shared library support script. ++* Libtool: (libtool14). Generic shared library support script. + END-INFO-DIR-ENTRY +@@ -10,3 +10,3 @@ + START-INFO-DIR-ENTRY +-* libtoolize: (libtool)Invoking libtoolize. Adding libtool support. ++* libtoolize: (libtool14)Invoking libtoolize. Adding libtool support. + END-INFO-DIR-ENTRY diff --git a/devel/gnu-libtool/files/patch-ab b/devel/gnu-libtool/files/patch-ab index f96b92eac308..384c86a0bd18 100644 --- a/devel/gnu-libtool/files/patch-ab +++ b/devel/gnu-libtool/files/patch-ab @@ -1,11 +1,50 @@ ---- doc/Makefile.in.orig Fri Jul 2 09:24:54 1999 -+++ doc/Makefile.in Tue Aug 31 23:41:57 1999 -@@ -70,7 +70,7 @@ - LIBTOOL = @LIBTOOL@ - LIBTOOL_FLAGS = @LIBTOOL_FLAGS@ +--- doc/Makefile.in.orig Wed Oct 23 02:51:04 2002 ++++ doc/Makefile.in Mon Feb 17 02:01:16 2003 +@@ -72,3 +72,3 @@ LN_S = @LN_S@ -MAKEINFO = @MAKEINFO@ +MAKEINFO = @MAKEINFO@ --no-split NM = @NM@ - OBJDUMP = @OBJDUMP@ - PACKAGE = @PACKAGE@ +@@ -85,4 +85,4 @@ + AUTOMAKE_OPTIONS = gnits +-info_TEXINFOS = libtool.texi +-libtool_TEXINFOS = PLATFORMS fdl.texi ++info_TEXINFOS = libtool14.texi ++libtool14_TEXINFOS = PLATFORMS fdl.texi + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -90,6 +90,6 @@ + TEXI2DVI = texi2dvi +-INFO_DEPS = libtool.info +-DVIS = libtool.dvi +-TEXINFOS = libtool.texi +-DIST_COMMON = $(libtool_TEXINFOS) Makefile.am Makefile.in mdate-sh \ ++INFO_DEPS = libtool14.info ++DVIS = libtool14.dvi ++TEXINFOS = libtool14.texi ++DIST_COMMON = $(libtool14_TEXINFOS) Makefile.am Makefile.in mdate-sh \ + stamp-vti texinfo.tex version.texi +@@ -115,4 +115,4 @@ + +-$(srcdir)/stamp-vti: libtool.texi $(top_srcdir)/configure.in +- @echo "@set UPDATED `$(SHELL) $(srcdir)/mdate-sh $(srcdir)/libtool.texi`" > vti.tmp ++$(srcdir)/stamp-vti: libtool14.texi $(top_srcdir)/configure.in ++ @echo "@set UPDATED `$(SHELL) $(srcdir)/mdate-sh $(srcdir)/libtool14.texi`" > vti.tmp + @echo "@set EDITION $(VERSION)" >> vti.tmp +@@ -135,4 +135,4 @@ + +-libtool.info: libtool.texi version.texi $(libtool_TEXINFOS) +-libtool.dvi: libtool.texi version.texi $(libtool_TEXINFOS) ++libtool14.info: libtool14.texi version.texi $(libtool14_TEXINFOS) ++libtool14.dvi: libtool14.texi version.texi $(libtool14_TEXINFOS) + +@@ -235,6 +235,6 @@ + mostlyclean-aminfo: +- -rm -f libtool.aux libtool.cp libtool.cps libtool.dvi libtool.fn \ +- libtool.fns libtool.ky libtool.kys libtool.ps libtool.log \ +- libtool.pg libtool.toc libtool.tp libtool.tps libtool.vr \ +- libtool.vrs libtool.op libtool.tr libtool.cv libtool.cn ++ -rm -f libtool14.aux libtool14.cp libtool14.cps libtool14.dvi libtool14.fn \ ++ libtool14.fns libtool14.ky libtool14.kys libtool14.ps libtool14.log \ ++ libtool14.pg libtool14.toc libtool14.tp libtool14.tps libtool14.vr \ ++ libtool14.vrs libtool14.op libtool14.tr libtool14.cv libtool14.cn + diff --git a/devel/gnu-libtool/files/patch-ac b/devel/gnu-libtool/files/patch-ac deleted file mode 100644 index 3a1894e10003..000000000000 --- a/devel/gnu-libtool/files/patch-ac +++ /dev/null @@ -1,157 +0,0 @@ - -$FreeBSD$ - ---- ltconfig.orig Tue Dec 7 23:50:48 1999 -+++ ltconfig Sat Jun 8 11:48:12 2002 -@@ -169,7 +169,7 @@ - # Constants: - PROGRAM=ltconfig - PACKAGE=libtool --VERSION=1.3.4 -+VERSION=1.3.4-freebsd-ports - TIMESTAMP=" (1.385.2.196 1999/12/07 21:47:57)" - ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' - ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -@@ -185,6 +185,8 @@ - # which needs '.lib'). - enable_static=yes - enable_fast_install=yes -+install_ltlibs=yes -+release_suffix=yes - enable_dlopen=unknown - enable_win32_dll=no - ltmain= -@@ -242,10 +244,14 @@ - - Generate a system-specific libtool script. - -+ --build no-op to keep compatability with configure scripts generated for 1.4 - --debug enable verbose shell tracing - --disable-shared do not build shared libraries - --disable-static do not build static libraries - --disable-fast-install do not optimize for fast installation -+ --disable-ltlibs don't install the .la archives -+ --release-ignore don't use -release specification -+ --release-suffix use -release suffix for all files - --enable-dlopen enable dlopen support - --enable-win32-dll enable building dlls on win32 hosts - --help display this help and exit -@@ -268,6 +274,8 @@ - exit 0 - ;; - -+ --build=*) ;; -+ - --debug) - echo "$progname: enabling shell trace mode" - set -x -@@ -279,6 +287,12 @@ - - --disable-fast-install) enable_fast_install=no ;; - -+ --disable-ltlibs) install_ltlibs=no ;; -+ -+ --release-ignore) release_suffix=no ;; -+ -+ --release-suffix) release_suffix=all ;; -+ - --enable-dlopen) enable_dlopen=yes ;; - - --enable-win32-dll) enable_win32_dll=yes ;; -@@ -971,11 +985,11 @@ - $rm conftest.dat - if ln -s X conftest.dat 2>/dev/null; then - $rm conftest.dat -- LN_S="ln -s" -+ LN_S="ln -sf" - else - LN_S=ln - fi -- if test "$LN_S" = "ln -s"; then -+ if test "$LN_S" = "ln -sf"; then - echo "$ac_t"yes 1>&6 - else - echo "$ac_t"no 1>&6 -@@ -1226,8 +1240,8 @@ - - *) - if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $compile_rpath $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $compile_rpath $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -1353,14 +1367,6 @@ - hardcode_shlibpath_var=no - ;; - -- # FreeBSD 3 and greater uses gcc -shared to do shared libraries. -- freebsd*) -- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $linkopts' -- hardcode_libdir_flag_spec='-R$libdir' -- hardcode_direct=yes -- hardcode_shlibpath_var=no -- ;; -- - hpux9* | hpux10* | hpux11*) - case "$host_os" in - hpux9*) archive_cmds='$rm $objdir/$soname~$LD -b +b $install_libdir -o $objdir/$soname $libobjs $deplibs $linkopts~test $objdir/$soname = $lib || mv $objdir/$soname $lib' ;; -@@ -1775,7 +1781,7 @@ - version_type=none - dynamic_linker="$host_os ld.so" - sys_lib_dlsearch_path_spec="/lib /usr/lib" --sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -+sys_lib_search_path_spec="/lib /usr/lib" - file_magic_cmd= - file_magic_test_file= - deplibs_check_method='unknown' -@@ -1873,19 +1879,22 @@ - version_type=freebsd-$objformat - case "$version_type" in - freebsd-elf*) -- deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object' -- file_magic_cmd=/usr/bin/file -- file_magic_test_file=`echo /usr/lib/libc.so*` -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so' -- need_version=no -- need_lib_prefix=no -+ deplibs_check_method='file_magic (ELF [0-9][0-9]*-bit [LM]SB shared object|current ar archive)' - ;; - freebsd-*) -- deplibs_check_method=unknown -- library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix' -- need_version=yes -+ deplibs_check_method='file_magic FreeBSD.* shared library' - ;; - esac -+ file_magic_cmd=/usr/bin/file -+ file_magic_test_file=`echo /usr/lib/libc.so.*` -+ if test "$release_suffix" = all; then -+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so' -+ else -+ library_names_spec='${libname}${release}.so$versuffix ${libname}.so' -+ fi -+ need_version=no -+ need_lib_prefix=no -+ finish_cmds='/usr/bin/env OBJFORMAT="'"$objformat"'" /sbin/ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - case "$host_os" in - freebsd2* | freebsd3.[01]* | freebsdelf3.[01]*) -@@ -2776,6 +2785,15 @@ - - # Shell to use when invoking shell scripts. - SHELL=$LTSHELL -+ -+# Whether to waste disk space. -+install_ltlibs=$install_ltlibs -+ -+# What to do with -release. -+# yes - only for shared archive -+# no - ingnore -+# all - for all archives -+release_suffix=$release_suffix - - # Whether or not to build shared libraries. - build_libtool_libs=$enable_shared diff --git a/devel/gnu-libtool/files/patch-ad b/devel/gnu-libtool/files/patch-ad index 3ec71700ffbb..c04c4dd4a24c 100644 --- a/devel/gnu-libtool/files/patch-ad +++ b/devel/gnu-libtool/files/patch-ad @@ -1,226 +1,32 @@ $FreeBSD$ ---- ltmain.sh.orig Tue Dec 7 23:50:49 1999 -+++ ltmain.sh Thu May 2 10:24:05 2002 -@@ -23,6 +23,9 @@ - # configuration script generated by Autoconf, you may include it under - # the same distribution terms that you use for the rest of that program. +--- ltmain.sh.orig Mon Sep 10 22:33:26 2001 ++++ ltmain.sh Wed Jan 23 16:39:22 2002 +@@ -1062,6 +1062,12 @@ -+EXPR_COMPAT=1 -+export EXPR_COMPAT -+ - # Check that we have a working $echo. - if test "X$1" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. -@@ -54,7 +57,7 @@ - # Constants. - PROGRAM=ltmain.sh - PACKAGE=libtool --VERSION=1.3.4 -+VERSION=1.3.4-freebsd-ports - TIMESTAMP=" (1.385.2.196 1999/12/07 21:47:57)" - - default_mode= -@@ -952,7 +955,11 @@ - continue - ;; - release) -- release="-$arg" -+ if test "$release_suffix" = all; then -+ release="$arg" -+ elif test "$release_suffix" = yes; then -+ release="-$arg" -+ fi - prev= - continue - ;; -@@ -1005,6 +1012,7 @@ - ;; - - -avoid-version) -+ build_old_libs=no - avoid_version=yes - continue - ;; -@@ -1091,6 +1099,10 @@ - deplibs="$deplibs $arg" - ;; - -+ -?thread) -+ deplibs="$deplibs $arg" -+ ;; -+ -module) module=yes ++ case $host in ++ *-*-freebsd*) ++ # Do not build the useless static library ++ build_old_libs=no ++ ;; ++ esac continue -@@ -1168,7 +1180,7 @@ - - *.o | *.obj | *.a | *.lib) - # A standard object. -- objs="$objs $arg" -+ libobjs="$libobjs $arg" ;; - *.lo) -@@ -1603,12 +1615,6 @@ - exit 1 - fi - -- # How the heck are we supposed to write a wrapper for a shared library? -- if test -n "$link_against_libtool_libs"; then -- $echo "$modename: error: cannot link shared libraries into libtool libraries" 1>&2 -- exit 1 -- fi -- - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - $echo "$modename: warning: \`-dlopen' is ignored for libtool libraries" 1>&2 - fi -@@ -1795,6 +1801,9 @@ - *-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*) - # these systems don't actually have a c library (as such)! +@@ -2444,6 +2450,9 @@ + *-*-openbsd*) + # Do not include libc due to us having libc/libc_r. ;; + *-*-freebsd*) + # FreeBSD doesn't need this... + ;; *) - # Add libc to deplibs on all other systems. - deplibs="$deplibs -lc" -@@ -1802,6 +1811,94 @@ - esac - fi - -+ if test -n "$rpath$xrpath"; then -+ # If the user specified any rpath flags, then add them. -+ for libdir in $rpath $xrpath; do -+ # This is the magic to use -rpath. -+ case "$compile_rpath " in -+ *" $libdir "*) ;; -+ *) compile_rpath="$compile_rpath $libdir" ;; -+ esac -+ case "$finalize_rpath " in -+ *" $libdir "*) ;; -+ *) finalize_rpath="$finalize_rpath $libdir" ;; -+ esac -+ done -+ fi -+ -+ # Now hardcode the library paths -+ rpath= -+ hardcode_libdirs= -+ for libdir in $compile_rpath; do -+ if test -n "$hardcode_libdir_flag_spec"; then -+ if test -n "$hardcode_libdir_separator"; then -+ if test -z "$hardcode_libdirs"; then -+ hardcode_libdirs="$libdir" -+ else -+ # Just accumulate the unique libdirs. -+ case "$hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator" in -+ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) -+ ;; -+ *) -+ hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" -+ ;; -+ esac -+ fi -+ else -+ eval flag=\"$hardcode_libdir_flag_spec\" -+ rpath="$rpath $flag" -+ fi -+ elif test -n "$runpath_var"; then -+ case "$perm_rpath " in -+ *" $libdir "*) ;; -+ *) perm_rpath="$perm_rpath $libdir" ;; -+ esac -+ fi -+ done -+ # Substitute the hardcoded libdirs into the rpath. -+ if test -n "$hardcode_libdir_separator" && -+ test -n "$hardcode_libdirs"; then -+ libdir="$hardcode_libdirs" -+ eval rpath=\" $hardcode_libdir_flag_spec\" -+ fi -+ compile_rpath="$rpath" -+ -+ rpath= -+ hardcode_libdirs= -+ for libdir in $finalize_rpath; do -+ if test -n "$hardcode_libdir_flag_spec"; then -+ if test -n "$hardcode_libdir_separator"; then -+ if test -z "$hardcode_libdirs"; then -+ hardcode_libdirs="$libdir" -+ else -+ # Just accumulate the unique libdirs. -+ case "$hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator" in -+ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) -+ ;; -+ *) -+ hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" -+ ;; -+ esac -+ fi -+ else -+ eval flag=\"$hardcode_libdir_flag_spec\" -+ rpath="$rpath $flag" -+ fi -+ elif test -n "$runpath_var"; then -+ case "$finalize_perm_rpath " in -+ *" $libdir "*) ;; -+ *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;; -+ esac -+ fi -+ done -+ # Substitute the hardcoded libdirs into the rpath. -+ if test -n "$hardcode_libdir_separator" && -+ test -n "$hardcode_libdirs"; then -+ libdir="$hardcode_libdirs" -+ eval rpath=\" $hardcode_libdir_flag_spec\" -+ fi -+ finalize_rpath="$rpath" -+ - # Create the output directory, or remove our outputs if we need to. - if test -d $output_objdir; then - $show "${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*" -@@ -1817,7 +1914,11 @@ - - # Now set the variables for building old libraries. - if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then -- oldlibs="$oldlibs $output_objdir/$libname.$libext" -+ if test "$release_suffix" = all; then -+ oldlibs="$oldlibs $output_objdir/$libname$release.$libext" -+ else -+ oldlibs="$oldlibs $output_objdir/$libname.$libext" -+ fi - - # Transform .lo files to .o files. - oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP` -@@ -2011,7 +2112,11 @@ - echo "*** \`nm' from GNU binutils and a full rebuild may help." - fi - if test "$build_old_libs" = no; then -- oldlibs="$output_objdir/$libname.$libext" -+ if test "$release_suffix" = all; then -+ oldlibs="$output_objdir/$libname$release.$libext" -+ else -+ oldlibs="$output_objdir/$libname.$libext" -+ fi - build_libtool_libs=module - build_old_libs=yes - else -@@ -3059,7 +3164,11 @@ - case "$output" in - *.la) - old_library= -- test "$build_old_libs" = yes && old_library="$libname.$libext" -+ if test "$release_suffix" = all; then -+ test "$build_old_libs" = yes && old_library="$libname$release.$libext" -+ else -+ test "$build_old_libs" = yes && old_library="$libname.$libext" -+ fi - $show "creating $output" - - if test -n "$xrpath"; then -@@ -3348,10 +3457,12 @@ + # Add libc to deplibs on all other systems if necessary. + if test $build_libtool_need_lc = "yes"; then +@@ -4210,10 +4219,17 @@ fi # Install the pseudo-library for information purposes. @@ -228,20 +34,17 @@ $FreeBSD$ - instname="$dir/$name"i - $show "$install_prog $instname $destdir/$name" - $run eval "$install_prog $instname $destdir/$name" || exit $? -+ if test "$install_ltlibs" = yes; then ++ case $host in ++ *-*-freebsd*) ++ # Do not install the useless pseudo-library ++ ;; ++ *) + name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + instname="$dir/$name"i + $show "$install_prog $instname $destdir/$name" + $run eval "$install_prog $instname $destdir/$name" || exit $? -+ fi ++ ;; ++ esac # Maybe install the static library, too. test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" -@@ -3440,7 +3551,6 @@ - fi - libfile="$libdir/`$echo "X$lib" | $Xsed -e 's%^.*/%%g'`" - if test -n "$libdir" && test ! -f "$libfile"; then -- $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2 - finalize=no - fi - done diff --git a/devel/gnu-libtool/files/patch-ae b/devel/gnu-libtool/files/patch-ae index c92b003b58cd..62aeecd4ae60 100644 --- a/devel/gnu-libtool/files/patch-ae +++ b/devel/gnu-libtool/files/patch-ae @@ -1,13 +1,14 @@ ---- configure.orig Fri Jul 2 09:01:56 1999 -+++ configure Tue Aug 31 23:45:29 1999 -@@ -1853,10 +1853,6 @@ - *) # Relative path. - ac_sub_cache_file="$ac_dots$cache_file" ;; +--- configure.orig Wed Oct 23 02:26:05 2002 ++++ configure Mon Feb 17 02:04:57 2003 +@@ -865,3 +865,3 @@ + +-PACKAGE=libtool ++PACKAGE=libtool14 + +@@ -6089,6 +6089,2 @@ esac - case "$ac_given_INSTALL" in - [/$]*) INSTALL="$ac_given_INSTALL" ;; - *) INSTALL="$ac_dots$ac_given_INSTALL" ;; - esac - echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir" - # The eval makes quoting arguments work. diff --git a/devel/gnu-libtool/files/patch-af b/devel/gnu-libtool/files/patch-af index beb6be3b456f..1298dce981e1 100644 --- a/devel/gnu-libtool/files/patch-af +++ b/devel/gnu-libtool/files/patch-af @@ -1,13 +1,11 @@ ---- libltdl/Makefile.in.orig Tue Dec 7 13:03:38 1999 -+++ libltdl/Makefile.in Mon Jan 17 16:35:34 2000 -@@ -326,17 +326,16 @@ - distdir: $(DISTFILES) - -rm -rf $(distdir) +--- libltdl/Makefile.in.orig Wed Oct 23 02:26:07 2002 ++++ libltdl/Makefile.in Mon Feb 17 02:06:58 2003 +@@ -342,3 +342,3 @@ mkdir $(distdir) - -chmod 777 $(distdir) + -chmod 555 $(distdir) @for file in $(DISTFILES); do \ - d=$(srcdir); \ +@@ -346,9 +346,8 @@ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + echo no copy dir $$d/$$file; \ @@ -20,5 +18,20 @@ done + -chmod a+x $(distdir)/configure info-am: - info: info-am - dvi-am: +@@ -452,4 +451,4 @@ + local-install-files: $(DISTFILES) +- -rm -rf $(DESTDIR)$(datadir)/libtool/libltdl +- $(mkinstalldirs) $(DESTDIR)$(datadir)/libtool/libltdl ++ -rm -rf $(DESTDIR)$(datadir)/libtool14/libltdl ++ $(mkinstalldirs) $(DESTDIR)$(datadir)/libtool14/libltdl + @for file in $(DISTFILES); do \ +@@ -457,6 +456,6 @@ + if test -d $$d/$$file; then \ +- cp -r $$d/$$file $(DESTDIR)$(datadir)/libtool/libltdl/$$file; \ ++ cp -r $$d/$$file $(DESTDIR)$(datadir)/libtool14/libltdl/$$file; \ + else \ +- test -f $(DESTDIR)$(datadir)/libtool/libltdl/$$file \ +- || cp $$d/$$file $(DESTDIR)$(datadir)/libtool/libltdl/$$file || :; \ ++ test -f $(DESTDIR)$(datadir)/libtool14/libltdl/$$file \ ++ || cp $$d/$$file $(DESTDIR)$(datadir)/libtool14/libltdl/$$file || :; \ + fi; \ diff --git a/devel/gnu-libtool/files/patch-ag b/devel/gnu-libtool/files/patch-ag deleted file mode 100644 index 5fdcd1924641..000000000000 --- a/devel/gnu-libtool/files/patch-ag +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- libltdl/configure 2001/01/31 10:58:38 1.1 -+++ libltdl/configure 2001/01/31 10:59:14 -@@ -1455,7 +1455,7 @@ - esac - - # Check for any special flags to pass to ltconfig. --libtool_flags="--cache-file=$cache_file" -+libtool_flags="--cache-file=$cache_file --disable-ltlibs" - test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared" - test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static" - test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install" diff --git a/devel/gnu-libtool/files/patch-libtoolize.in b/devel/gnu-libtool/files/patch-libtoolize.in new file mode 100644 index 000000000000..b92bbeb9d8e9 --- /dev/null +++ b/devel/gnu-libtool/files/patch-libtoolize.in @@ -0,0 +1,9 @@ +--- libtoolize.in.orig Sun Oct 13 16:21:38 2002 ++++ libtoolize.in Mon Feb 17 01:56:19 2003 +@@ -39,4 +39,4 @@ + +-libtool_m4="$aclocaldir/libtool.m4" +-ltdl_m4="$aclocaldir/ltdl.m4" ++libtool_m4="$aclocaldir/libtool14.m4" ++ltdl_m4="$aclocaldir/ltdl14.m4" + diff --git a/devel/gnu-libtool/pkg-descr.libltdl b/devel/gnu-libtool/pkg-descr.libltdl new file mode 100644 index 000000000000..e57b99f21a5c --- /dev/null +++ b/devel/gnu-libtool/pkg-descr.libltdl @@ -0,0 +1,9 @@ +This is GNU libltdl, a system independent dlopen wrapper for GNU libtool. + +It supports the following dlopen interfaces: +* dlopen (Solaris, Linux and various BSD flavors) +* shl_load (HP-UX) +* LoadLibrary (Win16 and Win32) +* load_add_on (BeOS) +* GNU DLD (emulates dynamic linking for static libraries) +* libtool's dlpreopen diff --git a/devel/gnu-libtool/pkg-plist b/devel/gnu-libtool/pkg-plist index f057cdf134b2..c0510d95ad88 100644 --- a/devel/gnu-libtool/pkg-plist +++ b/devel/gnu-libtool/pkg-plist @@ -1,29 +1,28 @@ -bin/libtool -bin/libtoolize -include/ltdl.h -@unexec install-info --delete %D/info/libtool.info %D/info/dir -info/libtool.info -@exec install-info %D/info/libtool.info %D/info/dir -lib/libltdl.a -lib/libltdl.so -lib/libltdl.so.1 -share/aclocal/libtool.m4 -share/libtool/config.guess -share/libtool/config.sub -share/libtool/libltdl/COPYING.LIB -share/libtool/libltdl/Makefile.am -share/libtool/libltdl/Makefile.in -share/libtool/libltdl/README -share/libtool/libltdl/acconfig.h -share/libtool/libltdl/acinclude.m4 -share/libtool/libltdl/aclocal.m4 -share/libtool/libltdl/config.h.in -share/libtool/libltdl/configure -share/libtool/libltdl/configure.in -share/libtool/libltdl/ltdl.c -share/libtool/libltdl/ltdl.h -share/libtool/libltdl/stamp-h.in -share/libtool/ltconfig -share/libtool/ltmain.sh -@dirrm share/libtool/libltdl -@dirrm share/libtool +@comment $FreeBSD$ +bin/libtool14 +bin/libtoolize14 +libexec/libtool14/libtool +libexec/libtool14/libtoolize +@unexec install-info --delete %D/info/libtool14.info %D/info/dir +info/libtool14.info +@exec install-info %D/info/libtool14.info %D/info/dir +share/aclocal/libtool14.m4 +share/aclocal/ltdl14.m4 +share/libtool14/config.guess +share/libtool14/config.sub +share/libtool14/libltdl/COPYING.LIB +share/libtool14/libltdl/Makefile.am +share/libtool14/libltdl/Makefile.in +share/libtool14/libltdl/README +share/libtool14/libltdl/acinclude.m4 +share/libtool14/libltdl/aclocal.m4 +share/libtool14/libltdl/config-h.in +share/libtool14/libltdl/configure +share/libtool14/libltdl/configure.in +share/libtool14/libltdl/ltdl.c +share/libtool14/libltdl/ltdl.h +share/libtool14/libltdl/stamp-h.in +share/libtool14/ltmain.sh +@dirrm share/libtool14/libltdl +@dirrm share/libtool14 +@dirrm libexec/libtool14 diff --git a/devel/gnu-libtool/pkg-plist.libltdl b/devel/gnu-libtool/pkg-plist.libltdl new file mode 100644 index 000000000000..1a8458d1a65c --- /dev/null +++ b/devel/gnu-libtool/pkg-plist.libltdl @@ -0,0 +1,5 @@ +@comment $FreeBSD$ +include/ltdl.h +lib/libltdl.a +lib/libltdl.so +lib/libltdl.so.4 diff --git a/devel/libdsp/Makefile b/devel/libdsp/Makefile index de530a374752..feed020d00c6 100644 --- a/devel/libdsp/Makefile +++ b/devel/libdsp/Makefile @@ -16,11 +16,10 @@ DISTNAME= ${PORTNAME}-src-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= C++ class library of common digital signal processing functions -# dont use "USE_LIBTOOL=yes" because there's no configure script -BUILD_DEPENDS= libtool:${PORTSDIR}/devel/libtool - WRKSRC= ${WRKDIR}/libdsp-src/${PORTNAME:S/dsp/DSP/}-${PORTVERSION} +USE_LIBTOOL= yes +LIBTOOLFILES= # none USE_GMAKE= yes MAKE_ENV= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" MKDIR="${MKDIR}" \ INLINE_VER="${INLINE_VER}" @@ -29,6 +28,10 @@ INSTALLS_SHLIB= yes INLINE_VER= 1.2.5 +# There's no configure script, but we need libtool to build +do-configure: + @${DO_NADA} + .include <bsd.port.pre.mk> .if ${ARCH} == "i386" diff --git a/devel/libltdl/Makefile b/devel/libltdl/Makefile new file mode 100644 index 000000000000..079e42eac4fc --- /dev/null +++ b/devel/libltdl/Makefile @@ -0,0 +1,21 @@ +# New ports collection makefile for: libltdl +# Date created: 23 January 2002 +# Whom: Jeremy Norris <ishmael27x@yahoo.com> +# +# $FreeBSD$ +# + +PORTNAME= libltdl +PORTREVISION= 0 +MASTERDIR= ${.CURDIR}/../libtool14 + +COMMENT= System independent dlopen wrapper + +INSTALLS_SHLIB= yes +CONFIGURE_ARGS= --enable-ltdl-install +BUILD_WRKSRC= ${WRKSRC}/libltdl +INSTALL_WRKSRC= ${WRKSRC}/libltdl +DESCR= ${PKGDIR}/pkg-descr.libltdl +PLIST= ${PKGDIR}/pkg-plist.libltdl + +.include "${MASTERDIR}/Makefile" diff --git a/devel/libltdl15/Makefile b/devel/libltdl15/Makefile new file mode 100644 index 000000000000..079e42eac4fc --- /dev/null +++ b/devel/libltdl15/Makefile @@ -0,0 +1,21 @@ +# New ports collection makefile for: libltdl +# Date created: 23 January 2002 +# Whom: Jeremy Norris <ishmael27x@yahoo.com> +# +# $FreeBSD$ +# + +PORTNAME= libltdl +PORTREVISION= 0 +MASTERDIR= ${.CURDIR}/../libtool14 + +COMMENT= System independent dlopen wrapper + +INSTALLS_SHLIB= yes +CONFIGURE_ARGS= --enable-ltdl-install +BUILD_WRKSRC= ${WRKSRC}/libltdl +INSTALL_WRKSRC= ${WRKSRC}/libltdl +DESCR= ${PKGDIR}/pkg-descr.libltdl +PLIST= ${PKGDIR}/pkg-plist.libltdl + +.include "${MASTERDIR}/Makefile" diff --git a/devel/libtool/Makefile b/devel/libtool/Makefile deleted file mode 100644 index fe6e1d76b734..000000000000 --- a/devel/libtool/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# New ports collection makefile for: libtool -# Date created: 6 May 1998 -# Whom: Motoyuki Kasahara <m-kasahr@sra.co.jp> -# -# $FreeBSD$ -# - -PORTNAME= libtool -PORTVERSION= 1.3.4 -PORTREVISION= 4 -CATEGORIES= devel -MASTER_SITES= ${MASTER_SITE_GNU} -MASTER_SITE_SUBDIR= libtool - -MAINTAINER= ade@FreeBSD.org -COMMENT= Generic shared library support script - -# This port has not been upgraded to 1.4 because it is used by about 30% of -# the ports collection, and more testing is needed. If someone can supply a -# working patch then it will be upgraded. - -INSTALLS_SHLIB= yes -GNU_CONFIGURE= yes -CONFIGURE_ENV= PREFIX=${PREFIX} - -.ifdef USE_LIBTOOL -.error You have `USE_LIBTOOL' variable defined either in environment or in make(1) arguments. Please undefine and try again. -.endif - -.include <bsd.port.mk> diff --git a/devel/libtool/distinfo b/devel/libtool/distinfo deleted file mode 100644 index c39e3aaff92d..000000000000 --- a/devel/libtool/distinfo +++ /dev/null @@ -1 +0,0 @@ -MD5 (libtool-1.3.4.tar.gz) = 0c3844fedd382e5796865ca58842713e diff --git a/devel/libtool/files/patch-aa b/devel/libtool/files/patch-aa deleted file mode 100644 index 91ff871e5ae3..000000000000 --- a/devel/libtool/files/patch-aa +++ /dev/null @@ -1,11 +0,0 @@ ---- doc/libtool.texi.orig Tue Jun 29 15:48:12 1999 -+++ doc/libtool.texi Tue Aug 31 23:41:25 1999 -@@ -11,7 +11,7 @@ - @set MAILLIST the libtool mailing list @email{libtool@@gnu.org} - @set objdir .libs - --@dircategory GNU programming tools -+@dircategory Programming & development tools - @direntry - * Libtool: (libtool). Generic shared library support script. - @end direntry diff --git a/devel/libtool/files/patch-ab b/devel/libtool/files/patch-ab deleted file mode 100644 index f96b92eac308..000000000000 --- a/devel/libtool/files/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ ---- doc/Makefile.in.orig Fri Jul 2 09:24:54 1999 -+++ doc/Makefile.in Tue Aug 31 23:41:57 1999 -@@ -70,7 +70,7 @@ - LIBTOOL = @LIBTOOL@ - LIBTOOL_FLAGS = @LIBTOOL_FLAGS@ - LN_S = @LN_S@ --MAKEINFO = @MAKEINFO@ -+MAKEINFO = @MAKEINFO@ --no-split - NM = @NM@ - OBJDUMP = @OBJDUMP@ - PACKAGE = @PACKAGE@ diff --git a/devel/libtool/files/patch-ac b/devel/libtool/files/patch-ac deleted file mode 100644 index 3a1894e10003..000000000000 --- a/devel/libtool/files/patch-ac +++ /dev/null @@ -1,157 +0,0 @@ - -$FreeBSD$ - ---- ltconfig.orig Tue Dec 7 23:50:48 1999 -+++ ltconfig Sat Jun 8 11:48:12 2002 -@@ -169,7 +169,7 @@ - # Constants: - PROGRAM=ltconfig - PACKAGE=libtool --VERSION=1.3.4 -+VERSION=1.3.4-freebsd-ports - TIMESTAMP=" (1.385.2.196 1999/12/07 21:47:57)" - ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' - ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -@@ -185,6 +185,8 @@ - # which needs '.lib'). - enable_static=yes - enable_fast_install=yes -+install_ltlibs=yes -+release_suffix=yes - enable_dlopen=unknown - enable_win32_dll=no - ltmain= -@@ -242,10 +244,14 @@ - - Generate a system-specific libtool script. - -+ --build no-op to keep compatability with configure scripts generated for 1.4 - --debug enable verbose shell tracing - --disable-shared do not build shared libraries - --disable-static do not build static libraries - --disable-fast-install do not optimize for fast installation -+ --disable-ltlibs don't install the .la archives -+ --release-ignore don't use -release specification -+ --release-suffix use -release suffix for all files - --enable-dlopen enable dlopen support - --enable-win32-dll enable building dlls on win32 hosts - --help display this help and exit -@@ -268,6 +274,8 @@ - exit 0 - ;; - -+ --build=*) ;; -+ - --debug) - echo "$progname: enabling shell trace mode" - set -x -@@ -279,6 +287,12 @@ - - --disable-fast-install) enable_fast_install=no ;; - -+ --disable-ltlibs) install_ltlibs=no ;; -+ -+ --release-ignore) release_suffix=no ;; -+ -+ --release-suffix) release_suffix=all ;; -+ - --enable-dlopen) enable_dlopen=yes ;; - - --enable-win32-dll) enable_win32_dll=yes ;; -@@ -971,11 +985,11 @@ - $rm conftest.dat - if ln -s X conftest.dat 2>/dev/null; then - $rm conftest.dat -- LN_S="ln -s" -+ LN_S="ln -sf" - else - LN_S=ln - fi -- if test "$LN_S" = "ln -s"; then -+ if test "$LN_S" = "ln -sf"; then - echo "$ac_t"yes 1>&6 - else - echo "$ac_t"no 1>&6 -@@ -1226,8 +1240,8 @@ - - *) - if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $compile_rpath $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $compile_rpath $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -1353,14 +1367,6 @@ - hardcode_shlibpath_var=no - ;; - -- # FreeBSD 3 and greater uses gcc -shared to do shared libraries. -- freebsd*) -- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $linkopts' -- hardcode_libdir_flag_spec='-R$libdir' -- hardcode_direct=yes -- hardcode_shlibpath_var=no -- ;; -- - hpux9* | hpux10* | hpux11*) - case "$host_os" in - hpux9*) archive_cmds='$rm $objdir/$soname~$LD -b +b $install_libdir -o $objdir/$soname $libobjs $deplibs $linkopts~test $objdir/$soname = $lib || mv $objdir/$soname $lib' ;; -@@ -1775,7 +1781,7 @@ - version_type=none - dynamic_linker="$host_os ld.so" - sys_lib_dlsearch_path_spec="/lib /usr/lib" --sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -+sys_lib_search_path_spec="/lib /usr/lib" - file_magic_cmd= - file_magic_test_file= - deplibs_check_method='unknown' -@@ -1873,19 +1879,22 @@ - version_type=freebsd-$objformat - case "$version_type" in - freebsd-elf*) -- deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object' -- file_magic_cmd=/usr/bin/file -- file_magic_test_file=`echo /usr/lib/libc.so*` -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so' -- need_version=no -- need_lib_prefix=no -+ deplibs_check_method='file_magic (ELF [0-9][0-9]*-bit [LM]SB shared object|current ar archive)' - ;; - freebsd-*) -- deplibs_check_method=unknown -- library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix' -- need_version=yes -+ deplibs_check_method='file_magic FreeBSD.* shared library' - ;; - esac -+ file_magic_cmd=/usr/bin/file -+ file_magic_test_file=`echo /usr/lib/libc.so.*` -+ if test "$release_suffix" = all; then -+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so' -+ else -+ library_names_spec='${libname}${release}.so$versuffix ${libname}.so' -+ fi -+ need_version=no -+ need_lib_prefix=no -+ finish_cmds='/usr/bin/env OBJFORMAT="'"$objformat"'" /sbin/ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - case "$host_os" in - freebsd2* | freebsd3.[01]* | freebsdelf3.[01]*) -@@ -2776,6 +2785,15 @@ - - # Shell to use when invoking shell scripts. - SHELL=$LTSHELL -+ -+# Whether to waste disk space. -+install_ltlibs=$install_ltlibs -+ -+# What to do with -release. -+# yes - only for shared archive -+# no - ingnore -+# all - for all archives -+release_suffix=$release_suffix - - # Whether or not to build shared libraries. - build_libtool_libs=$enable_shared diff --git a/devel/libtool/files/patch-ad b/devel/libtool/files/patch-ad deleted file mode 100644 index 3ec71700ffbb..000000000000 --- a/devel/libtool/files/patch-ad +++ /dev/null @@ -1,247 +0,0 @@ - -$FreeBSD$ - ---- ltmain.sh.orig Tue Dec 7 23:50:49 1999 -+++ ltmain.sh Thu May 2 10:24:05 2002 -@@ -23,6 +23,9 @@ - # configuration script generated by Autoconf, you may include it under - # the same distribution terms that you use for the rest of that program. - -+EXPR_COMPAT=1 -+export EXPR_COMPAT -+ - # Check that we have a working $echo. - if test "X$1" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. -@@ -54,7 +57,7 @@ - # Constants. - PROGRAM=ltmain.sh - PACKAGE=libtool --VERSION=1.3.4 -+VERSION=1.3.4-freebsd-ports - TIMESTAMP=" (1.385.2.196 1999/12/07 21:47:57)" - - default_mode= -@@ -952,7 +955,11 @@ - continue - ;; - release) -- release="-$arg" -+ if test "$release_suffix" = all; then -+ release="$arg" -+ elif test "$release_suffix" = yes; then -+ release="-$arg" -+ fi - prev= - continue - ;; -@@ -1005,6 +1012,7 @@ - ;; - - -avoid-version) -+ build_old_libs=no - avoid_version=yes - continue - ;; -@@ -1091,6 +1099,10 @@ - deplibs="$deplibs $arg" - ;; - -+ -?thread) -+ deplibs="$deplibs $arg" -+ ;; -+ - -module) - module=yes - continue -@@ -1168,7 +1180,7 @@ - - *.o | *.obj | *.a | *.lib) - # A standard object. -- objs="$objs $arg" -+ libobjs="$libobjs $arg" - ;; - - *.lo) -@@ -1603,12 +1615,6 @@ - exit 1 - fi - -- # How the heck are we supposed to write a wrapper for a shared library? -- if test -n "$link_against_libtool_libs"; then -- $echo "$modename: error: cannot link shared libraries into libtool libraries" 1>&2 -- exit 1 -- fi -- - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - $echo "$modename: warning: \`-dlopen' is ignored for libtool libraries" 1>&2 - fi -@@ -1795,6 +1801,9 @@ - *-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*) - # these systems don't actually have a c library (as such)! - ;; -+ *-*-freebsd*) -+ # FreeBSD doesn't need this... -+ ;; - *) - # Add libc to deplibs on all other systems. - deplibs="$deplibs -lc" -@@ -1802,6 +1811,94 @@ - esac - fi - -+ if test -n "$rpath$xrpath"; then -+ # If the user specified any rpath flags, then add them. -+ for libdir in $rpath $xrpath; do -+ # This is the magic to use -rpath. -+ case "$compile_rpath " in -+ *" $libdir "*) ;; -+ *) compile_rpath="$compile_rpath $libdir" ;; -+ esac -+ case "$finalize_rpath " in -+ *" $libdir "*) ;; -+ *) finalize_rpath="$finalize_rpath $libdir" ;; -+ esac -+ done -+ fi -+ -+ # Now hardcode the library paths -+ rpath= -+ hardcode_libdirs= -+ for libdir in $compile_rpath; do -+ if test -n "$hardcode_libdir_flag_spec"; then -+ if test -n "$hardcode_libdir_separator"; then -+ if test -z "$hardcode_libdirs"; then -+ hardcode_libdirs="$libdir" -+ else -+ # Just accumulate the unique libdirs. -+ case "$hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator" in -+ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) -+ ;; -+ *) -+ hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" -+ ;; -+ esac -+ fi -+ else -+ eval flag=\"$hardcode_libdir_flag_spec\" -+ rpath="$rpath $flag" -+ fi -+ elif test -n "$runpath_var"; then -+ case "$perm_rpath " in -+ *" $libdir "*) ;; -+ *) perm_rpath="$perm_rpath $libdir" ;; -+ esac -+ fi -+ done -+ # Substitute the hardcoded libdirs into the rpath. -+ if test -n "$hardcode_libdir_separator" && -+ test -n "$hardcode_libdirs"; then -+ libdir="$hardcode_libdirs" -+ eval rpath=\" $hardcode_libdir_flag_spec\" -+ fi -+ compile_rpath="$rpath" -+ -+ rpath= -+ hardcode_libdirs= -+ for libdir in $finalize_rpath; do -+ if test -n "$hardcode_libdir_flag_spec"; then -+ if test -n "$hardcode_libdir_separator"; then -+ if test -z "$hardcode_libdirs"; then -+ hardcode_libdirs="$libdir" -+ else -+ # Just accumulate the unique libdirs. -+ case "$hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator" in -+ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) -+ ;; -+ *) -+ hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" -+ ;; -+ esac -+ fi -+ else -+ eval flag=\"$hardcode_libdir_flag_spec\" -+ rpath="$rpath $flag" -+ fi -+ elif test -n "$runpath_var"; then -+ case "$finalize_perm_rpath " in -+ *" $libdir "*) ;; -+ *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;; -+ esac -+ fi -+ done -+ # Substitute the hardcoded libdirs into the rpath. -+ if test -n "$hardcode_libdir_separator" && -+ test -n "$hardcode_libdirs"; then -+ libdir="$hardcode_libdirs" -+ eval rpath=\" $hardcode_libdir_flag_spec\" -+ fi -+ finalize_rpath="$rpath" -+ - # Create the output directory, or remove our outputs if we need to. - if test -d $output_objdir; then - $show "${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*" -@@ -1817,7 +1914,11 @@ - - # Now set the variables for building old libraries. - if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then -- oldlibs="$oldlibs $output_objdir/$libname.$libext" -+ if test "$release_suffix" = all; then -+ oldlibs="$oldlibs $output_objdir/$libname$release.$libext" -+ else -+ oldlibs="$oldlibs $output_objdir/$libname.$libext" -+ fi - - # Transform .lo files to .o files. - oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP` -@@ -2011,7 +2112,11 @@ - echo "*** \`nm' from GNU binutils and a full rebuild may help." - fi - if test "$build_old_libs" = no; then -- oldlibs="$output_objdir/$libname.$libext" -+ if test "$release_suffix" = all; then -+ oldlibs="$output_objdir/$libname$release.$libext" -+ else -+ oldlibs="$output_objdir/$libname.$libext" -+ fi - build_libtool_libs=module - build_old_libs=yes - else -@@ -3059,7 +3164,11 @@ - case "$output" in - *.la) - old_library= -- test "$build_old_libs" = yes && old_library="$libname.$libext" -+ if test "$release_suffix" = all; then -+ test "$build_old_libs" = yes && old_library="$libname$release.$libext" -+ else -+ test "$build_old_libs" = yes && old_library="$libname.$libext" -+ fi - $show "creating $output" - - if test -n "$xrpath"; then -@@ -3348,10 +3457,12 @@ - fi - - # Install the pseudo-library for information purposes. -- name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` -- instname="$dir/$name"i -- $show "$install_prog $instname $destdir/$name" -- $run eval "$install_prog $instname $destdir/$name" || exit $? -+ if test "$install_ltlibs" = yes; then -+ name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` -+ instname="$dir/$name"i -+ $show "$install_prog $instname $destdir/$name" -+ $run eval "$install_prog $instname $destdir/$name" || exit $? -+ fi - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" -@@ -3440,7 +3551,6 @@ - fi - libfile="$libdir/`$echo "X$lib" | $Xsed -e 's%^.*/%%g'`" - if test -n "$libdir" && test ! -f "$libfile"; then -- $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2 - finalize=no - fi - done diff --git a/devel/libtool/files/patch-ae b/devel/libtool/files/patch-ae deleted file mode 100644 index c92b003b58cd..000000000000 --- a/devel/libtool/files/patch-ae +++ /dev/null @@ -1,13 +0,0 @@ ---- configure.orig Fri Jul 2 09:01:56 1999 -+++ configure Tue Aug 31 23:45:29 1999 -@@ -1853,10 +1853,6 @@ - *) # Relative path. - ac_sub_cache_file="$ac_dots$cache_file" ;; - esac -- case "$ac_given_INSTALL" in -- [/$]*) INSTALL="$ac_given_INSTALL" ;; -- *) INSTALL="$ac_dots$ac_given_INSTALL" ;; -- esac - - echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir" - # The eval makes quoting arguments work. diff --git a/devel/libtool/files/patch-af b/devel/libtool/files/patch-af deleted file mode 100644 index beb6be3b456f..000000000000 --- a/devel/libtool/files/patch-af +++ /dev/null @@ -1,24 +0,0 @@ ---- libltdl/Makefile.in.orig Tue Dec 7 13:03:38 1999 -+++ libltdl/Makefile.in Mon Jan 17 16:35:34 2000 -@@ -326,17 +326,16 @@ - distdir: $(DISTFILES) - -rm -rf $(distdir) - mkdir $(distdir) -- -chmod 777 $(distdir) -+ -chmod 555 $(distdir) - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ -- cp -pr $$d/$$file $(distdir)/$$file; \ -+ echo no copy dir $$d/$$file; \ - else \ -- test -f $(distdir)/$$file \ -- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ -- || cp -p $$d/$$file $(distdir)/$$file || :; \ -+ install -c -o root -g wheel -m 444 $$d/$$file $(distdir)/$$file; \ - fi; \ - done -+ -chmod a+x $(distdir)/configure - info-am: - info: info-am - dvi-am: diff --git a/devel/libtool/files/patch-ag b/devel/libtool/files/patch-ag deleted file mode 100644 index 5fdcd1924641..000000000000 --- a/devel/libtool/files/patch-ag +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- libltdl/configure 2001/01/31 10:58:38 1.1 -+++ libltdl/configure 2001/01/31 10:59:14 -@@ -1455,7 +1455,7 @@ - esac - - # Check for any special flags to pass to ltconfig. --libtool_flags="--cache-file=$cache_file" -+libtool_flags="--cache-file=$cache_file --disable-ltlibs" - test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared" - test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static" - test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install" diff --git a/devel/libtool/pkg-descr b/devel/libtool/pkg-descr deleted file mode 100644 index 1dea88bf6d51..000000000000 --- a/devel/libtool/pkg-descr +++ /dev/null @@ -1,8 +0,0 @@ -This is GNU Libtool, a generic library support script. Libtool hides -the complexity of using shared libraries behind a consistent, portable -interface. - -To use libtool, add the new generic library building commands to your -Makefile, Makefile.in, or Makefile.am. - -WWW: http://www.gnu.org/software/libtool/ diff --git a/devel/libtool/pkg-plist b/devel/libtool/pkg-plist deleted file mode 100644 index f057cdf134b2..000000000000 --- a/devel/libtool/pkg-plist +++ /dev/null @@ -1,29 +0,0 @@ -bin/libtool -bin/libtoolize -include/ltdl.h -@unexec install-info --delete %D/info/libtool.info %D/info/dir -info/libtool.info -@exec install-info %D/info/libtool.info %D/info/dir -lib/libltdl.a -lib/libltdl.so -lib/libltdl.so.1 -share/aclocal/libtool.m4 -share/libtool/config.guess -share/libtool/config.sub -share/libtool/libltdl/COPYING.LIB -share/libtool/libltdl/Makefile.am -share/libtool/libltdl/Makefile.in -share/libtool/libltdl/README -share/libtool/libltdl/acconfig.h -share/libtool/libltdl/acinclude.m4 -share/libtool/libltdl/aclocal.m4 -share/libtool/libltdl/config.h.in -share/libtool/libltdl/configure -share/libtool/libltdl/configure.in -share/libtool/libltdl/ltdl.c -share/libtool/libltdl/ltdl.h -share/libtool/libltdl/stamp-h.in -share/libtool/ltconfig -share/libtool/ltmain.sh -@dirrm share/libtool/libltdl -@dirrm share/libtool diff --git a/devel/libtool13/Makefile b/devel/libtool13/Makefile index fe6e1d76b734..154c7665074d 100644 --- a/devel/libtool13/Makefile +++ b/devel/libtool13/Makefile @@ -6,25 +6,49 @@ # PORTNAME= libtool -PORTVERSION= 1.3.4 -PORTREVISION= 4 +PORTVERSION= 1.3.5 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= libtool +DISTNAME= libtool-${PORTVERSION} MAINTAINER= ade@FreeBSD.org COMMENT= Generic shared library support script -# This port has not been upgraded to 1.4 because it is used by about 30% of -# the ports collection, and more testing is needed. If someone can supply a -# working patch then it will be upgraded. - -INSTALLS_SHLIB= yes +LATEST_LINK= libtool13 GNU_CONFIGURE= yes -CONFIGURE_ENV= PREFIX=${PREFIX} +CONFIGURE_ARGS= --disable-ltdl-install \ + --program-suffix=13 +CONFIGURE_ENV= PREFIX=${PREFIX} PACKAGE=libtool13 +USE_REINPLACE= yes + +.if defined(USE_LIBTOOL) || defined(USE_LIBTOOL_VER) +pre-everything: + @${ECHO} =========================================================== + @${ECHO} "You have 'USE_LIBTOOL' or 'USE_LIBTOOL_VER' variables" + @${ECHO} "defined either in environment or in make(1) arguments." + @${ECHO} "Please undefine them and try again." + @${ECHO} =========================================================== + @${FALSE} +.endif # defined(USE_LIBTOOL) || defined(USE_LIBTOOL_VER) + +post-extract: + @${MV} -f ${WRKSRC}/libtool.m4 ${WRKSRC}/libtool13.m4 + @${REINPLACE_CMD} -e 's|libtool.m4|libtool13.m4|g' \ + ${WRKSRC}/Makefile.in + @${MV} -f ${WRKSRC}/doc/libtool.info ${WRKSRC}/doc/libtool13.info + @${MV} -f ${WRKSRC}/doc/libtool.texi ${WRKSRC}/doc/libtool13.texi -.ifdef USE_LIBTOOL -.error You have `USE_LIBTOOL' variable defined either in environment or in make(1) arguments. Please undefine and try again. -.endif +post-install: + @-${RM} -fr ${PREFIX}/libexec/libtool13 + ${MKDIR} ${PREFIX}/libexec/libtool13 +.for i in libtool libtoolize + ${LN} -sf ${PREFIX}/bin/${i}13 ${PREFIX}/libexec/libtool13/${i} +.endfor +.for i in config.guess config.sub + ${MV} ${PREFIX}/share/libtool13/${i}13 ${PREFIX}/share/libtool13/${i} +.endfor + ${LN} -sf ${PREFIX}/share/libtool13/ltconfig13 \ + ${PREFIX}/share/libtool13/ltconfig .include <bsd.port.mk> diff --git a/devel/libtool13/distinfo b/devel/libtool13/distinfo index c39e3aaff92d..2b891425c242 100644 --- a/devel/libtool13/distinfo +++ b/devel/libtool13/distinfo @@ -1 +1 @@ -MD5 (libtool-1.3.4.tar.gz) = 0c3844fedd382e5796865ca58842713e +MD5 (libtool-1.3.5.tar.gz) = fa26a07c978ad05d1f88ed7a472daa49 diff --git a/devel/libtool13/files/patch-aa b/devel/libtool13/files/patch-aa index 91ff871e5ae3..95c4f56b1de3 100644 --- a/devel/libtool13/files/patch-aa +++ b/devel/libtool13/files/patch-aa @@ -1,11 +1,28 @@ ---- doc/libtool.texi.orig Tue Jun 29 15:48:12 1999 -+++ doc/libtool.texi Tue Aug 31 23:41:25 1999 -@@ -11,7 +11,7 @@ +--- doc/libtool13.texi.orig Tue Nov 2 07:36:23 1999 ++++ doc/libtool13.texi Sat Dec 14 00:11:27 2002 +@@ -1,6 +1,6 @@ + \input texinfo @c -*-texinfo-*- + @c %**start of header +-@setfilename libtool.info ++@setfilename libtool13.info + @settitle Libtool + @c For double-sided printing, uncomment: + @c @setchapternewpage odd +@@ -11,14 +11,14 @@ @set MAILLIST the libtool mailing list @email{libtool@@gnu.org} @set objdir .libs -@dircategory GNU programming tools +@dircategory Programming & development tools @direntry - * Libtool: (libtool). Generic shared library support script. +-* Libtool: (libtool). Generic shared library support script. ++* Libtool: (libtool13). Generic shared library support script. @end direntry + + @dircategory Individual utilities + @direntry +-* libtoolize: (libtool)Invoking libtoolize. Adding libtool support. ++* libtoolize: (libtool13)Invoking libtoolize. Adding libtool support. + @end direntry + + @ifinfo diff --git a/devel/libtool13/files/patch-ab b/devel/libtool13/files/patch-ab index f96b92eac308..18ada0907569 100644 --- a/devel/libtool13/files/patch-ab +++ b/devel/libtool13/files/patch-ab @@ -1,6 +1,6 @@ ---- doc/Makefile.in.orig Fri Jul 2 09:24:54 1999 -+++ doc/Makefile.in Tue Aug 31 23:41:57 1999 -@@ -70,7 +70,7 @@ +--- doc/Makefile.in.orig Sat May 27 07:23:34 2000 ++++ doc/Makefile.in Sat Dec 14 00:04:56 2002 +@@ -71,7 +71,7 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_FLAGS = @LIBTOOL_FLAGS@ LN_S = @LN_S@ @@ -9,3 +9,62 @@ NM = @NM@ OBJDUMP = @OBJDUMP@ PACKAGE = @PACKAGE@ +@@ -81,15 +81,15 @@ + pkgdatadir = @pkgdatadir@ + + AUTOMAKE_OPTIONS = gnits +-info_TEXINFOS = libtool.texi +-libtool_TEXINFOS = PLATFORMS ++info_TEXINFOS = libtool13.texi ++libtool13_TEXINFOS = PLATFORMS + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_CLEAN_FILES = + TEXI2DVI = texi2dvi +-INFO_DEPS = libtool.info +-DVIS = libtool.dvi +-TEXINFOS = libtool.texi +-DIST_COMMON = $(libtool_TEXINFOS) Makefile.am Makefile.in mdate-sh \ ++INFO_DEPS = libtool13.info ++DVIS = libtool13.dvi ++TEXINFOS = libtool13.texi ++DIST_COMMON = $(libtool13_TEXINFOS) Makefile.am Makefile.in mdate-sh \ + stamp-vti texinfo.tex version.texi + + +@@ -111,8 +111,8 @@ + $(srcdir)/version.texi: stamp-vti + @: + +-$(srcdir)/stamp-vti: libtool.texi $(top_srcdir)/configure.in +- @echo "@set UPDATED `$(SHELL) $(srcdir)/mdate-sh $(srcdir)/libtool.texi`" > vti.tmp ++$(srcdir)/stamp-vti: libtool13.texi $(top_srcdir)/configure.in ++ @echo "@set UPDATED `$(SHELL) $(srcdir)/mdate-sh $(srcdir)/libtool13.texi`" > vti.tmp + @echo "@set EDITION $(VERSION)" >> vti.tmp + @echo "@set VERSION $(VERSION)" >> vti.tmp + @cmp -s vti.tmp $(srcdir)/version.texi \ +@@ -131,8 +131,8 @@ + maintainer-clean-vti: + -rm -f $(srcdir)/stamp-vti $(srcdir)/version.texi + +-libtool.info: libtool.texi version.texi $(libtool_TEXINFOS) +-libtool.dvi: libtool.texi version.texi $(libtool_TEXINFOS) ++libtool13.info: libtool13.texi version.texi $(libtool13_TEXINFOS) ++libtool13.dvi: libtool13.texi version.texi $(libtool13_TEXINFOS) + + + DVIPS = dvips +@@ -231,10 +231,10 @@ + done + + mostlyclean-aminfo: +- -rm -f libtool.aux libtool.cp libtool.cps libtool.dvi libtool.fn \ +- libtool.fns libtool.ky libtool.kys libtool.ps libtool.log \ +- libtool.pg libtool.toc libtool.tp libtool.tps libtool.vr \ +- libtool.vrs libtool.op libtool.tr libtool.cv libtool.cn ++ -rm -f libtool13.aux libtool13.cp libtool13.cps libtool13.dvi libtool13.fn \ ++ libtool13.fns libtool13.ky libtool13.kys libtool13.ps libtool13.log \ ++ libtool13.pg libtool13.toc libtool13.tp libtool13.tps libtool13.vr \ ++ libtool13.vrs libtool13.op libtool13.tr libtool13.cv libtool13.cn + + clean-aminfo: + diff --git a/devel/libtool13/files/patch-ac b/devel/libtool13/files/patch-ac index 3a1894e10003..b74f12d923d3 100644 --- a/devel/libtool13/files/patch-ac +++ b/devel/libtool13/files/patch-ac @@ -1,15 +1,12 @@ - -$FreeBSD$ - ---- ltconfig.orig Tue Dec 7 23:50:48 1999 -+++ ltconfig Sat Jun 8 11:48:12 2002 +--- ltconfig.orig Fri Dec 13 23:36:10 2002 ++++ ltconfig Fri Dec 13 23:47:30 2002 @@ -169,7 +169,7 @@ # Constants: PROGRAM=ltconfig PACKAGE=libtool --VERSION=1.3.4 -+VERSION=1.3.4-freebsd-ports - TIMESTAMP=" (1.385.2.196 1999/12/07 21:47:57)" +-VERSION=1.3.5 ++VERSION=1.3.5-freebsd-ports + TIMESTAMP=" (1.385.2.206 2000/05/27 11:12:27)" ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' @@ -185,6 +185,8 @@ @@ -72,7 +69,7 @@ $FreeBSD$ echo "$ac_t"yes 1>&6 else echo "$ac_t"no 1>&6 -@@ -1226,8 +1240,8 @@ +@@ -1232,8 +1246,8 @@ *) if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then @@ -83,7 +80,7 @@ $FreeBSD$ else ld_shlibs=no fi -@@ -1353,14 +1367,6 @@ +@@ -1359,14 +1373,6 @@ hardcode_shlibpath_var=no ;; @@ -98,7 +95,7 @@ $FreeBSD$ hpux9* | hpux10* | hpux11*) case "$host_os" in hpux9*) archive_cmds='$rm $objdir/$soname~$LD -b +b $install_libdir -o $objdir/$soname $libobjs $deplibs $linkopts~test $objdir/$soname = $lib || mv $objdir/$soname $lib' ;; -@@ -1775,7 +1781,7 @@ +@@ -1793,7 +1799,7 @@ version_type=none dynamic_linker="$host_os ld.so" sys_lib_dlsearch_path_spec="/lib /usr/lib" @@ -107,7 +104,7 @@ $FreeBSD$ file_magic_cmd= file_magic_test_file= deplibs_check_method='unknown' -@@ -1873,19 +1879,22 @@ +@@ -1891,19 +1897,22 @@ version_type=freebsd-$objformat case "$version_type" in freebsd-elf*) @@ -127,7 +124,7 @@ $FreeBSD$ ;; esac + file_magic_cmd=/usr/bin/file -+ file_magic_test_file=`echo /usr/lib/libc.so.*` ++ file_magic_test_file=`echo /usr/lib/libc.so*` + if test "$release_suffix" = all; then + library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so' + else @@ -139,7 +136,7 @@ $FreeBSD$ shlibpath_var=LD_LIBRARY_PATH case "$host_os" in freebsd2* | freebsd3.[01]* | freebsdelf3.[01]*) -@@ -2776,6 +2785,15 @@ +@@ -2812,6 +2821,15 @@ # Shell to use when invoking shell scripts. SHELL=$LTSHELL diff --git a/devel/libtool13/files/patch-ad b/devel/libtool13/files/patch-ad index 3ec71700ffbb..304e840caaa9 100644 --- a/devel/libtool13/files/patch-ad +++ b/devel/libtool13/files/patch-ad @@ -1,8 +1,5 @@ - -$FreeBSD$ - ---- ltmain.sh.orig Tue Dec 7 23:50:49 1999 -+++ ltmain.sh Thu May 2 10:24:05 2002 +--- ltmain.sh.orig Sat May 27 07:15:01 2000 ++++ ltmain.sh Fri Dec 13 23:50:12 2002 @@ -23,6 +23,9 @@ # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. @@ -17,20 +14,19 @@ $FreeBSD$ # Constants. PROGRAM=ltmain.sh PACKAGE=libtool --VERSION=1.3.4 -+VERSION=1.3.4-freebsd-ports - TIMESTAMP=" (1.385.2.196 1999/12/07 21:47:57)" +-VERSION=1.3.5 ++VERSION=1.3.5-freebsd-ports + TIMESTAMP=" (1.385.2.206 2000/05/27 11:12:27)" default_mode= @@ -952,7 +955,11 @@ continue ;; release) -- release="-$arg" + if test "$release_suffix" = all; then + release="$arg" + elif test "$release_suffix" = yes; then -+ release="-$arg" + release="-$arg" + fi prev= continue @@ -76,9 +72,9 @@ $FreeBSD$ if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then $echo "$modename: warning: \`-dlopen' is ignored for libtool libraries" 1>&2 fi -@@ -1795,6 +1801,9 @@ - *-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*) - # these systems don't actually have a c library (as such)! +@@ -1799,6 +1805,9 @@ + # rhapsody is a little odd... + deplibs="$deplibs -framework System" ;; + *-*-freebsd*) + # FreeBSD doesn't need this... @@ -86,7 +82,7 @@ $FreeBSD$ *) # Add libc to deplibs on all other systems. deplibs="$deplibs -lc" -@@ -1802,6 +1811,94 @@ +@@ -1806,6 +1815,94 @@ esac fi @@ -181,63 +177,56 @@ $FreeBSD$ # Create the output directory, or remove our outputs if we need to. if test -d $output_objdir; then $show "${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*" -@@ -1817,7 +1914,11 @@ +@@ -1821,7 +1918,11 @@ # Now set the variables for building old libraries. if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then -- oldlibs="$oldlibs $output_objdir/$libname.$libext" + if test "$release_suffix" = all; then + oldlibs="$oldlibs $output_objdir/$libname$release.$libext" + else -+ oldlibs="$oldlibs $output_objdir/$libname.$libext" + oldlibs="$oldlibs $output_objdir/$libname.$libext" + fi # Transform .lo files to .o files. oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP` -@@ -2011,7 +2112,11 @@ +@@ -2015,7 +2116,11 @@ echo "*** \`nm' from GNU binutils and a full rebuild may help." fi if test "$build_old_libs" = no; then -- oldlibs="$output_objdir/$libname.$libext" + if test "$release_suffix" = all; then + oldlibs="$output_objdir/$libname$release.$libext" + else -+ oldlibs="$output_objdir/$libname.$libext" + oldlibs="$output_objdir/$libname.$libext" + fi build_libtool_libs=module build_old_libs=yes else -@@ -3059,7 +3164,11 @@ +@@ -3071,7 +3176,11 @@ case "$output" in *.la) old_library= -- test "$build_old_libs" = yes && old_library="$libname.$libext" + if test "$release_suffix" = all; then + test "$build_old_libs" = yes && old_library="$libname$release.$libext" + else -+ test "$build_old_libs" = yes && old_library="$libname.$libext" + test "$build_old_libs" = yes && old_library="$libname.$libext" + fi $show "creating $output" if test -n "$xrpath"; then -@@ -3348,10 +3457,12 @@ +@@ -3360,10 +3469,12 @@ fi # Install the pseudo-library for information purposes. -- name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` -- instname="$dir/$name"i -- $show "$install_prog $instname $destdir/$name" -- $run eval "$install_prog $instname $destdir/$name" || exit $? + if test "$install_ltlibs" = yes; then -+ name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` -+ instname="$dir/$name"i -+ $show "$install_prog $instname $destdir/$name" -+ $run eval "$install_prog $instname $destdir/$name" || exit $? + name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + instname="$dir/$name"i + $show "$install_prog $instname $destdir/$name" + $run eval "$install_prog $instname $destdir/$name" || exit $? + fi # Maybe install the static library, too. test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" -@@ -3440,7 +3551,6 @@ +@@ -3452,7 +3563,6 @@ fi libfile="$libdir/`$echo "X$lib" | $Xsed -e 's%^.*/%%g'`" if test -n "$libdir" && test ! -f "$libfile"; then diff --git a/devel/libtool13/files/patch-ae b/devel/libtool13/files/patch-ae index c92b003b58cd..ffd4cff4c7db 100644 --- a/devel/libtool13/files/patch-ae +++ b/devel/libtool13/files/patch-ae @@ -1,6 +1,18 @@ ---- configure.orig Fri Jul 2 09:01:56 1999 -+++ configure Tue Aug 31 23:45:29 1999 -@@ -1853,10 +1853,6 @@ + +$FreeBSD$ + +--- configure.orig Tue Dec 7 15:22:41 1999 ++++ configure Mon Jan 14 16:21:53 2002 +@@ -702,7 +702,7 @@ + fi + + +-PACKAGE=libtool ++PACKAGE=libtool13 + + VERSION=1.3.5 + +@@ -1859,10 +1859,6 @@ *) # Relative path. ac_sub_cache_file="$ac_dots$cache_file" ;; esac diff --git a/devel/libtool13/files/patch-af b/devel/libtool13/files/patch-af index beb6be3b456f..935b056b3c39 100644 --- a/devel/libtool13/files/patch-af +++ b/devel/libtool13/files/patch-af @@ -1,5 +1,8 @@ ---- libltdl/Makefile.in.orig Tue Dec 7 13:03:38 1999 -+++ libltdl/Makefile.in Mon Jan 17 16:35:34 2000 + +$FreeBSD$ + +--- libltdl/Makefile.in.orig Tue Dec 7 15:03:38 1999 ++++ libltdl/Makefile.in Mon Jan 14 17:05:36 2002 @@ -326,17 +326,16 @@ distdir: $(DISTFILES) -rm -rf $(distdir) @@ -22,3 +25,24 @@ info-am: info: info-am dvi-am: +@@ -435,15 +434,15 @@ + $(SHELL) ./config.status --recheck + + local-install-files: $(DISTFILES) +- -rm -rf $(DESTDIR)$(datadir)/libtool/libltdl +- $(mkinstalldirs) $(DESTDIR)$(datadir)/libtool/libltdl ++ -rm -rf $(DESTDIR)$(datadir)/libtool13/libltdl ++ $(mkinstalldirs) $(DESTDIR)$(datadir)/libtool13/libltdl + @for file in $(DISTFILES); do \ + d=$(srcdir); \ + if test -d $$d/$$file; then \ +- cp -r $$d/$$file $(DESTDIR)$(datadir)/libtool/libltdl/$$file; \ ++ cp -r $$d/$$file $(DESTDIR)$(datadir)/libtool13/libltdl/$$file; \ + else \ +- test -f $(DESTDIR)$(datadir)/libtool/libltdl/$$file \ +- || cp $$d/$$file $(DESTDIR)$(datadir)/libtool/libltdl/$$file || :; \ ++ test -f $(DESTDIR)$(datadir)/libtool13/libltdl/$$file \ ++ || cp $$d/$$file $(DESTDIR)$(datadir)/libtool13/libltdl/$$file || :; \ + fi; \ + done + diff --git a/devel/libtool13/files/patch-ag b/devel/libtool13/files/patch-ag deleted file mode 100644 index 5fdcd1924641..000000000000 --- a/devel/libtool13/files/patch-ag +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- libltdl/configure 2001/01/31 10:58:38 1.1 -+++ libltdl/configure 2001/01/31 10:59:14 -@@ -1455,7 +1455,7 @@ - esac - - # Check for any special flags to pass to ltconfig. --libtool_flags="--cache-file=$cache_file" -+libtool_flags="--cache-file=$cache_file --disable-ltlibs" - test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared" - test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static" - test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install" diff --git a/devel/libtool13/files/patch-libtoolize.in b/devel/libtool13/files/patch-libtoolize.in new file mode 100644 index 000000000000..ec80fc6ea6c3 --- /dev/null +++ b/devel/libtool13/files/patch-libtoolize.in @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- libtoolize.in.orig Tue Mar 30 13:25:27 1999 ++++ libtoolize.in Mon Jan 14 16:26:55 2002 +@@ -37,7 +37,7 @@ + pkgdatadir=@pkgdatadir@ + aclocaldir=@aclocaldir@ + +-libtool_m4="$aclocaldir/libtool.m4" ++libtool_m4="$aclocaldir/libtool13.m4" + + dry_run=no + help="Try \`$progname --help' for more information." diff --git a/devel/libtool13/pkg-plist b/devel/libtool13/pkg-plist index f057cdf134b2..6ec0729c163b 100644 --- a/devel/libtool13/pkg-plist +++ b/devel/libtool13/pkg-plist @@ -1,29 +1,30 @@ -bin/libtool -bin/libtoolize -include/ltdl.h -@unexec install-info --delete %D/info/libtool.info %D/info/dir -info/libtool.info -@exec install-info %D/info/libtool.info %D/info/dir -lib/libltdl.a -lib/libltdl.so -lib/libltdl.so.1 -share/aclocal/libtool.m4 -share/libtool/config.guess -share/libtool/config.sub -share/libtool/libltdl/COPYING.LIB -share/libtool/libltdl/Makefile.am -share/libtool/libltdl/Makefile.in -share/libtool/libltdl/README -share/libtool/libltdl/acconfig.h -share/libtool/libltdl/acinclude.m4 -share/libtool/libltdl/aclocal.m4 -share/libtool/libltdl/config.h.in -share/libtool/libltdl/configure -share/libtool/libltdl/configure.in -share/libtool/libltdl/ltdl.c -share/libtool/libltdl/ltdl.h -share/libtool/libltdl/stamp-h.in -share/libtool/ltconfig -share/libtool/ltmain.sh -@dirrm share/libtool/libltdl -@dirrm share/libtool +@comment $FreeBSD$ +bin/libtool13 +bin/libtoolize13 +libexec/libtool13/libtool +libexec/libtool13/libtoolize +@unexec install-info --delete %D/info/libtool13.info %D/info/dir +info/libtool13.info +@exec install-info %D/info/libtool13.info %D/info/dir +share/aclocal/libtool13.m4 +share/libtool13/config.guess +share/libtool13/config.sub +share/libtool13/libltdl/README +share/libtool13/libltdl/stamp-h.in +share/libtool13/libltdl/COPYING.LIB +share/libtool13/libltdl/Makefile.am +share/libtool13/libltdl/Makefile.in +share/libtool13/libltdl/acconfig.h +share/libtool13/libltdl/acinclude.m4 +share/libtool13/libltdl/aclocal.m4 +share/libtool13/libltdl/config.h.in +share/libtool13/libltdl/configure +share/libtool13/libltdl/configure.in +share/libtool13/libltdl/ltdl.c +share/libtool13/libltdl/ltdl.h +share/libtool13/ltconfig +share/libtool13/ltconfig13 +share/libtool13/ltmain.sh +@dirrm share/libtool13/libltdl +@dirrm share/libtool13 +@dirrm libexec/libtool13 diff --git a/devel/libtool14/Makefile b/devel/libtool14/Makefile index fe6e1d76b734..573ac0226009 100644 --- a/devel/libtool14/Makefile +++ b/devel/libtool14/Makefile @@ -5,26 +5,53 @@ # $FreeBSD$ # -PORTNAME= libtool -PORTVERSION= 1.3.4 -PORTREVISION= 4 +PORTNAME?= libtool +PORTVERSION= 1.4.3 +PORTREVISION?= 0 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= libtool +DISTNAME= libtool-${PORTVERSION} MAINTAINER= ade@FreeBSD.org -COMMENT= Generic shared library support script - -# This port has not been upgraded to 1.4 because it is used by about 30% of -# the ports collection, and more testing is needed. If someone can supply a -# working patch then it will be upgraded. +COMMENT?= Generic shared library support script +LATEST_LINK?= libtool14 +GNU_CONFIGURE= yes +CONFIGURE_ARGS?= --disable-ltdl-install +CONFIGURE_ARGS+= --program-suffix=14 INSTALLS_SHLIB= yes -GNU_CONFIGURE= yes -CONFIGURE_ENV= PREFIX=${PREFIX} +CONFIGURE_ENV= PREFIX=${PREFIX} PACKAGE=libtool14 +USE_REINPLACE= yes + +.if defined(USE_LIBTOOL) || defined(USE_LIBTOOL_VER) +pre-everything: + @${ECHO} =========================================================== + @${ECHO} "You have 'USE_LIBTOOL' or 'USE_LIBTOOL_VER' variables" + @${ECHO} "defined either in environment or in make(1) arguments." + @${ECHO} "Please undefine them and try again." + @${ECHO} =========================================================== + @${FALSE} +.endif # defined(USE_LIBTOOL) || defined(USE_LIBTOOL_VER) + +post-extract: + @${MV} -f ${WRKSRC}/libtool.m4 ${WRKSRC}/libtool14.m4 + @${MV} -f ${WRKSRC}/ltdl.m4 ${WRKSRC}/ltdl14.m4 + @${REINPLACE_CMD} -e 's|libtool.m4|libtool14.m4|g' \ + -e 's|ltdl.m4|ltdl14.m4|g' ${WRKSRC}/Makefile.in + @${MV} -f ${WRKSRC}/doc/libtool.info ${WRKSRC}/doc/libtool14.info + @${MV} -f ${WRKSRC}/doc/libtool.texi ${WRKSRC}/doc/libtool14.texi -.ifdef USE_LIBTOOL -.error You have `USE_LIBTOOL' variable defined either in environment or in make(1) arguments. Please undefine and try again. +.if ${PORTNAME} == "libtool" +post-install: + @-${RM} -fr ${PREFIX}/libexec/libtool14 + ${MKDIR} ${PREFIX}/libexec/libtool14 +.for i in libtool libtoolize + ${LN} -sf ${PREFIX}/bin/${i}14 ${PREFIX}/libexec/libtool14/${i} +.endfor +.for i in config.guess config.sub + ${MV} ${PREFIX}/share/libtool14/${i}14 ${PREFIX}/share/libtool14/${i} +.endfor .endif .include <bsd.port.mk> diff --git a/devel/libtool14/distinfo b/devel/libtool14/distinfo index c39e3aaff92d..7cace71782d6 100644 --- a/devel/libtool14/distinfo +++ b/devel/libtool14/distinfo @@ -1 +1 @@ -MD5 (libtool-1.3.4.tar.gz) = 0c3844fedd382e5796865ca58842713e +MD5 (libtool-1.4.3.tar.gz) = d11a3c835449d7fa50a025dc9c01ad81 diff --git a/devel/libtool14/files/patch-aa b/devel/libtool14/files/patch-aa index 91ff871e5ae3..8ba2b3510563 100644 --- a/devel/libtool14/files/patch-aa +++ b/devel/libtool14/files/patch-aa @@ -1,11 +1,15 @@ ---- doc/libtool.texi.orig Tue Jun 29 15:48:12 1999 -+++ doc/libtool.texi Tue Aug 31 23:41:25 1999 -@@ -11,7 +11,7 @@ - @set MAILLIST the libtool mailing list @email{libtool@@gnu.org} - @set objdir .libs +--- doc/libtool14.info.orig Wed Oct 23 02:26:36 2002 ++++ doc/libtool14.info Mon Feb 17 01:46:42 2003 +@@ -3,5 +3,5 @@ --@dircategory GNU programming tools -+@dircategory Programming & development tools - @direntry - * Libtool: (libtool). Generic shared library support script. - @end direntry +-INFO-DIR-SECTION GNU programming tools ++INFO-DIR-SECTION Programming & development tools + START-INFO-DIR-ENTRY +-* Libtool: (libtool). Generic shared library support script. ++* Libtool: (libtool14). Generic shared library support script. + END-INFO-DIR-ENTRY +@@ -10,3 +10,3 @@ + START-INFO-DIR-ENTRY +-* libtoolize: (libtool)Invoking libtoolize. Adding libtool support. ++* libtoolize: (libtool14)Invoking libtoolize. Adding libtool support. + END-INFO-DIR-ENTRY diff --git a/devel/libtool14/files/patch-ab b/devel/libtool14/files/patch-ab index f96b92eac308..384c86a0bd18 100644 --- a/devel/libtool14/files/patch-ab +++ b/devel/libtool14/files/patch-ab @@ -1,11 +1,50 @@ ---- doc/Makefile.in.orig Fri Jul 2 09:24:54 1999 -+++ doc/Makefile.in Tue Aug 31 23:41:57 1999 -@@ -70,7 +70,7 @@ - LIBTOOL = @LIBTOOL@ - LIBTOOL_FLAGS = @LIBTOOL_FLAGS@ +--- doc/Makefile.in.orig Wed Oct 23 02:51:04 2002 ++++ doc/Makefile.in Mon Feb 17 02:01:16 2003 +@@ -72,3 +72,3 @@ LN_S = @LN_S@ -MAKEINFO = @MAKEINFO@ +MAKEINFO = @MAKEINFO@ --no-split NM = @NM@ - OBJDUMP = @OBJDUMP@ - PACKAGE = @PACKAGE@ +@@ -85,4 +85,4 @@ + AUTOMAKE_OPTIONS = gnits +-info_TEXINFOS = libtool.texi +-libtool_TEXINFOS = PLATFORMS fdl.texi ++info_TEXINFOS = libtool14.texi ++libtool14_TEXINFOS = PLATFORMS fdl.texi + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -90,6 +90,6 @@ + TEXI2DVI = texi2dvi +-INFO_DEPS = libtool.info +-DVIS = libtool.dvi +-TEXINFOS = libtool.texi +-DIST_COMMON = $(libtool_TEXINFOS) Makefile.am Makefile.in mdate-sh \ ++INFO_DEPS = libtool14.info ++DVIS = libtool14.dvi ++TEXINFOS = libtool14.texi ++DIST_COMMON = $(libtool14_TEXINFOS) Makefile.am Makefile.in mdate-sh \ + stamp-vti texinfo.tex version.texi +@@ -115,4 +115,4 @@ + +-$(srcdir)/stamp-vti: libtool.texi $(top_srcdir)/configure.in +- @echo "@set UPDATED `$(SHELL) $(srcdir)/mdate-sh $(srcdir)/libtool.texi`" > vti.tmp ++$(srcdir)/stamp-vti: libtool14.texi $(top_srcdir)/configure.in ++ @echo "@set UPDATED `$(SHELL) $(srcdir)/mdate-sh $(srcdir)/libtool14.texi`" > vti.tmp + @echo "@set EDITION $(VERSION)" >> vti.tmp +@@ -135,4 +135,4 @@ + +-libtool.info: libtool.texi version.texi $(libtool_TEXINFOS) +-libtool.dvi: libtool.texi version.texi $(libtool_TEXINFOS) ++libtool14.info: libtool14.texi version.texi $(libtool14_TEXINFOS) ++libtool14.dvi: libtool14.texi version.texi $(libtool14_TEXINFOS) + +@@ -235,6 +235,6 @@ + mostlyclean-aminfo: +- -rm -f libtool.aux libtool.cp libtool.cps libtool.dvi libtool.fn \ +- libtool.fns libtool.ky libtool.kys libtool.ps libtool.log \ +- libtool.pg libtool.toc libtool.tp libtool.tps libtool.vr \ +- libtool.vrs libtool.op libtool.tr libtool.cv libtool.cn ++ -rm -f libtool14.aux libtool14.cp libtool14.cps libtool14.dvi libtool14.fn \ ++ libtool14.fns libtool14.ky libtool14.kys libtool14.ps libtool14.log \ ++ libtool14.pg libtool14.toc libtool14.tp libtool14.tps libtool14.vr \ ++ libtool14.vrs libtool14.op libtool14.tr libtool14.cv libtool14.cn + diff --git a/devel/libtool14/files/patch-ac b/devel/libtool14/files/patch-ac deleted file mode 100644 index 3a1894e10003..000000000000 --- a/devel/libtool14/files/patch-ac +++ /dev/null @@ -1,157 +0,0 @@ - -$FreeBSD$ - ---- ltconfig.orig Tue Dec 7 23:50:48 1999 -+++ ltconfig Sat Jun 8 11:48:12 2002 -@@ -169,7 +169,7 @@ - # Constants: - PROGRAM=ltconfig - PACKAGE=libtool --VERSION=1.3.4 -+VERSION=1.3.4-freebsd-ports - TIMESTAMP=" (1.385.2.196 1999/12/07 21:47:57)" - ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' - ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -@@ -185,6 +185,8 @@ - # which needs '.lib'). - enable_static=yes - enable_fast_install=yes -+install_ltlibs=yes -+release_suffix=yes - enable_dlopen=unknown - enable_win32_dll=no - ltmain= -@@ -242,10 +244,14 @@ - - Generate a system-specific libtool script. - -+ --build no-op to keep compatability with configure scripts generated for 1.4 - --debug enable verbose shell tracing - --disable-shared do not build shared libraries - --disable-static do not build static libraries - --disable-fast-install do not optimize for fast installation -+ --disable-ltlibs don't install the .la archives -+ --release-ignore don't use -release specification -+ --release-suffix use -release suffix for all files - --enable-dlopen enable dlopen support - --enable-win32-dll enable building dlls on win32 hosts - --help display this help and exit -@@ -268,6 +274,8 @@ - exit 0 - ;; - -+ --build=*) ;; -+ - --debug) - echo "$progname: enabling shell trace mode" - set -x -@@ -279,6 +287,12 @@ - - --disable-fast-install) enable_fast_install=no ;; - -+ --disable-ltlibs) install_ltlibs=no ;; -+ -+ --release-ignore) release_suffix=no ;; -+ -+ --release-suffix) release_suffix=all ;; -+ - --enable-dlopen) enable_dlopen=yes ;; - - --enable-win32-dll) enable_win32_dll=yes ;; -@@ -971,11 +985,11 @@ - $rm conftest.dat - if ln -s X conftest.dat 2>/dev/null; then - $rm conftest.dat -- LN_S="ln -s" -+ LN_S="ln -sf" - else - LN_S=ln - fi -- if test "$LN_S" = "ln -s"; then -+ if test "$LN_S" = "ln -sf"; then - echo "$ac_t"yes 1>&6 - else - echo "$ac_t"no 1>&6 -@@ -1226,8 +1240,8 @@ - - *) - if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $compile_rpath $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $compile_rpath $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -1353,14 +1367,6 @@ - hardcode_shlibpath_var=no - ;; - -- # FreeBSD 3 and greater uses gcc -shared to do shared libraries. -- freebsd*) -- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $linkopts' -- hardcode_libdir_flag_spec='-R$libdir' -- hardcode_direct=yes -- hardcode_shlibpath_var=no -- ;; -- - hpux9* | hpux10* | hpux11*) - case "$host_os" in - hpux9*) archive_cmds='$rm $objdir/$soname~$LD -b +b $install_libdir -o $objdir/$soname $libobjs $deplibs $linkopts~test $objdir/$soname = $lib || mv $objdir/$soname $lib' ;; -@@ -1775,7 +1781,7 @@ - version_type=none - dynamic_linker="$host_os ld.so" - sys_lib_dlsearch_path_spec="/lib /usr/lib" --sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -+sys_lib_search_path_spec="/lib /usr/lib" - file_magic_cmd= - file_magic_test_file= - deplibs_check_method='unknown' -@@ -1873,19 +1879,22 @@ - version_type=freebsd-$objformat - case "$version_type" in - freebsd-elf*) -- deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object' -- file_magic_cmd=/usr/bin/file -- file_magic_test_file=`echo /usr/lib/libc.so*` -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so' -- need_version=no -- need_lib_prefix=no -+ deplibs_check_method='file_magic (ELF [0-9][0-9]*-bit [LM]SB shared object|current ar archive)' - ;; - freebsd-*) -- deplibs_check_method=unknown -- library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix' -- need_version=yes -+ deplibs_check_method='file_magic FreeBSD.* shared library' - ;; - esac -+ file_magic_cmd=/usr/bin/file -+ file_magic_test_file=`echo /usr/lib/libc.so.*` -+ if test "$release_suffix" = all; then -+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so' -+ else -+ library_names_spec='${libname}${release}.so$versuffix ${libname}.so' -+ fi -+ need_version=no -+ need_lib_prefix=no -+ finish_cmds='/usr/bin/env OBJFORMAT="'"$objformat"'" /sbin/ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - case "$host_os" in - freebsd2* | freebsd3.[01]* | freebsdelf3.[01]*) -@@ -2776,6 +2785,15 @@ - - # Shell to use when invoking shell scripts. - SHELL=$LTSHELL -+ -+# Whether to waste disk space. -+install_ltlibs=$install_ltlibs -+ -+# What to do with -release. -+# yes - only for shared archive -+# no - ingnore -+# all - for all archives -+release_suffix=$release_suffix - - # Whether or not to build shared libraries. - build_libtool_libs=$enable_shared diff --git a/devel/libtool14/files/patch-ad b/devel/libtool14/files/patch-ad index 3ec71700ffbb..c04c4dd4a24c 100644 --- a/devel/libtool14/files/patch-ad +++ b/devel/libtool14/files/patch-ad @@ -1,226 +1,32 @@ $FreeBSD$ ---- ltmain.sh.orig Tue Dec 7 23:50:49 1999 -+++ ltmain.sh Thu May 2 10:24:05 2002 -@@ -23,6 +23,9 @@ - # configuration script generated by Autoconf, you may include it under - # the same distribution terms that you use for the rest of that program. +--- ltmain.sh.orig Mon Sep 10 22:33:26 2001 ++++ ltmain.sh Wed Jan 23 16:39:22 2002 +@@ -1062,6 +1062,12 @@ -+EXPR_COMPAT=1 -+export EXPR_COMPAT -+ - # Check that we have a working $echo. - if test "X$1" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. -@@ -54,7 +57,7 @@ - # Constants. - PROGRAM=ltmain.sh - PACKAGE=libtool --VERSION=1.3.4 -+VERSION=1.3.4-freebsd-ports - TIMESTAMP=" (1.385.2.196 1999/12/07 21:47:57)" - - default_mode= -@@ -952,7 +955,11 @@ - continue - ;; - release) -- release="-$arg" -+ if test "$release_suffix" = all; then -+ release="$arg" -+ elif test "$release_suffix" = yes; then -+ release="-$arg" -+ fi - prev= - continue - ;; -@@ -1005,6 +1012,7 @@ - ;; - - -avoid-version) -+ build_old_libs=no - avoid_version=yes - continue - ;; -@@ -1091,6 +1099,10 @@ - deplibs="$deplibs $arg" - ;; - -+ -?thread) -+ deplibs="$deplibs $arg" -+ ;; -+ -module) module=yes ++ case $host in ++ *-*-freebsd*) ++ # Do not build the useless static library ++ build_old_libs=no ++ ;; ++ esac continue -@@ -1168,7 +1180,7 @@ - - *.o | *.obj | *.a | *.lib) - # A standard object. -- objs="$objs $arg" -+ libobjs="$libobjs $arg" ;; - *.lo) -@@ -1603,12 +1615,6 @@ - exit 1 - fi - -- # How the heck are we supposed to write a wrapper for a shared library? -- if test -n "$link_against_libtool_libs"; then -- $echo "$modename: error: cannot link shared libraries into libtool libraries" 1>&2 -- exit 1 -- fi -- - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - $echo "$modename: warning: \`-dlopen' is ignored for libtool libraries" 1>&2 - fi -@@ -1795,6 +1801,9 @@ - *-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*) - # these systems don't actually have a c library (as such)! +@@ -2444,6 +2450,9 @@ + *-*-openbsd*) + # Do not include libc due to us having libc/libc_r. ;; + *-*-freebsd*) + # FreeBSD doesn't need this... + ;; *) - # Add libc to deplibs on all other systems. - deplibs="$deplibs -lc" -@@ -1802,6 +1811,94 @@ - esac - fi - -+ if test -n "$rpath$xrpath"; then -+ # If the user specified any rpath flags, then add them. -+ for libdir in $rpath $xrpath; do -+ # This is the magic to use -rpath. -+ case "$compile_rpath " in -+ *" $libdir "*) ;; -+ *) compile_rpath="$compile_rpath $libdir" ;; -+ esac -+ case "$finalize_rpath " in -+ *" $libdir "*) ;; -+ *) finalize_rpath="$finalize_rpath $libdir" ;; -+ esac -+ done -+ fi -+ -+ # Now hardcode the library paths -+ rpath= -+ hardcode_libdirs= -+ for libdir in $compile_rpath; do -+ if test -n "$hardcode_libdir_flag_spec"; then -+ if test -n "$hardcode_libdir_separator"; then -+ if test -z "$hardcode_libdirs"; then -+ hardcode_libdirs="$libdir" -+ else -+ # Just accumulate the unique libdirs. -+ case "$hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator" in -+ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) -+ ;; -+ *) -+ hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" -+ ;; -+ esac -+ fi -+ else -+ eval flag=\"$hardcode_libdir_flag_spec\" -+ rpath="$rpath $flag" -+ fi -+ elif test -n "$runpath_var"; then -+ case "$perm_rpath " in -+ *" $libdir "*) ;; -+ *) perm_rpath="$perm_rpath $libdir" ;; -+ esac -+ fi -+ done -+ # Substitute the hardcoded libdirs into the rpath. -+ if test -n "$hardcode_libdir_separator" && -+ test -n "$hardcode_libdirs"; then -+ libdir="$hardcode_libdirs" -+ eval rpath=\" $hardcode_libdir_flag_spec\" -+ fi -+ compile_rpath="$rpath" -+ -+ rpath= -+ hardcode_libdirs= -+ for libdir in $finalize_rpath; do -+ if test -n "$hardcode_libdir_flag_spec"; then -+ if test -n "$hardcode_libdir_separator"; then -+ if test -z "$hardcode_libdirs"; then -+ hardcode_libdirs="$libdir" -+ else -+ # Just accumulate the unique libdirs. -+ case "$hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator" in -+ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) -+ ;; -+ *) -+ hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" -+ ;; -+ esac -+ fi -+ else -+ eval flag=\"$hardcode_libdir_flag_spec\" -+ rpath="$rpath $flag" -+ fi -+ elif test -n "$runpath_var"; then -+ case "$finalize_perm_rpath " in -+ *" $libdir "*) ;; -+ *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;; -+ esac -+ fi -+ done -+ # Substitute the hardcoded libdirs into the rpath. -+ if test -n "$hardcode_libdir_separator" && -+ test -n "$hardcode_libdirs"; then -+ libdir="$hardcode_libdirs" -+ eval rpath=\" $hardcode_libdir_flag_spec\" -+ fi -+ finalize_rpath="$rpath" -+ - # Create the output directory, or remove our outputs if we need to. - if test -d $output_objdir; then - $show "${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*" -@@ -1817,7 +1914,11 @@ - - # Now set the variables for building old libraries. - if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then -- oldlibs="$oldlibs $output_objdir/$libname.$libext" -+ if test "$release_suffix" = all; then -+ oldlibs="$oldlibs $output_objdir/$libname$release.$libext" -+ else -+ oldlibs="$oldlibs $output_objdir/$libname.$libext" -+ fi - - # Transform .lo files to .o files. - oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP` -@@ -2011,7 +2112,11 @@ - echo "*** \`nm' from GNU binutils and a full rebuild may help." - fi - if test "$build_old_libs" = no; then -- oldlibs="$output_objdir/$libname.$libext" -+ if test "$release_suffix" = all; then -+ oldlibs="$output_objdir/$libname$release.$libext" -+ else -+ oldlibs="$output_objdir/$libname.$libext" -+ fi - build_libtool_libs=module - build_old_libs=yes - else -@@ -3059,7 +3164,11 @@ - case "$output" in - *.la) - old_library= -- test "$build_old_libs" = yes && old_library="$libname.$libext" -+ if test "$release_suffix" = all; then -+ test "$build_old_libs" = yes && old_library="$libname$release.$libext" -+ else -+ test "$build_old_libs" = yes && old_library="$libname.$libext" -+ fi - $show "creating $output" - - if test -n "$xrpath"; then -@@ -3348,10 +3457,12 @@ + # Add libc to deplibs on all other systems if necessary. + if test $build_libtool_need_lc = "yes"; then +@@ -4210,10 +4219,17 @@ fi # Install the pseudo-library for information purposes. @@ -228,20 +34,17 @@ $FreeBSD$ - instname="$dir/$name"i - $show "$install_prog $instname $destdir/$name" - $run eval "$install_prog $instname $destdir/$name" || exit $? -+ if test "$install_ltlibs" = yes; then ++ case $host in ++ *-*-freebsd*) ++ # Do not install the useless pseudo-library ++ ;; ++ *) + name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + instname="$dir/$name"i + $show "$install_prog $instname $destdir/$name" + $run eval "$install_prog $instname $destdir/$name" || exit $? -+ fi ++ ;; ++ esac # Maybe install the static library, too. test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" -@@ -3440,7 +3551,6 @@ - fi - libfile="$libdir/`$echo "X$lib" | $Xsed -e 's%^.*/%%g'`" - if test -n "$libdir" && test ! -f "$libfile"; then -- $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2 - finalize=no - fi - done diff --git a/devel/libtool14/files/patch-ae b/devel/libtool14/files/patch-ae index c92b003b58cd..62aeecd4ae60 100644 --- a/devel/libtool14/files/patch-ae +++ b/devel/libtool14/files/patch-ae @@ -1,13 +1,14 @@ ---- configure.orig Fri Jul 2 09:01:56 1999 -+++ configure Tue Aug 31 23:45:29 1999 -@@ -1853,10 +1853,6 @@ - *) # Relative path. - ac_sub_cache_file="$ac_dots$cache_file" ;; +--- configure.orig Wed Oct 23 02:26:05 2002 ++++ configure Mon Feb 17 02:04:57 2003 +@@ -865,3 +865,3 @@ + +-PACKAGE=libtool ++PACKAGE=libtool14 + +@@ -6089,6 +6089,2 @@ esac - case "$ac_given_INSTALL" in - [/$]*) INSTALL="$ac_given_INSTALL" ;; - *) INSTALL="$ac_dots$ac_given_INSTALL" ;; - esac - echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir" - # The eval makes quoting arguments work. diff --git a/devel/libtool14/files/patch-af b/devel/libtool14/files/patch-af index beb6be3b456f..1298dce981e1 100644 --- a/devel/libtool14/files/patch-af +++ b/devel/libtool14/files/patch-af @@ -1,13 +1,11 @@ ---- libltdl/Makefile.in.orig Tue Dec 7 13:03:38 1999 -+++ libltdl/Makefile.in Mon Jan 17 16:35:34 2000 -@@ -326,17 +326,16 @@ - distdir: $(DISTFILES) - -rm -rf $(distdir) +--- libltdl/Makefile.in.orig Wed Oct 23 02:26:07 2002 ++++ libltdl/Makefile.in Mon Feb 17 02:06:58 2003 +@@ -342,3 +342,3 @@ mkdir $(distdir) - -chmod 777 $(distdir) + -chmod 555 $(distdir) @for file in $(DISTFILES); do \ - d=$(srcdir); \ +@@ -346,9 +346,8 @@ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + echo no copy dir $$d/$$file; \ @@ -20,5 +18,20 @@ done + -chmod a+x $(distdir)/configure info-am: - info: info-am - dvi-am: +@@ -452,4 +451,4 @@ + local-install-files: $(DISTFILES) +- -rm -rf $(DESTDIR)$(datadir)/libtool/libltdl +- $(mkinstalldirs) $(DESTDIR)$(datadir)/libtool/libltdl ++ -rm -rf $(DESTDIR)$(datadir)/libtool14/libltdl ++ $(mkinstalldirs) $(DESTDIR)$(datadir)/libtool14/libltdl + @for file in $(DISTFILES); do \ +@@ -457,6 +456,6 @@ + if test -d $$d/$$file; then \ +- cp -r $$d/$$file $(DESTDIR)$(datadir)/libtool/libltdl/$$file; \ ++ cp -r $$d/$$file $(DESTDIR)$(datadir)/libtool14/libltdl/$$file; \ + else \ +- test -f $(DESTDIR)$(datadir)/libtool/libltdl/$$file \ +- || cp $$d/$$file $(DESTDIR)$(datadir)/libtool/libltdl/$$file || :; \ ++ test -f $(DESTDIR)$(datadir)/libtool14/libltdl/$$file \ ++ || cp $$d/$$file $(DESTDIR)$(datadir)/libtool14/libltdl/$$file || :; \ + fi; \ diff --git a/devel/libtool14/files/patch-ag b/devel/libtool14/files/patch-ag deleted file mode 100644 index 5fdcd1924641..000000000000 --- a/devel/libtool14/files/patch-ag +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- libltdl/configure 2001/01/31 10:58:38 1.1 -+++ libltdl/configure 2001/01/31 10:59:14 -@@ -1455,7 +1455,7 @@ - esac - - # Check for any special flags to pass to ltconfig. --libtool_flags="--cache-file=$cache_file" -+libtool_flags="--cache-file=$cache_file --disable-ltlibs" - test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared" - test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static" - test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install" diff --git a/devel/libtool14/files/patch-libtoolize.in b/devel/libtool14/files/patch-libtoolize.in new file mode 100644 index 000000000000..b92bbeb9d8e9 --- /dev/null +++ b/devel/libtool14/files/patch-libtoolize.in @@ -0,0 +1,9 @@ +--- libtoolize.in.orig Sun Oct 13 16:21:38 2002 ++++ libtoolize.in Mon Feb 17 01:56:19 2003 +@@ -39,4 +39,4 @@ + +-libtool_m4="$aclocaldir/libtool.m4" +-ltdl_m4="$aclocaldir/ltdl.m4" ++libtool_m4="$aclocaldir/libtool14.m4" ++ltdl_m4="$aclocaldir/ltdl14.m4" + diff --git a/devel/libtool14/pkg-descr.libltdl b/devel/libtool14/pkg-descr.libltdl new file mode 100644 index 000000000000..e57b99f21a5c --- /dev/null +++ b/devel/libtool14/pkg-descr.libltdl @@ -0,0 +1,9 @@ +This is GNU libltdl, a system independent dlopen wrapper for GNU libtool. + +It supports the following dlopen interfaces: +* dlopen (Solaris, Linux and various BSD flavors) +* shl_load (HP-UX) +* LoadLibrary (Win16 and Win32) +* load_add_on (BeOS) +* GNU DLD (emulates dynamic linking for static libraries) +* libtool's dlpreopen diff --git a/devel/libtool14/pkg-plist b/devel/libtool14/pkg-plist index f057cdf134b2..c0510d95ad88 100644 --- a/devel/libtool14/pkg-plist +++ b/devel/libtool14/pkg-plist @@ -1,29 +1,28 @@ -bin/libtool -bin/libtoolize -include/ltdl.h -@unexec install-info --delete %D/info/libtool.info %D/info/dir -info/libtool.info -@exec install-info %D/info/libtool.info %D/info/dir -lib/libltdl.a -lib/libltdl.so -lib/libltdl.so.1 -share/aclocal/libtool.m4 -share/libtool/config.guess -share/libtool/config.sub -share/libtool/libltdl/COPYING.LIB -share/libtool/libltdl/Makefile.am -share/libtool/libltdl/Makefile.in -share/libtool/libltdl/README -share/libtool/libltdl/acconfig.h -share/libtool/libltdl/acinclude.m4 -share/libtool/libltdl/aclocal.m4 -share/libtool/libltdl/config.h.in -share/libtool/libltdl/configure -share/libtool/libltdl/configure.in -share/libtool/libltdl/ltdl.c -share/libtool/libltdl/ltdl.h -share/libtool/libltdl/stamp-h.in -share/libtool/ltconfig -share/libtool/ltmain.sh -@dirrm share/libtool/libltdl -@dirrm share/libtool +@comment $FreeBSD$ +bin/libtool14 +bin/libtoolize14 +libexec/libtool14/libtool +libexec/libtool14/libtoolize +@unexec install-info --delete %D/info/libtool14.info %D/info/dir +info/libtool14.info +@exec install-info %D/info/libtool14.info %D/info/dir +share/aclocal/libtool14.m4 +share/aclocal/ltdl14.m4 +share/libtool14/config.guess +share/libtool14/config.sub +share/libtool14/libltdl/COPYING.LIB +share/libtool14/libltdl/Makefile.am +share/libtool14/libltdl/Makefile.in +share/libtool14/libltdl/README +share/libtool14/libltdl/acinclude.m4 +share/libtool14/libltdl/aclocal.m4 +share/libtool14/libltdl/config-h.in +share/libtool14/libltdl/configure +share/libtool14/libltdl/configure.in +share/libtool14/libltdl/ltdl.c +share/libtool14/libltdl/ltdl.h +share/libtool14/libltdl/stamp-h.in +share/libtool14/ltmain.sh +@dirrm share/libtool14/libltdl +@dirrm share/libtool14 +@dirrm libexec/libtool14 diff --git a/devel/libtool14/pkg-plist.libltdl b/devel/libtool14/pkg-plist.libltdl new file mode 100644 index 000000000000..1a8458d1a65c --- /dev/null +++ b/devel/libtool14/pkg-plist.libltdl @@ -0,0 +1,5 @@ +@comment $FreeBSD$ +include/ltdl.h +lib/libltdl.a +lib/libltdl.so +lib/libltdl.so.4 diff --git a/devel/libtool15/Makefile b/devel/libtool15/Makefile index fe6e1d76b734..573ac0226009 100644 --- a/devel/libtool15/Makefile +++ b/devel/libtool15/Makefile @@ -5,26 +5,53 @@ # $FreeBSD$ # -PORTNAME= libtool -PORTVERSION= 1.3.4 -PORTREVISION= 4 +PORTNAME?= libtool +PORTVERSION= 1.4.3 +PORTREVISION?= 0 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= libtool +DISTNAME= libtool-${PORTVERSION} MAINTAINER= ade@FreeBSD.org -COMMENT= Generic shared library support script - -# This port has not been upgraded to 1.4 because it is used by about 30% of -# the ports collection, and more testing is needed. If someone can supply a -# working patch then it will be upgraded. +COMMENT?= Generic shared library support script +LATEST_LINK?= libtool14 +GNU_CONFIGURE= yes +CONFIGURE_ARGS?= --disable-ltdl-install +CONFIGURE_ARGS+= --program-suffix=14 INSTALLS_SHLIB= yes -GNU_CONFIGURE= yes -CONFIGURE_ENV= PREFIX=${PREFIX} +CONFIGURE_ENV= PREFIX=${PREFIX} PACKAGE=libtool14 +USE_REINPLACE= yes + +.if defined(USE_LIBTOOL) || defined(USE_LIBTOOL_VER) +pre-everything: + @${ECHO} =========================================================== + @${ECHO} "You have 'USE_LIBTOOL' or 'USE_LIBTOOL_VER' variables" + @${ECHO} "defined either in environment or in make(1) arguments." + @${ECHO} "Please undefine them and try again." + @${ECHO} =========================================================== + @${FALSE} +.endif # defined(USE_LIBTOOL) || defined(USE_LIBTOOL_VER) + +post-extract: + @${MV} -f ${WRKSRC}/libtool.m4 ${WRKSRC}/libtool14.m4 + @${MV} -f ${WRKSRC}/ltdl.m4 ${WRKSRC}/ltdl14.m4 + @${REINPLACE_CMD} -e 's|libtool.m4|libtool14.m4|g' \ + -e 's|ltdl.m4|ltdl14.m4|g' ${WRKSRC}/Makefile.in + @${MV} -f ${WRKSRC}/doc/libtool.info ${WRKSRC}/doc/libtool14.info + @${MV} -f ${WRKSRC}/doc/libtool.texi ${WRKSRC}/doc/libtool14.texi -.ifdef USE_LIBTOOL -.error You have `USE_LIBTOOL' variable defined either in environment or in make(1) arguments. Please undefine and try again. +.if ${PORTNAME} == "libtool" +post-install: + @-${RM} -fr ${PREFIX}/libexec/libtool14 + ${MKDIR} ${PREFIX}/libexec/libtool14 +.for i in libtool libtoolize + ${LN} -sf ${PREFIX}/bin/${i}14 ${PREFIX}/libexec/libtool14/${i} +.endfor +.for i in config.guess config.sub + ${MV} ${PREFIX}/share/libtool14/${i}14 ${PREFIX}/share/libtool14/${i} +.endfor .endif .include <bsd.port.mk> diff --git a/devel/libtool15/distinfo b/devel/libtool15/distinfo index c39e3aaff92d..7cace71782d6 100644 --- a/devel/libtool15/distinfo +++ b/devel/libtool15/distinfo @@ -1 +1 @@ -MD5 (libtool-1.3.4.tar.gz) = 0c3844fedd382e5796865ca58842713e +MD5 (libtool-1.4.3.tar.gz) = d11a3c835449d7fa50a025dc9c01ad81 diff --git a/devel/libtool15/files/patch-aa b/devel/libtool15/files/patch-aa index 91ff871e5ae3..8ba2b3510563 100644 --- a/devel/libtool15/files/patch-aa +++ b/devel/libtool15/files/patch-aa @@ -1,11 +1,15 @@ ---- doc/libtool.texi.orig Tue Jun 29 15:48:12 1999 -+++ doc/libtool.texi Tue Aug 31 23:41:25 1999 -@@ -11,7 +11,7 @@ - @set MAILLIST the libtool mailing list @email{libtool@@gnu.org} - @set objdir .libs +--- doc/libtool14.info.orig Wed Oct 23 02:26:36 2002 ++++ doc/libtool14.info Mon Feb 17 01:46:42 2003 +@@ -3,5 +3,5 @@ --@dircategory GNU programming tools -+@dircategory Programming & development tools - @direntry - * Libtool: (libtool). Generic shared library support script. - @end direntry +-INFO-DIR-SECTION GNU programming tools ++INFO-DIR-SECTION Programming & development tools + START-INFO-DIR-ENTRY +-* Libtool: (libtool). Generic shared library support script. ++* Libtool: (libtool14). Generic shared library support script. + END-INFO-DIR-ENTRY +@@ -10,3 +10,3 @@ + START-INFO-DIR-ENTRY +-* libtoolize: (libtool)Invoking libtoolize. Adding libtool support. ++* libtoolize: (libtool14)Invoking libtoolize. Adding libtool support. + END-INFO-DIR-ENTRY diff --git a/devel/libtool15/files/patch-ab b/devel/libtool15/files/patch-ab index f96b92eac308..384c86a0bd18 100644 --- a/devel/libtool15/files/patch-ab +++ b/devel/libtool15/files/patch-ab @@ -1,11 +1,50 @@ ---- doc/Makefile.in.orig Fri Jul 2 09:24:54 1999 -+++ doc/Makefile.in Tue Aug 31 23:41:57 1999 -@@ -70,7 +70,7 @@ - LIBTOOL = @LIBTOOL@ - LIBTOOL_FLAGS = @LIBTOOL_FLAGS@ +--- doc/Makefile.in.orig Wed Oct 23 02:51:04 2002 ++++ doc/Makefile.in Mon Feb 17 02:01:16 2003 +@@ -72,3 +72,3 @@ LN_S = @LN_S@ -MAKEINFO = @MAKEINFO@ +MAKEINFO = @MAKEINFO@ --no-split NM = @NM@ - OBJDUMP = @OBJDUMP@ - PACKAGE = @PACKAGE@ +@@ -85,4 +85,4 @@ + AUTOMAKE_OPTIONS = gnits +-info_TEXINFOS = libtool.texi +-libtool_TEXINFOS = PLATFORMS fdl.texi ++info_TEXINFOS = libtool14.texi ++libtool14_TEXINFOS = PLATFORMS fdl.texi + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -90,6 +90,6 @@ + TEXI2DVI = texi2dvi +-INFO_DEPS = libtool.info +-DVIS = libtool.dvi +-TEXINFOS = libtool.texi +-DIST_COMMON = $(libtool_TEXINFOS) Makefile.am Makefile.in mdate-sh \ ++INFO_DEPS = libtool14.info ++DVIS = libtool14.dvi ++TEXINFOS = libtool14.texi ++DIST_COMMON = $(libtool14_TEXINFOS) Makefile.am Makefile.in mdate-sh \ + stamp-vti texinfo.tex version.texi +@@ -115,4 +115,4 @@ + +-$(srcdir)/stamp-vti: libtool.texi $(top_srcdir)/configure.in +- @echo "@set UPDATED `$(SHELL) $(srcdir)/mdate-sh $(srcdir)/libtool.texi`" > vti.tmp ++$(srcdir)/stamp-vti: libtool14.texi $(top_srcdir)/configure.in ++ @echo "@set UPDATED `$(SHELL) $(srcdir)/mdate-sh $(srcdir)/libtool14.texi`" > vti.tmp + @echo "@set EDITION $(VERSION)" >> vti.tmp +@@ -135,4 +135,4 @@ + +-libtool.info: libtool.texi version.texi $(libtool_TEXINFOS) +-libtool.dvi: libtool.texi version.texi $(libtool_TEXINFOS) ++libtool14.info: libtool14.texi version.texi $(libtool14_TEXINFOS) ++libtool14.dvi: libtool14.texi version.texi $(libtool14_TEXINFOS) + +@@ -235,6 +235,6 @@ + mostlyclean-aminfo: +- -rm -f libtool.aux libtool.cp libtool.cps libtool.dvi libtool.fn \ +- libtool.fns libtool.ky libtool.kys libtool.ps libtool.log \ +- libtool.pg libtool.toc libtool.tp libtool.tps libtool.vr \ +- libtool.vrs libtool.op libtool.tr libtool.cv libtool.cn ++ -rm -f libtool14.aux libtool14.cp libtool14.cps libtool14.dvi libtool14.fn \ ++ libtool14.fns libtool14.ky libtool14.kys libtool14.ps libtool14.log \ ++ libtool14.pg libtool14.toc libtool14.tp libtool14.tps libtool14.vr \ ++ libtool14.vrs libtool14.op libtool14.tr libtool14.cv libtool14.cn + diff --git a/devel/libtool15/files/patch-ac b/devel/libtool15/files/patch-ac deleted file mode 100644 index 3a1894e10003..000000000000 --- a/devel/libtool15/files/patch-ac +++ /dev/null @@ -1,157 +0,0 @@ - -$FreeBSD$ - ---- ltconfig.orig Tue Dec 7 23:50:48 1999 -+++ ltconfig Sat Jun 8 11:48:12 2002 -@@ -169,7 +169,7 @@ - # Constants: - PROGRAM=ltconfig - PACKAGE=libtool --VERSION=1.3.4 -+VERSION=1.3.4-freebsd-ports - TIMESTAMP=" (1.385.2.196 1999/12/07 21:47:57)" - ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' - ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -@@ -185,6 +185,8 @@ - # which needs '.lib'). - enable_static=yes - enable_fast_install=yes -+install_ltlibs=yes -+release_suffix=yes - enable_dlopen=unknown - enable_win32_dll=no - ltmain= -@@ -242,10 +244,14 @@ - - Generate a system-specific libtool script. - -+ --build no-op to keep compatability with configure scripts generated for 1.4 - --debug enable verbose shell tracing - --disable-shared do not build shared libraries - --disable-static do not build static libraries - --disable-fast-install do not optimize for fast installation -+ --disable-ltlibs don't install the .la archives -+ --release-ignore don't use -release specification -+ --release-suffix use -release suffix for all files - --enable-dlopen enable dlopen support - --enable-win32-dll enable building dlls on win32 hosts - --help display this help and exit -@@ -268,6 +274,8 @@ - exit 0 - ;; - -+ --build=*) ;; -+ - --debug) - echo "$progname: enabling shell trace mode" - set -x -@@ -279,6 +287,12 @@ - - --disable-fast-install) enable_fast_install=no ;; - -+ --disable-ltlibs) install_ltlibs=no ;; -+ -+ --release-ignore) release_suffix=no ;; -+ -+ --release-suffix) release_suffix=all ;; -+ - --enable-dlopen) enable_dlopen=yes ;; - - --enable-win32-dll) enable_win32_dll=yes ;; -@@ -971,11 +985,11 @@ - $rm conftest.dat - if ln -s X conftest.dat 2>/dev/null; then - $rm conftest.dat -- LN_S="ln -s" -+ LN_S="ln -sf" - else - LN_S=ln - fi -- if test "$LN_S" = "ln -s"; then -+ if test "$LN_S" = "ln -sf"; then - echo "$ac_t"yes 1>&6 - else - echo "$ac_t"no 1>&6 -@@ -1226,8 +1240,8 @@ - - *) - if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $compile_rpath $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $compile_rpath $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -1353,14 +1367,6 @@ - hardcode_shlibpath_var=no - ;; - -- # FreeBSD 3 and greater uses gcc -shared to do shared libraries. -- freebsd*) -- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $linkopts' -- hardcode_libdir_flag_spec='-R$libdir' -- hardcode_direct=yes -- hardcode_shlibpath_var=no -- ;; -- - hpux9* | hpux10* | hpux11*) - case "$host_os" in - hpux9*) archive_cmds='$rm $objdir/$soname~$LD -b +b $install_libdir -o $objdir/$soname $libobjs $deplibs $linkopts~test $objdir/$soname = $lib || mv $objdir/$soname $lib' ;; -@@ -1775,7 +1781,7 @@ - version_type=none - dynamic_linker="$host_os ld.so" - sys_lib_dlsearch_path_spec="/lib /usr/lib" --sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -+sys_lib_search_path_spec="/lib /usr/lib" - file_magic_cmd= - file_magic_test_file= - deplibs_check_method='unknown' -@@ -1873,19 +1879,22 @@ - version_type=freebsd-$objformat - case "$version_type" in - freebsd-elf*) -- deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object' -- file_magic_cmd=/usr/bin/file -- file_magic_test_file=`echo /usr/lib/libc.so*` -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so' -- need_version=no -- need_lib_prefix=no -+ deplibs_check_method='file_magic (ELF [0-9][0-9]*-bit [LM]SB shared object|current ar archive)' - ;; - freebsd-*) -- deplibs_check_method=unknown -- library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix' -- need_version=yes -+ deplibs_check_method='file_magic FreeBSD.* shared library' - ;; - esac -+ file_magic_cmd=/usr/bin/file -+ file_magic_test_file=`echo /usr/lib/libc.so.*` -+ if test "$release_suffix" = all; then -+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so' -+ else -+ library_names_spec='${libname}${release}.so$versuffix ${libname}.so' -+ fi -+ need_version=no -+ need_lib_prefix=no -+ finish_cmds='/usr/bin/env OBJFORMAT="'"$objformat"'" /sbin/ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - case "$host_os" in - freebsd2* | freebsd3.[01]* | freebsdelf3.[01]*) -@@ -2776,6 +2785,15 @@ - - # Shell to use when invoking shell scripts. - SHELL=$LTSHELL -+ -+# Whether to waste disk space. -+install_ltlibs=$install_ltlibs -+ -+# What to do with -release. -+# yes - only for shared archive -+# no - ingnore -+# all - for all archives -+release_suffix=$release_suffix - - # Whether or not to build shared libraries. - build_libtool_libs=$enable_shared diff --git a/devel/libtool15/files/patch-ad b/devel/libtool15/files/patch-ad index 3ec71700ffbb..c04c4dd4a24c 100644 --- a/devel/libtool15/files/patch-ad +++ b/devel/libtool15/files/patch-ad @@ -1,226 +1,32 @@ $FreeBSD$ ---- ltmain.sh.orig Tue Dec 7 23:50:49 1999 -+++ ltmain.sh Thu May 2 10:24:05 2002 -@@ -23,6 +23,9 @@ - # configuration script generated by Autoconf, you may include it under - # the same distribution terms that you use for the rest of that program. +--- ltmain.sh.orig Mon Sep 10 22:33:26 2001 ++++ ltmain.sh Wed Jan 23 16:39:22 2002 +@@ -1062,6 +1062,12 @@ -+EXPR_COMPAT=1 -+export EXPR_COMPAT -+ - # Check that we have a working $echo. - if test "X$1" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. -@@ -54,7 +57,7 @@ - # Constants. - PROGRAM=ltmain.sh - PACKAGE=libtool --VERSION=1.3.4 -+VERSION=1.3.4-freebsd-ports - TIMESTAMP=" (1.385.2.196 1999/12/07 21:47:57)" - - default_mode= -@@ -952,7 +955,11 @@ - continue - ;; - release) -- release="-$arg" -+ if test "$release_suffix" = all; then -+ release="$arg" -+ elif test "$release_suffix" = yes; then -+ release="-$arg" -+ fi - prev= - continue - ;; -@@ -1005,6 +1012,7 @@ - ;; - - -avoid-version) -+ build_old_libs=no - avoid_version=yes - continue - ;; -@@ -1091,6 +1099,10 @@ - deplibs="$deplibs $arg" - ;; - -+ -?thread) -+ deplibs="$deplibs $arg" -+ ;; -+ -module) module=yes ++ case $host in ++ *-*-freebsd*) ++ # Do not build the useless static library ++ build_old_libs=no ++ ;; ++ esac continue -@@ -1168,7 +1180,7 @@ - - *.o | *.obj | *.a | *.lib) - # A standard object. -- objs="$objs $arg" -+ libobjs="$libobjs $arg" ;; - *.lo) -@@ -1603,12 +1615,6 @@ - exit 1 - fi - -- # How the heck are we supposed to write a wrapper for a shared library? -- if test -n "$link_against_libtool_libs"; then -- $echo "$modename: error: cannot link shared libraries into libtool libraries" 1>&2 -- exit 1 -- fi -- - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - $echo "$modename: warning: \`-dlopen' is ignored for libtool libraries" 1>&2 - fi -@@ -1795,6 +1801,9 @@ - *-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*) - # these systems don't actually have a c library (as such)! +@@ -2444,6 +2450,9 @@ + *-*-openbsd*) + # Do not include libc due to us having libc/libc_r. ;; + *-*-freebsd*) + # FreeBSD doesn't need this... + ;; *) - # Add libc to deplibs on all other systems. - deplibs="$deplibs -lc" -@@ -1802,6 +1811,94 @@ - esac - fi - -+ if test -n "$rpath$xrpath"; then -+ # If the user specified any rpath flags, then add them. -+ for libdir in $rpath $xrpath; do -+ # This is the magic to use -rpath. -+ case "$compile_rpath " in -+ *" $libdir "*) ;; -+ *) compile_rpath="$compile_rpath $libdir" ;; -+ esac -+ case "$finalize_rpath " in -+ *" $libdir "*) ;; -+ *) finalize_rpath="$finalize_rpath $libdir" ;; -+ esac -+ done -+ fi -+ -+ # Now hardcode the library paths -+ rpath= -+ hardcode_libdirs= -+ for libdir in $compile_rpath; do -+ if test -n "$hardcode_libdir_flag_spec"; then -+ if test -n "$hardcode_libdir_separator"; then -+ if test -z "$hardcode_libdirs"; then -+ hardcode_libdirs="$libdir" -+ else -+ # Just accumulate the unique libdirs. -+ case "$hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator" in -+ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) -+ ;; -+ *) -+ hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" -+ ;; -+ esac -+ fi -+ else -+ eval flag=\"$hardcode_libdir_flag_spec\" -+ rpath="$rpath $flag" -+ fi -+ elif test -n "$runpath_var"; then -+ case "$perm_rpath " in -+ *" $libdir "*) ;; -+ *) perm_rpath="$perm_rpath $libdir" ;; -+ esac -+ fi -+ done -+ # Substitute the hardcoded libdirs into the rpath. -+ if test -n "$hardcode_libdir_separator" && -+ test -n "$hardcode_libdirs"; then -+ libdir="$hardcode_libdirs" -+ eval rpath=\" $hardcode_libdir_flag_spec\" -+ fi -+ compile_rpath="$rpath" -+ -+ rpath= -+ hardcode_libdirs= -+ for libdir in $finalize_rpath; do -+ if test -n "$hardcode_libdir_flag_spec"; then -+ if test -n "$hardcode_libdir_separator"; then -+ if test -z "$hardcode_libdirs"; then -+ hardcode_libdirs="$libdir" -+ else -+ # Just accumulate the unique libdirs. -+ case "$hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator" in -+ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) -+ ;; -+ *) -+ hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" -+ ;; -+ esac -+ fi -+ else -+ eval flag=\"$hardcode_libdir_flag_spec\" -+ rpath="$rpath $flag" -+ fi -+ elif test -n "$runpath_var"; then -+ case "$finalize_perm_rpath " in -+ *" $libdir "*) ;; -+ *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;; -+ esac -+ fi -+ done -+ # Substitute the hardcoded libdirs into the rpath. -+ if test -n "$hardcode_libdir_separator" && -+ test -n "$hardcode_libdirs"; then -+ libdir="$hardcode_libdirs" -+ eval rpath=\" $hardcode_libdir_flag_spec\" -+ fi -+ finalize_rpath="$rpath" -+ - # Create the output directory, or remove our outputs if we need to. - if test -d $output_objdir; then - $show "${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*" -@@ -1817,7 +1914,11 @@ - - # Now set the variables for building old libraries. - if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then -- oldlibs="$oldlibs $output_objdir/$libname.$libext" -+ if test "$release_suffix" = all; then -+ oldlibs="$oldlibs $output_objdir/$libname$release.$libext" -+ else -+ oldlibs="$oldlibs $output_objdir/$libname.$libext" -+ fi - - # Transform .lo files to .o files. - oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP` -@@ -2011,7 +2112,11 @@ - echo "*** \`nm' from GNU binutils and a full rebuild may help." - fi - if test "$build_old_libs" = no; then -- oldlibs="$output_objdir/$libname.$libext" -+ if test "$release_suffix" = all; then -+ oldlibs="$output_objdir/$libname$release.$libext" -+ else -+ oldlibs="$output_objdir/$libname.$libext" -+ fi - build_libtool_libs=module - build_old_libs=yes - else -@@ -3059,7 +3164,11 @@ - case "$output" in - *.la) - old_library= -- test "$build_old_libs" = yes && old_library="$libname.$libext" -+ if test "$release_suffix" = all; then -+ test "$build_old_libs" = yes && old_library="$libname$release.$libext" -+ else -+ test "$build_old_libs" = yes && old_library="$libname.$libext" -+ fi - $show "creating $output" - - if test -n "$xrpath"; then -@@ -3348,10 +3457,12 @@ + # Add libc to deplibs on all other systems if necessary. + if test $build_libtool_need_lc = "yes"; then +@@ -4210,10 +4219,17 @@ fi # Install the pseudo-library for information purposes. @@ -228,20 +34,17 @@ $FreeBSD$ - instname="$dir/$name"i - $show "$install_prog $instname $destdir/$name" - $run eval "$install_prog $instname $destdir/$name" || exit $? -+ if test "$install_ltlibs" = yes; then ++ case $host in ++ *-*-freebsd*) ++ # Do not install the useless pseudo-library ++ ;; ++ *) + name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + instname="$dir/$name"i + $show "$install_prog $instname $destdir/$name" + $run eval "$install_prog $instname $destdir/$name" || exit $? -+ fi ++ ;; ++ esac # Maybe install the static library, too. test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" -@@ -3440,7 +3551,6 @@ - fi - libfile="$libdir/`$echo "X$lib" | $Xsed -e 's%^.*/%%g'`" - if test -n "$libdir" && test ! -f "$libfile"; then -- $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2 - finalize=no - fi - done diff --git a/devel/libtool15/files/patch-ae b/devel/libtool15/files/patch-ae index c92b003b58cd..62aeecd4ae60 100644 --- a/devel/libtool15/files/patch-ae +++ b/devel/libtool15/files/patch-ae @@ -1,13 +1,14 @@ ---- configure.orig Fri Jul 2 09:01:56 1999 -+++ configure Tue Aug 31 23:45:29 1999 -@@ -1853,10 +1853,6 @@ - *) # Relative path. - ac_sub_cache_file="$ac_dots$cache_file" ;; +--- configure.orig Wed Oct 23 02:26:05 2002 ++++ configure Mon Feb 17 02:04:57 2003 +@@ -865,3 +865,3 @@ + +-PACKAGE=libtool ++PACKAGE=libtool14 + +@@ -6089,6 +6089,2 @@ esac - case "$ac_given_INSTALL" in - [/$]*) INSTALL="$ac_given_INSTALL" ;; - *) INSTALL="$ac_dots$ac_given_INSTALL" ;; - esac - echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir" - # The eval makes quoting arguments work. diff --git a/devel/libtool15/files/patch-af b/devel/libtool15/files/patch-af index beb6be3b456f..1298dce981e1 100644 --- a/devel/libtool15/files/patch-af +++ b/devel/libtool15/files/patch-af @@ -1,13 +1,11 @@ ---- libltdl/Makefile.in.orig Tue Dec 7 13:03:38 1999 -+++ libltdl/Makefile.in Mon Jan 17 16:35:34 2000 -@@ -326,17 +326,16 @@ - distdir: $(DISTFILES) - -rm -rf $(distdir) +--- libltdl/Makefile.in.orig Wed Oct 23 02:26:07 2002 ++++ libltdl/Makefile.in Mon Feb 17 02:06:58 2003 +@@ -342,3 +342,3 @@ mkdir $(distdir) - -chmod 777 $(distdir) + -chmod 555 $(distdir) @for file in $(DISTFILES); do \ - d=$(srcdir); \ +@@ -346,9 +346,8 @@ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + echo no copy dir $$d/$$file; \ @@ -20,5 +18,20 @@ done + -chmod a+x $(distdir)/configure info-am: - info: info-am - dvi-am: +@@ -452,4 +451,4 @@ + local-install-files: $(DISTFILES) +- -rm -rf $(DESTDIR)$(datadir)/libtool/libltdl +- $(mkinstalldirs) $(DESTDIR)$(datadir)/libtool/libltdl ++ -rm -rf $(DESTDIR)$(datadir)/libtool14/libltdl ++ $(mkinstalldirs) $(DESTDIR)$(datadir)/libtool14/libltdl + @for file in $(DISTFILES); do \ +@@ -457,6 +456,6 @@ + if test -d $$d/$$file; then \ +- cp -r $$d/$$file $(DESTDIR)$(datadir)/libtool/libltdl/$$file; \ ++ cp -r $$d/$$file $(DESTDIR)$(datadir)/libtool14/libltdl/$$file; \ + else \ +- test -f $(DESTDIR)$(datadir)/libtool/libltdl/$$file \ +- || cp $$d/$$file $(DESTDIR)$(datadir)/libtool/libltdl/$$file || :; \ ++ test -f $(DESTDIR)$(datadir)/libtool14/libltdl/$$file \ ++ || cp $$d/$$file $(DESTDIR)$(datadir)/libtool14/libltdl/$$file || :; \ + fi; \ diff --git a/devel/libtool15/files/patch-ag b/devel/libtool15/files/patch-ag deleted file mode 100644 index 5fdcd1924641..000000000000 --- a/devel/libtool15/files/patch-ag +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- libltdl/configure 2001/01/31 10:58:38 1.1 -+++ libltdl/configure 2001/01/31 10:59:14 -@@ -1455,7 +1455,7 @@ - esac - - # Check for any special flags to pass to ltconfig. --libtool_flags="--cache-file=$cache_file" -+libtool_flags="--cache-file=$cache_file --disable-ltlibs" - test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared" - test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static" - test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install" diff --git a/devel/libtool15/files/patch-libtoolize.in b/devel/libtool15/files/patch-libtoolize.in new file mode 100644 index 000000000000..b92bbeb9d8e9 --- /dev/null +++ b/devel/libtool15/files/patch-libtoolize.in @@ -0,0 +1,9 @@ +--- libtoolize.in.orig Sun Oct 13 16:21:38 2002 ++++ libtoolize.in Mon Feb 17 01:56:19 2003 +@@ -39,4 +39,4 @@ + +-libtool_m4="$aclocaldir/libtool.m4" +-ltdl_m4="$aclocaldir/ltdl.m4" ++libtool_m4="$aclocaldir/libtool14.m4" ++ltdl_m4="$aclocaldir/ltdl14.m4" + diff --git a/devel/libtool15/pkg-descr.libltdl b/devel/libtool15/pkg-descr.libltdl new file mode 100644 index 000000000000..e57b99f21a5c --- /dev/null +++ b/devel/libtool15/pkg-descr.libltdl @@ -0,0 +1,9 @@ +This is GNU libltdl, a system independent dlopen wrapper for GNU libtool. + +It supports the following dlopen interfaces: +* dlopen (Solaris, Linux and various BSD flavors) +* shl_load (HP-UX) +* LoadLibrary (Win16 and Win32) +* load_add_on (BeOS) +* GNU DLD (emulates dynamic linking for static libraries) +* libtool's dlpreopen diff --git a/devel/libtool15/pkg-plist b/devel/libtool15/pkg-plist index f057cdf134b2..c0510d95ad88 100644 --- a/devel/libtool15/pkg-plist +++ b/devel/libtool15/pkg-plist @@ -1,29 +1,28 @@ -bin/libtool -bin/libtoolize -include/ltdl.h -@unexec install-info --delete %D/info/libtool.info %D/info/dir -info/libtool.info -@exec install-info %D/info/libtool.info %D/info/dir -lib/libltdl.a -lib/libltdl.so -lib/libltdl.so.1 -share/aclocal/libtool.m4 -share/libtool/config.guess -share/libtool/config.sub -share/libtool/libltdl/COPYING.LIB -share/libtool/libltdl/Makefile.am -share/libtool/libltdl/Makefile.in -share/libtool/libltdl/README -share/libtool/libltdl/acconfig.h -share/libtool/libltdl/acinclude.m4 -share/libtool/libltdl/aclocal.m4 -share/libtool/libltdl/config.h.in -share/libtool/libltdl/configure -share/libtool/libltdl/configure.in -share/libtool/libltdl/ltdl.c -share/libtool/libltdl/ltdl.h -share/libtool/libltdl/stamp-h.in -share/libtool/ltconfig -share/libtool/ltmain.sh -@dirrm share/libtool/libltdl -@dirrm share/libtool +@comment $FreeBSD$ +bin/libtool14 +bin/libtoolize14 +libexec/libtool14/libtool +libexec/libtool14/libtoolize +@unexec install-info --delete %D/info/libtool14.info %D/info/dir +info/libtool14.info +@exec install-info %D/info/libtool14.info %D/info/dir +share/aclocal/libtool14.m4 +share/aclocal/ltdl14.m4 +share/libtool14/config.guess +share/libtool14/config.sub +share/libtool14/libltdl/COPYING.LIB +share/libtool14/libltdl/Makefile.am +share/libtool14/libltdl/Makefile.in +share/libtool14/libltdl/README +share/libtool14/libltdl/acinclude.m4 +share/libtool14/libltdl/aclocal.m4 +share/libtool14/libltdl/config-h.in +share/libtool14/libltdl/configure +share/libtool14/libltdl/configure.in +share/libtool14/libltdl/ltdl.c +share/libtool14/libltdl/ltdl.h +share/libtool14/libltdl/stamp-h.in +share/libtool14/ltmain.sh +@dirrm share/libtool14/libltdl +@dirrm share/libtool14 +@dirrm libexec/libtool14 diff --git a/devel/libtool15/pkg-plist.libltdl b/devel/libtool15/pkg-plist.libltdl new file mode 100644 index 000000000000..1a8458d1a65c --- /dev/null +++ b/devel/libtool15/pkg-plist.libltdl @@ -0,0 +1,5 @@ +@comment $FreeBSD$ +include/ltdl.h +lib/libltdl.a +lib/libltdl.so +lib/libltdl.so.4 diff --git a/devel/shapelib/Makefile b/devel/shapelib/Makefile index 172a5fb091e1..a658f6bb44c7 100644 --- a/devel/shapelib/Makefile +++ b/devel/shapelib/Makefile @@ -13,11 +13,15 @@ MASTER_SITES= ftp://gdal.velocet.ca/pub/outgoing/ MAINTAINER= ports@FreeBSD.org COMMENT= C API for reading and writing ArcView Shapefiles -BUILD_DEPENDS= libtool:${PORTSDIR}/devel/libtool - +USE_LIBTOOL= yes +LIBTOOLFILES= # none ALL_TARGET= lib INSTALLS_SHLIB= yes +# no configure script, but we need the libtool environment +do-configure: + @${CP} ${LIBTOOL} ${WRKSRC} + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/.libs/libshp.so.1 ${PREFIX}/lib ${LN} -sf libshp.so.1 ${PREFIX}/lib/libshp.so diff --git a/devel/shapelib/files/patch-aa b/devel/shapelib/files/patch-aa index 1efd1a0cff62..add8dee42a54 100644 --- a/devel/shapelib/files/patch-aa +++ b/devel/shapelib/files/patch-aa @@ -1,11 +1,6 @@ - -$FreeBSD$ - ---- Makefile.orig Tue Mar 28 18:36:27 2000 -+++ Makefile Thu May 31 13:19:38 2001 -@@ -89,33 +89,32 @@ - - # ----------------------------------------------------------------------------- +--- Makefile.orig Tue Mar 28 15:36:27 2000 ++++ Makefile Wed Feb 19 20:32:54 2003 +@@ -91,23 +91,23 @@ # The following is contributed by Jan-Oliver Wagner, and should allow for -# creating shared libraries on most platforms with gcc, and libtool installed. +# creating shared libraries on most platforms with $(CC), and libtool installed. @@ -19,12 +14,12 @@ $FreeBSD$ - /bin/sh ./libtool --mode=compile gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c shpopen.c - gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c -fPIC -DPIC shpopen.c -o .libs/shpopen.lo - gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c shpopen.c -o shpopen.o >/dev/null 2>&1 -+ /bin/sh /usr/local/bin/libtool --mode=compile $(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include $(CFLAGS) -c shpopen.c ++ /bin/sh ./libtool --mode=compile $(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include $(CFLAGS) -c shpopen.c + $(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include $(CFLAGS) -c -fPIC -DPIC shpopen.c -o .libs/shpopen.lo + $(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include $(CFLAGS) -c shpopen.c -o shpopen.o >/dev/null 2>&1 mv -f .libs/shpopen.lo shpopen.lo - /bin/sh ./libtool --mode=compile gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c shptree.c -+ /bin/sh /usr/local/bin/libtool --mode=compile $(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include $(CFLAGS) -c shptree.c ++ /bin/sh ./libtool --mode=compile $(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include $(CFLAGS) -c shptree.c rm -f .libs/shptree.lo - gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c -fPIC -DPIC shptree.c -o .libs/shptree.lo - gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c shptree.c -o shptree.o >/dev/null 2>&1 @@ -32,7 +27,7 @@ $FreeBSD$ + $(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include $(CFLAGS) -c shptree.c -o shptree.o >/dev/null 2>&1 mv -f .libs/shptree.lo shptree.lo - /bin/sh ./libtool --mode=compile gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c dbfopen.c -+ /bin/sh /usr/local/bin/libtool --mode=compile $(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include $(CFLAGS) -c dbfopen.c ++ /bin/sh ./libtool --mode=compile $(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include $(CFLAGS) -c dbfopen.c rm -f .libs/dbfopen.lo - gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c -fPIC -DPIC dbfopen.c -o .libs/dbfopen.lo - gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c dbfopen.c -o dbfopen.o >/dev/null 2>&1 @@ -40,22 +35,9 @@ $FreeBSD$ + $(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include $(CFLAGS) -c dbfopen.c -o dbfopen.o >/dev/null 2>&1 mv -f .libs/dbfopen.lo dbfopen.lo - /bin/sh ./libtool --mode=link gcc -g -O2 -o libshp.la -rpath /usr/local/lib -version-info 1:1:0 shpopen.lo shptree.lo dbfopen.lo -+ /bin/sh /usr/local/bin/libtool --mode=link $(CC) $(CFLAGS) -o libshp.la -rpath /usr/local/lib -version-info 1:1:0 shpopen.lo shptree.lo dbfopen.lo ++ /bin/sh ./libtool --mode=link $(CC) $(CFLAGS) -o libshp.la -rpath /usr/local/lib -version-info 1:1:0 shpopen.lo shptree.lo dbfopen.lo rm -fr .libs/libshp.la .libs/libshp.* .libs/libshp.* - rm -fr .libs/libshp.lax - mkdir .libs/libshp.lax - /usr/bin/ld -G -h libshp.so.1 -o .libs/libshp.so.$(LIBSHP_VERSION) shpopen.lo shptree.lo dbfopen.lo -lc +@@ -117,3 +117,2 @@ - (cd .libs && rm -f libshp.so.1 && ln -s libshp.so.$(LIBSHP_VERSION) libshp.so.1) (cd .libs && rm -f libshp.so && ln -s libshp.so.$(LIBSHP_VERSION) libshp.so) - ar cru .libs/libshp.a shpopen.o shptree.o dbfopen.o - ranlib .libs/libshp.a -@@ -125,7 +124,7 @@ - lib_install: - cp .libs/libshp.la .libs/libshp.lai - /bin/sh ./mkinstalldirs /usr/local/lib -- /bin/sh ./libtool --mode=install /usr/bin/install -c libshp.la /usr/local/lib/libshp.la -+ /bin/sh /usr/local/bin/libtool --mode=install /usr/bin/install -c libshp.la /usr/local/lib/libshp.la - /usr/bin/install -c .libs/libshp.so.$(LIBSHP_VERSION) /usr/local/lib/libshp.so.$(LIBSHP_VERSION) - (cd /usr/local/lib && rm -f libshp.so.1 && ln -s libshp.so.$(LIBSHP_VERSION) libshp.so.1) - (cd /usr/local/lib && rm -f libshp.so && ln -s libshp.so.$(LIBSHP_VERSION) libshp.so) diff --git a/devel/swarm/Makefile b/devel/swarm/Makefile index e8223bd846d5..1419ee5094a2 100644 --- a/devel/swarm/Makefile +++ b/devel/swarm/Makefile @@ -26,6 +26,7 @@ USE_JAVA= 1.3+ USE_GMAKE= yes USE_XPM= yes USE_LIBTOOL= yes +USE_REINPLACE= yes INSTALLS_SHLIB= yes CONFIGURE_ARGS= --with-defaultdir=${PREFIX} \ --with-tclincludedir=${PREFIX}/include/tcl8.3 \ @@ -33,11 +34,18 @@ CONFIGURE_ARGS= --with-defaultdir=${PREFIX} \ --with-tclscriptdir=${PREFIX}/lib/tcl8.3 \ --with-tkscriptdir=${PREFIX}/lib/tk8.3 \ --enable-subdirs +PLIST_SUB= JAVA="@comment " .if defined(WITH_JAVA) CONFIGURE_ARGS+= --with-jdkdir=${JAVA_HOME} -PLIST= ${PKGDIR}/pkg-plist.withjava +PLIST_SUB= JAVA="" .endif +post-patch: + @${REINPLACE_CMD} \ + -e 's|%%LTCONFIG%%|${LIBTOOL_SHAREDIR}/ltconfig${LIBTOOL_VERSION}|g' \ + -e 's|%%LTMAIN%%|${LIBTOOL_SHAREDIR}/ltmain.sh|g' \ + ${WRKSRC}/configure + pre-everything:: .if !defined(WITH_JAVA) @${ECHO_MSG} "===>" @@ -50,6 +58,9 @@ pre-everything:: @${ECHO_MSG} "===>" .endif +post-patch: + + post-install: ${CAT} ${PKGMESSAGE} | ${SED} -e "s:%%PREFIX%%:${PREFIX}:g" diff --git a/devel/swarm/files/patch-ac b/devel/swarm/files/patch-ac index 75ad8b68b286..f84028b72499 100644 --- a/devel/swarm/files/patch-ac +++ b/devel/swarm/files/patch-ac @@ -15,8 +15,8 @@ DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \ -${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \ -$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \ -+${CONFIG_SHELL-/bin/sh} /usr/local/share/libtool/ltconfig --no-reexec \ -+$libtool_flags --no-verify --disable-ltlibs /usr/local/share/libtool/ltmain.sh $host \ ++${CONFIG_SHELL-/bin/sh} %%LTCONFIG%% --no-reexec \ ++$libtool_flags --no-verify --disable-ltlibs %%LTMAIN%% $host \ || { echo "configure: error: libtool configure failed" 1>&2; exit 1; } # Reload cache, that may have been modified by ltconfig @@ -25,7 +25,7 @@ # This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh" -+LIBTOOL_DEPS="/usr/local/share/libtool/ltconfig /usr/local/share/libtool/ltmain.sh" ++LIBTOOL_DEPS="%%LTCONFIG%% %%LTMAIN%%" # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' diff --git a/devel/swarm/pkg-plist b/devel/swarm/pkg-plist index 0700c7067185..f591680c2bc8 100644 --- a/devel/swarm/pkg-plist +++ b/devel/swarm/pkg-plist @@ -1,3 +1,5 @@ +%%JAVA%%bin/javaswarm +%%JAVA%%bin/javacswarm bin/libtool-swarm bin/m2h bin/make-h2x @@ -238,6 +240,12 @@ lib/swarm/libcollections.so.3 lib/swarm/libdefobj.a lib/swarm/libdefobj.so lib/swarm/libdefobj.so.4 +%%JAVA%%lib/swarm/libjavaswarm.a +%%JAVA%%lib/swarm/libjavaswarm.so +%%JAVA%%lib/swarm/libjavaswarm.so.1 +%%JAVA%%lib/swarm/libjavaswarmstubs.a +%%JAVA%%lib/swarm/libjavaswarmstubs.so +%%JAVA%%lib/swarm/libjavaswarmstubs.so.0 lib/swarm/libmisc.a lib/swarm/libmisc.so lib/swarm/libmisc.so.2 @@ -269,6 +277,8 @@ lib/swarm/libtclobjc.so.1 lib/swarm/libtkobjc.a lib/swarm/libtkobjc.so lib/swarm/libtkobjc.so.5 +%%JAVA%%share/swarm/swarm.jar +%%JAVA%%@dirrm share/swarm @dirrm etc/swarm @dirrm include/swarm/activity @dirrm include/swarm/analysis diff --git a/devel/swarm/pkg-plist.withjava b/devel/swarm/pkg-plist.withjava deleted file mode 100644 index a38ce40261c8..000000000000 --- a/devel/swarm/pkg-plist.withjava +++ /dev/null @@ -1,297 +0,0 @@ -bin/javaswarm -bin/javacswarm -bin/libtool-swarm -bin/m2h -bin/make-h2x -etc/swarm/Makefile.appl -etc/swarm/Makefile.common -etc/swarm/Makefile.lib -etc/swarm/Makefile.rules -etc/swarm/config.swarm -include/swarm/activity.h -include/swarm/activity/Action.h -include/swarm/activity/ActionGroup.h -include/swarm/activity/CompoundAction.h -include/swarm/activity/Schedule.h -include/swarm/activity/SwarmProcess.h -include/swarm/activity/XActivity.h -include/swarm/activity/classes.h -include/swarm/activity/types.h -include/swarm/analysis.h -include/swarm/analysis/ActiveGraph.h -include/swarm/analysis/ActiveOutFile.h -include/swarm/analysis/Averager.h -include/swarm/analysis/EZBin.h -include/swarm/analysis/EZDistribution.h -include/swarm/analysis/EZGraph.h -include/swarm/analysis/Entropy.h -include/swarm/analysis/FunctionGraph.h -include/swarm/collections.h -include/swarm/collections/Array.h -include/swarm/collections/Collection.h -include/swarm/collections/InputStream.h -include/swarm/collections/List.h -include/swarm/collections/ListShuffler.h -include/swarm/collections/List_GEN.h -include/swarm/collections/List_linked.h -include/swarm/collections/List_mlinks.h -include/swarm/collections/Map.h -include/swarm/collections/OrderedSet.h -include/swarm/collections/OutputStream.h -include/swarm/collections/Permutation.h -include/swarm/collections/Set.h -include/swarm/collections/Stream.h -include/swarm/collections/StringObject.h -include/swarm/collections/classes.h -include/swarm/collections/collections.h -include/swarm/collections/predicates.h -include/swarm/collections/types.h -include/swarm/defobj.h -include/swarm/defobj/Archiver.h -include/swarm/defobj/Arguments.h -include/swarm/defobj/Create.h -include/swarm/defobj/Customize.h -include/swarm/defobj/DefClass.h -include/swarm/defobj/DefObject.h -include/swarm/defobj/FArguments.h -include/swarm/defobj/FCall.h -include/swarm/defobj/HDF5Archiver.h -include/swarm/defobj/HDF5Object.h -include/swarm/defobj/JavaCollection.h -include/swarm/defobj/JavaCollectionIndex.h -include/swarm/defobj/JavaProxy.h -include/swarm/defobj/LispArchiver.h -include/swarm/defobj/Program.h -include/swarm/defobj/Symbol.h -include/swarm/defobj/Zone.h -include/swarm/defobj/classes.h -include/swarm/defobj/defalloc.h -include/swarm/defobj/deftype.h -include/swarm/defobj/directory.h -include/swarm/defobj/javavars.h -include/swarm/defobj/types.h -include/swarm/defobj/version.h -include/swarm/externvar.h -include/swarm/gui.h -include/swarm/misc.h -include/swarm/misc/argp.h -include/swarm/misc/avl.h -include/swarm/misc/getopt.h -include/swarm/objc/NXConstStr.h -include/swarm/objc/Object.h -include/swarm/objc/Protocol.h -include/swarm/objc/encoding.h -include/swarm/objc/externvar.h -include/swarm/objc/hash.h -include/swarm/objc/mframe.h -include/swarm/objc/objc-api.h -include/swarm/objc/objc-list.h -include/swarm/objc/objc.h -include/swarm/objc/runtime.h -include/swarm/objc/sarray.h -include/swarm/objc/thr.h -include/swarm/objc/typedstream.h -include/swarm/objectbase.h -include/swarm/objectbase/ActivityControl.h -include/swarm/objectbase/CompleteProbeMap.h -include/swarm/objectbase/CompleteVarMap.h -include/swarm/objectbase/CustomProbeMap.h -include/swarm/objectbase/DefaultProbeMap.h -include/swarm/objectbase/EmptyProbeMap.h -include/swarm/objectbase/MessageProbe.h -include/swarm/objectbase/Probe.h -include/swarm/objectbase/ProbeLibrary.h -include/swarm/objectbase/ProbeMap.h -include/swarm/objectbase/Swarm.h -include/swarm/objectbase/SwarmObject.h -include/swarm/objectbase/VarProbe.h -include/swarm/objectbase/probing.h -include/swarm/objectbase/swarm_rts_routines.h -include/swarm/random.h -include/swarm/random/ACGgen.h -include/swarm/random/BernoulliDist.h -include/swarm/random/C2LCGXgen.h -include/swarm/random/C2MRG3gen.h -include/swarm/random/C2TAUSgen.h -include/swarm/random/C3MWCgen.h -include/swarm/random/C4LCGXgen.h -include/swarm/random/ExponentialDist.h -include/swarm/random/GammaDist.h -include/swarm/random/LCGgen.h -include/swarm/random/LogNormalDist.h -include/swarm/random/MRGgen.h -include/swarm/random/MT19937gen.h -include/swarm/random/MWCAgen.h -include/swarm/random/MWCBgen.h -include/swarm/random/NormalDist.h -include/swarm/random/PMMLCGgen.h -include/swarm/random/PSWBgen.h -include/swarm/random/RWC2gen.h -include/swarm/random/RWC8gen.h -include/swarm/random/RandomBitDist.h -include/swarm/random/SCGgen.h -include/swarm/random/SWBgen.h -include/swarm/random/TGFSRgen.h -include/swarm/random/UniformDoubleDist.h -include/swarm/random/UniformIntegerDist.h -include/swarm/random/UniformUnsignedDist.h -include/swarm/random/distributions.h -include/swarm/random/generators.h -include/swarm/random/randomdefs.h -include/swarm/random/randomvars.h -include/swarm/simtools.h -include/swarm/simtools/AppendFile.h -include/swarm/simtools/InFile.h -include/swarm/simtools/NSelect.h -include/swarm/simtools/ObjectLoader.h -include/swarm/simtools/ObjectSaver.h -include/swarm/simtools/OutFile.h -include/swarm/simtools/QSort.h -include/swarm/simtools/UName.h -include/swarm/simtools/initSwarm.h -include/swarm/simtoolsgui.h -include/swarm/simtoolsgui/ActionCache.h -include/swarm/simtoolsgui/ActionHolder.h -include/swarm/simtoolsgui/ClassDisplayWidget.h -include/swarm/simtoolsgui/CommonProbeDisplay.h -include/swarm/simtoolsgui/CompleteProbeDisplay.h -include/swarm/simtoolsgui/ControlPanel.h -include/swarm/simtoolsgui/GUIComposite.h -include/swarm/simtoolsgui/GUISwarm.h -include/swarm/simtoolsgui/MessageProbeWidget.h -include/swarm/simtoolsgui/MultiVarProbeDisplay.h -include/swarm/simtoolsgui/MultiVarProbeWidget.h -include/swarm/simtoolsgui/ProbeDisplay.h -include/swarm/simtoolsgui/ProbeDisplayManager.h -include/swarm/simtoolsgui/SimpleProbeDisplay.h -include/swarm/simtoolsgui/SingleProbeDisplay.h -include/swarm/simtoolsgui/VarProbeWidget.h -include/swarm/space.h -include/swarm/space/Ca2d.h -include/swarm/space/ConwayLife2d.h -include/swarm/space/DblBuffer2d.h -include/swarm/space/Diffuse2d.h -include/swarm/space/Discrete2d.h -include/swarm/space/Grid2d.h -include/swarm/space/Int2dFiler.h -include/swarm/space/Object2dDisplay.h -include/swarm/space/Value2dDisplay.h -include/swarm/swarmconfig.h -include/swarm/tclobjc/TclInterp.h -include/swarm/tclobjc/TkInterp.h -include/swarm/tclobjc/tclObjc.h -include/swarm/tkobjc.h -include/swarm/tkobjc/ArchivedGeometryWidget.h -include/swarm/tkobjc/Button.h -include/swarm/tkobjc/ButtonPanel.h -include/swarm/tkobjc/Canvas.h -include/swarm/tkobjc/CanvasAbstractItem.h -include/swarm/tkobjc/CanvasItem.h -include/swarm/tkobjc/CheckButton.h -include/swarm/tkobjc/Circle.h -include/swarm/tkobjc/ClassDisplayHideButton.h -include/swarm/tkobjc/ClassDisplayLabel.h -include/swarm/tkobjc/Colormap.h -include/swarm/tkobjc/CompleteProbeDisplayLabel.h -include/swarm/tkobjc/CompositeItem.h -include/swarm/tkobjc/Entry.h -include/swarm/tkobjc/Form.h -include/swarm/tkobjc/Frame.h -include/swarm/tkobjc/Graph.h -include/swarm/tkobjc/Histogram.h -include/swarm/tkobjc/InputWidget.h -include/swarm/tkobjc/Label.h -include/swarm/tkobjc/Line.h -include/swarm/tkobjc/LinkItem.h -include/swarm/tkobjc/MessageProbeEntry.h -include/swarm/tkobjc/NodeItem.h -include/swarm/tkobjc/OvalNodeItem.h -include/swarm/tkobjc/Pixmap.h -include/swarm/tkobjc/ProbeCanvas.h -include/swarm/tkobjc/Raster.h -include/swarm/tkobjc/Rectangle.h -include/swarm/tkobjc/RectangleNodeItem.h -include/swarm/tkobjc/ScheduleItem.h -include/swarm/tkobjc/SimpleProbeDisplayHideButton.h -include/swarm/tkobjc/SuperButton.h -include/swarm/tkobjc/TextItem.h -include/swarm/tkobjc/TkExtra.h -include/swarm/tkobjc/VarProbeEntry.h -include/swarm/tkobjc/VarProbeLabel.h -include/swarm/tkobjc/Widget.h -include/swarm/tkobjc/WindowGeometryRecord.h -include/swarm/tkobjc/ZoomRaster.h -include/swarm/tkobjc/common.h -include/swarm/tkobjc/global.h -include/swarm/tkobjc/internal.h -include/swarm/tkobjc/win32dib.h -@unexec install-info --delete %D/info/objc-features.info %D/info/dir -info/objc-features.info -@exec install-info %D/info/objc-features.info %D/info/dir -lib/swarm/libactivity.a -lib/swarm/libactivity.so -lib/swarm/libactivity.so.5 -lib/swarm/libanalysis.a -lib/swarm/libanalysis.so -lib/swarm/libanalysis.so.4 -lib/swarm/libcollections.a -lib/swarm/libcollections.so -lib/swarm/libcollections.so.3 -lib/swarm/libdefobj.a -lib/swarm/libdefobj.so -lib/swarm/libdefobj.so.4 -lib/swarm/libmisc.a -lib/swarm/libjavaswarm.a -lib/swarm/libjavaswarm.so -lib/swarm/libjavaswarm.so.1 -lib/swarm/libjavaswarmstubs.a -lib/swarm/libjavaswarmstubs.so -lib/swarm/libjavaswarmstubs.so.0 -lib/swarm/libmisc.so -lib/swarm/libmisc.so.2 -lib/swarm/libobjc.a -lib/swarm/libobjc.la -lib/swarm/libobjc.so -lib/swarm/libobjc.so.0 -lib/swarm/libobjectbase.a -lib/swarm/libobjectbase.so -lib/swarm/libobjectbase.so.4 -lib/swarm/librandom.a -lib/swarm/librandom.so -lib/swarm/librandom.so.1 -lib/swarm/libsimtools.a -lib/swarm/libsimtools.so -lib/swarm/libsimtools.so.4 -lib/swarm/libsimtoolsgui.a -lib/swarm/libsimtoolsgui.so -lib/swarm/libsimtoolsgui.so.5 -lib/swarm/libspace.a -lib/swarm/libspace.so -lib/swarm/libspace.so.2 -lib/swarm/libswarm.a -lib/swarm/libswarm.so -lib/swarm/libswarm.so.0 -lib/swarm/libtclobjc.a -lib/swarm/libtclobjc.so -lib/swarm/libtclobjc.so.1 -lib/swarm/libtkobjc.a -lib/swarm/libtkobjc.so -lib/swarm/libtkobjc.so.5 -share/swarm/swarm.jar -@dirrm etc/swarm -@dirrm include/swarm/activity -@dirrm include/swarm/analysis -@dirrm include/swarm/collections -@dirrm include/swarm/defobj -@dirrm include/swarm/misc -@dirrm include/swarm/objc -@dirrm include/swarm/objectbase -@dirrm include/swarm/random -@dirrm include/swarm/simtools -@dirrm include/swarm/simtoolsgui -@dirrm include/swarm/space -@dirrm include/swarm/tclobjc -@dirrm include/swarm/tkobjc -@dirrm include/swarm -@dirrm lib/swarm -@dirrm share/swarm diff --git a/devel/xparam/Makefile b/devel/xparam/Makefile index e70395d5bb65..242ded0c1476 100644 --- a/devel/xparam/Makefile +++ b/devel/xparam/Makefile @@ -15,10 +15,9 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= A general-purpose tool for parameter handling in C++ -BUILD_DEPENDS= libtool:${PORTSDIR}/devel/libtool USE_GMAKE= yes -GNU_CONFIGURE= yes +USE_LIBTOOL= yes INSTALLS_SHLIB= yes .include <bsd.port.mk> |