diff --git a/devel/libtool/Makefile b/devel/libtool/Makefile index 5412d6a7f3f..d0e6444e695 100644 --- a/devel/libtool/Makefile +++ b/devel/libtool/Makefile @@ -1,30 +1,49 @@ -# $OpenBSD: Makefile,v 1.30 2002/12/29 20:19:11 fgsch Exp $ +# $OpenBSD: Makefile,v 1.31 2004/07/02 01:59:12 brad Exp $ # $FreeBSD: Makefile,v 1.2 1998/09/23 16:15:53 vanilla Exp $ COMMENT= "generic shared library support script" +COMMENT-ltdl= "GNU libtool system independent dlopen wrapper" -DISTNAME= libtool-1.3.5 -PKGNAME= ${DISTNAME}p3 +VERSION= 1.5.6 +DISTNAME= libtool-${VERSION} +PKGNAME-ltdl= libltdl-${VERSION} CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU:=libtool/} HOMEPAGE= http://www.gnu.org/software/libtool/ +AUTOCONF_VERSION= 2.59 +BUILD_DEPENDS+= ${MODGNU_AUTOCONF_DEPENDS} + MAINTAINER= Brad Smith +# GPL PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -SEPARATE_BUILD= simple +MAKE_ENV+= MAKEINFOFLAGS="--no-split" + CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= ${CONFIGURE_SHARED} -CONFIGURE_ARGS+= --enable-static -PATCH_LIST= ${PORTSDIR}/infrastructure/patches/patch-lt1.3.5-ltconfig \ - ${PORTSDIR}/infrastructure/patches/patch-lt1.3.5-ltmain_sh \ - patch-* +MULTI_PACKAGES= -ltdl +SUBPACKAGE?= + +.if defined(PACKAGING) +. if empty(SUBPACKAGE) +RUN_DEPENDS+= ::devel/libtool,-ltdl +. endif +.endif + +post-patch: +.for f in cdemo demo depdemo f77demo mdemo mdemo2 pdemo tagdemo + @cp -f ${WRKSRC}/acinclude.m4 ${WRKSRC}/${f} && \ + cd ${WRKSRC}/${f} && AUTOCONF_VERSION=${AUTOCONF_VERSION} autoconf +.endfor + @cd ${WRKSRC}/libltdl && AUTOCONF_VERSION=${AUTOCONF_VERSION} autoconf + @cd ${WRKSRC} && AUTOCONF_VERSION=${AUTOCONF_VERSION} autoconf pre-configure: @rm -f ${WRKSRC}/doc/libtool.info* diff --git a/devel/libtool/distinfo b/devel/libtool/distinfo index 81cd89d9d93..1400da01c1a 100644 --- a/devel/libtool/distinfo +++ b/devel/libtool/distinfo @@ -1,3 +1,3 @@ -MD5 (libtool-1.3.5.tar.gz) = fa26a07c978ad05d1f88ed7a472daa49 -RMD160 (libtool-1.3.5.tar.gz) = 0bb20b6802bc790dcbdaecde4058ed06ec77b429 -SHA1 (libtool-1.3.5.tar.gz) = 0e0a57bcdd4942a872d6b24ff666cfa0dd721452 +MD5 (libtool-1.5.6.tar.gz) = f9b709f4ac6d094afdee9cdbe1c6ffe7 +RMD160 (libtool-1.5.6.tar.gz) = 379b60b9e7d9207cff68c595182c4e65dd0c0a9f +SHA1 (libtool-1.5.6.tar.gz) = 6018b2661725e9689d7f782c5a2a489e928698ba diff --git a/devel/libtool/patches/patch-acinclude_m4 b/devel/libtool/patches/patch-acinclude_m4 new file mode 100644 index 00000000000..bb09eb447c1 --- /dev/null +++ b/devel/libtool/patches/patch-acinclude_m4 @@ -0,0 +1,56 @@ +$OpenBSD: patch-acinclude_m4,v 1.1 2004/07/02 01:59:12 brad Exp $ +--- acinclude.m4.orig Sun Apr 11 01:34:51 2004 ++++ acinclude.m4 Wed Jun 30 18:27:38 2004 +@@ -1506,7 +1506,7 @@ nto-qnx*) + openbsd*) + version_type=sunos + need_lib_prefix=no +- need_version=yes ++ need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH +@@ -2214,12 +2214,10 @@ nto-qnx*) + ;; + + openbsd*) +- lt_cv_file_magic_cmd=/usr/bin/file +- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object' ++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' + else +- lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library' ++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' + fi + ;; + +@@ -3204,6 +3202,20 @@ case $host_os in + # Workaround some broken pre-1.5 toolchains + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' + ;; ++ openbsd2*) ++ # C++ shared libraries are fairly broken ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ openbsd*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' ++ fi ++ output_verbose_link_cmd='echo' ++ ;; + osf3*) + case $cc_basename in + KCC) +@@ -5572,6 +5584,7 @@ $echo "local: *; };" >> $output_objdir/$ + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + else diff --git a/devel/libtool/patches/patch-doc_Makefile_in b/devel/libtool/patches/patch-doc_Makefile_in deleted file mode 100644 index 08fca1eb15f..00000000000 --- a/devel/libtool/patches/patch-doc_Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-doc_Makefile_in,v 1.1 2001/02/20 18:26:38 danh Exp $ ---- doc/Makefile.in.orig Sat May 27 07:23:34 2000 -+++ doc/Makefile.in Tue Feb 20 13:25:13 2001 -@@ -71,7 +71,7 @@ LD = @LD@ - 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/patches/patch-doc_libtool_texi b/devel/libtool/patches/patch-doc_libtool_texi index fda4c1e3541..d61c217742b 100644 --- a/devel/libtool/patches/patch-doc_libtool_texi +++ b/devel/libtool/patches/patch-doc_libtool_texi @@ -1,6 +1,6 @@ -$OpenBSD: patch-doc_libtool_texi,v 1.2 2001/08/27 01:16:48 brad Exp $ ---- doc/libtool.texi.orig Tue Nov 2 07:36:23 1999 -+++ doc/libtool.texi Sun Aug 26 21:06:13 2001 +$OpenBSD: patch-doc_libtool_texi,v 1.3 2004/07/02 01:59:12 brad Exp $ +--- doc/libtool.texi.orig 2004-01-23 01:05:27.000000000 -0500 ++++ doc/libtool.texi 2004-04-08 09:43:39.000000000 -0400 @@ -11,14 +11,14 @@ @set MAILLIST the libtool mailing list @email{libtool@@gnu.org} @set objdir .libs @@ -17,4 +17,4 @@ $OpenBSD: patch-doc_libtool_texi,v 1.2 2001/08/27 01:16:48 brad Exp $ +* Libtoolize: (libtool) Invoking libtoolize. Adding libtool support. @end direntry - @ifinfo + @ifnottex diff --git a/devel/libtool/patches/patch-libltdl_acinclude_m4 b/devel/libtool/patches/patch-libltdl_acinclude_m4 new file mode 100644 index 00000000000..a21440e15ce --- /dev/null +++ b/devel/libtool/patches/patch-libltdl_acinclude_m4 @@ -0,0 +1,56 @@ +$OpenBSD: patch-libltdl_acinclude_m4,v 1.1 2004/07/02 01:59:12 brad Exp $ +--- libltdl/acinclude.m4.orig Sun Apr 11 01:35:42 2004 ++++ libltdl/acinclude.m4 Wed Jun 30 18:28:05 2004 +@@ -1506,7 +1506,7 @@ nto-qnx*) + openbsd*) + version_type=sunos + need_lib_prefix=no +- need_version=yes ++ need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH +@@ -2214,12 +2214,10 @@ nto-qnx*) + ;; + + openbsd*) +- lt_cv_file_magic_cmd=/usr/bin/file +- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object' ++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' + else +- lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library' ++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' + fi + ;; + +@@ -3204,6 +3202,20 @@ case $host_os in + # Workaround some broken pre-1.5 toolchains + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' + ;; ++ openbsd2*) ++ # C++ shared libraries are fairly broken ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ openbsd*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' ++ fi ++ output_verbose_link_cmd='echo' ++ ;; + osf3*) + case $cc_basename in + KCC) +@@ -5572,6 +5584,7 @@ $echo "local: *; };" >> $output_objdir/$ + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + else diff --git a/devel/libtool/patches/patch-libtool_m4 b/devel/libtool/patches/patch-libtool_m4 new file mode 100644 index 00000000000..178fcc3ecf3 --- /dev/null +++ b/devel/libtool/patches/patch-libtool_m4 @@ -0,0 +1,56 @@ +$OpenBSD: patch-libtool_m4,v 1.1 2004/07/02 01:59:12 brad Exp $ +--- libtool.m4.orig Thu Apr 1 22:46:14 2004 ++++ libtool.m4 Wed Jun 30 18:27:20 2004 +@@ -1506,7 +1506,7 @@ nto-qnx*) + openbsd*) + version_type=sunos + need_lib_prefix=no +- need_version=yes ++ need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH +@@ -2214,12 +2214,10 @@ nto-qnx*) + ;; + + openbsd*) +- lt_cv_file_magic_cmd=/usr/bin/file +- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object' ++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' + else +- lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library' ++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' + fi + ;; + +@@ -3204,6 +3202,20 @@ case $host_os in + # Workaround some broken pre-1.5 toolchains + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' + ;; ++ openbsd2*) ++ # C++ shared libraries are fairly broken ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ openbsd*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' ++ fi ++ output_verbose_link_cmd='echo' ++ ;; + osf3*) + case $cc_basename in + KCC) +@@ -5572,6 +5584,7 @@ $echo "local: *; };" >> $output_objdir/$ + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + else diff --git a/devel/libtool/pkg/DESCR-ltdl b/devel/libtool/pkg/DESCR-ltdl new file mode 100644 index 00000000000..da0a449ca4d --- /dev/null +++ b/devel/libtool/pkg/DESCR-ltdl @@ -0,0 +1,10 @@ +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) +* dyld (darwin/Mac OS X) +* libtool's dlpreopen diff --git a/devel/libtool/pkg/PFRAG.shared b/devel/libtool/pkg/PFRAG.shared deleted file mode 100644 index aae372dd829..00000000000 --- a/devel/libtool/pkg/PFRAG.shared +++ /dev/null @@ -1,3 +0,0 @@ -@comment $OpenBSD: PFRAG.shared,v 1.3 2000/07/04 01:46:39 krw Exp $ -lib/libltdl.so.1.2 -DYNLIBDIR(%B) diff --git a/devel/libtool/pkg/PFRAG.shared-ltdl b/devel/libtool/pkg/PFRAG.shared-ltdl new file mode 100644 index 00000000000..6fc9b292abc --- /dev/null +++ b/devel/libtool/pkg/PFRAG.shared-ltdl @@ -0,0 +1,3 @@ +@comment $OpenBSD: PFRAG.shared-ltdl,v 1.1 2004/07/02 01:59:12 brad Exp $ +lib/libltdl.so.4.0 +DYNLIBDIR(%D/lib) diff --git a/devel/libtool/pkg/PLIST b/devel/libtool/pkg/PLIST index c289ed32076..4747f5f3a0d 100644 --- a/devel/libtool/pkg/PLIST +++ b/devel/libtool/pkg/PLIST @@ -1,29 +1,12 @@ -@comment $OpenBSD: PLIST,v 1.7 2000/06/10 18:13:36 brad Exp $ +@comment $OpenBSD: PLIST,v 1.8 2004/07/02 01:59:12 brad Exp $ bin/libtool bin/libtoolize -@unexec install-info --delete %D/info/libtool.info %D/info/dir +@unexec install-info --delete --info-dir=%D/info %D/info/libtool.info info/libtool.info -@exec install-info %D/info/libtool.info %D/info/dir -lib/libltdl.a -lib/libltdl.la -%%SHARED%% +@exec install-info --info-dir=%D/info %D/info/libtool.info 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 +@dirrm share/aclocal diff --git a/devel/libtool/pkg/PLIST-ltdl b/devel/libtool/pkg/PLIST-ltdl new file mode 100644 index 00000000000..aecb7d65705 --- /dev/null +++ b/devel/libtool/pkg/PLIST-ltdl @@ -0,0 +1,24 @@ +@comment $OpenBSD: PLIST-ltdl,v 1.1 2004/07/02 01:59:12 brad Exp $ +include/ltdl.h +lib/libltdl.a +lib/libltdl.la +%%SHARED%% +share/aclocal/ltdl.m4 +share/libtool/libltdl/COPYING.LIB +share/libtool/libltdl/Makefile.am +share/libtool/libltdl/Makefile.in +share/libtool/libltdl/README +share/libtool/libltdl/acinclude.m4 +share/libtool/libltdl/aclocal.m4 +share/libtool/libltdl/config-h.in +share/libtool/libltdl/config.guess +share/libtool/libltdl/config.sub +share/libtool/libltdl/configure +share/libtool/libltdl/configure.ac +share/libtool/libltdl/install-sh +share/libtool/libltdl/ltdl.c +share/libtool/libltdl/ltdl.h +share/libtool/libltdl/ltmain.sh +share/libtool/libltdl/missing +@dirrm share/libtool/libltdl +@dirrm share/libtool