From bbd6a62a28b2cfb46e412091903f05d22b53e56c Mon Sep 17 00:00:00 2001 From: Satoshi Asami Date: Sat, 11 Sep 1999 01:04:52 +0000 Subject: Submitted by: maintainer He says: Update libtool to 1.3.3 and modify it's behaviour a bit. It now behaves like a stock libtool unless we start sending one of three flags: --disable-ltlibs Don't install .la files --release-suffix Add the release to the end of all the libs (like GLib/GTK+) --release-ignore Don't add the release to any libs. PR: 13114 --- devel/gnu-libtool/Makefile | 4 +- devel/gnu-libtool/distinfo | 2 +- devel/gnu-libtool/files/patch-aa | 8 +- devel/gnu-libtool/files/patch-ab | 6 +- devel/gnu-libtool/files/patch-ac | 91 ++++++++++++++++------ devel/gnu-libtool/files/patch-ad | 159 +++++++++++++++++++++++++++++++-------- devel/gnu-libtool/files/patch-ae | 6 +- devel/gnu-libtool/files/patch-af | 24 ++++++ devel/libtool/Makefile | 4 +- devel/libtool/distinfo | 2 +- devel/libtool/files/patch-aa | 8 +- devel/libtool/files/patch-ab | 6 +- devel/libtool/files/patch-ac | 91 ++++++++++++++++------ devel/libtool/files/patch-ad | 159 +++++++++++++++++++++++++++++++-------- devel/libtool/files/patch-ae | 6 +- devel/libtool/files/patch-af | 24 ++++++ devel/libtool13/Makefile | 4 +- devel/libtool13/distinfo | 2 +- devel/libtool13/files/patch-aa | 8 +- devel/libtool13/files/patch-ab | 6 +- devel/libtool13/files/patch-ac | 91 ++++++++++++++++------ devel/libtool13/files/patch-ad | 159 +++++++++++++++++++++++++++++++-------- devel/libtool13/files/patch-ae | 6 +- devel/libtool13/files/patch-af | 24 ++++++ devel/libtool14/Makefile | 4 +- devel/libtool14/distinfo | 2 +- devel/libtool14/files/patch-aa | 8 +- devel/libtool14/files/patch-ab | 6 +- devel/libtool14/files/patch-ac | 91 ++++++++++++++++------ devel/libtool14/files/patch-ad | 159 +++++++++++++++++++++++++++++++-------- devel/libtool14/files/patch-ae | 6 +- devel/libtool14/files/patch-af | 24 ++++++ devel/libtool15/Makefile | 4 +- devel/libtool15/distinfo | 2 +- devel/libtool15/files/patch-aa | 8 +- devel/libtool15/files/patch-ab | 6 +- devel/libtool15/files/patch-ac | 91 ++++++++++++++++------ devel/libtool15/files/patch-ad | 159 +++++++++++++++++++++++++++++++-------- devel/libtool15/files/patch-ae | 6 +- devel/libtool15/files/patch-af | 24 ++++++ 40 files changed, 1180 insertions(+), 320 deletions(-) create mode 100644 devel/gnu-libtool/files/patch-af create mode 100644 devel/libtool/files/patch-af create mode 100644 devel/libtool13/files/patch-af create mode 100644 devel/libtool14/files/patch-af create mode 100644 devel/libtool15/files/patch-af (limited to 'devel') diff --git a/devel/gnu-libtool/Makefile b/devel/gnu-libtool/Makefile index c39fc49c7f4b..f8eec75acd5c 100644 --- a/devel/gnu-libtool/Makefile +++ b/devel/gnu-libtool/Makefile @@ -1,12 +1,12 @@ # New ports collection makefile for: libtool -# Version required: 1.3 +# Version required: 1.3.3 # Date created: 6 May 1998 # Whom: Motoyuki Kasahara # # $FreeBSD$ # -DISTNAME= libtool-1.3 +DISTNAME= libtool-1.3.3 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= libtool diff --git a/devel/gnu-libtool/distinfo b/devel/gnu-libtool/distinfo index ae15cdfd6930..85d684bde45b 100644 --- a/devel/gnu-libtool/distinfo +++ b/devel/gnu-libtool/distinfo @@ -1 +1 @@ -MD5 (libtool-1.3.tar.gz) = 770f8b97b03e95b7e0cf383297906353 +MD5 (libtool-1.3.3.tar.gz) = 574b5a12423c2aa575efe122c6c5831b diff --git a/devel/gnu-libtool/files/patch-aa b/devel/gnu-libtool/files/patch-aa index 483466c69666..91ff871e5ae3 100644 --- a/devel/gnu-libtool/files/patch-aa +++ b/devel/gnu-libtool/files/patch-aa @@ -1,7 +1,7 @@ ---- doc/libtool.texi.orig Wed Mar 11 02:04:36 1998 -+++ doc/libtool.texi Mon Apr 27 16:57:24 1998 -@@ -10,7 +10,7 @@ - @set BUGADDR the libtool mailing list @email{bug-libtool@@gnu.org} +--- 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 diff --git a/devel/gnu-libtool/files/patch-ab b/devel/gnu-libtool/files/patch-ab index dd642b335b69..f96b92eac308 100644 --- a/devel/gnu-libtool/files/patch-ab +++ b/devel/gnu-libtool/files/patch-ab @@ -1,5 +1,5 @@ ---- doc/Makefile.in.orig Fri Mar 20 17:01:52 1998 -+++ doc/Makefile.in Mon Apr 27 17:22:55 1998 +--- 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@ @@ -7,5 +7,5 @@ -MAKEINFO = @MAKEINFO@ +MAKEINFO = @MAKEINFO@ --no-split NM = @NM@ + OBJDUMP = @OBJDUMP@ PACKAGE = @PACKAGE@ - RANLIB = @RANLIB@ diff --git a/devel/gnu-libtool/files/patch-ac b/devel/gnu-libtool/files/patch-ac index 149d89578115..32158c98ca68 100644 --- a/devel/gnu-libtool/files/patch-ac +++ b/devel/gnu-libtool/files/patch-ac @@ -1,40 +1,47 @@ ---- ltconfig.orig Thu Apr 29 15:30:36 1999 -+++ ltconfig Sat May 22 15:52:24 1999 +--- ltconfig.orig Fri Jul 2 09:02:37 1999 ++++ ltconfig Sat Sep 4 11:34:21 1999 @@ -169,7 +169,7 @@ # Constants: PROGRAM=ltconfig PACKAGE=libtool --VERSION=1.3 -+VERSION=1.3-freebsd-ports - TIMESTAMP=" (1.385.2.117 1999/04/29 13:07:13)" +-VERSION=1.3.3 ++VERSION=1.3.3-freebsd-ports + TIMESTAMP=" (1.385.2.181 1999/07/02 15:49:11)" ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.c 1>&5' ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.c $LIBS 1>&5' -@@ -184,6 +184,7 @@ - # All known linkers require a `.a' archive for static linking. +@@ -185,6 +185,8 @@ + # which needs '.lib'). enable_static=yes enable_fast_install=yes -+install_ltlibs=no ++install_ltlibs=yes ++release_suffix=yes enable_dlopen=unknown enable_win32_dll=no ltmain= -@@ -244,6 +245,7 @@ +@@ -246,6 +248,9 @@ --disable-shared do not build shared libraries --disable-static do not build static libraries --disable-fast-install do not optimize for fast installation -+ --install-ltlibs install the .la archives ++ --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 -@@ -277,6 +279,8 @@ +@@ -279,6 +284,12 @@ --disable-fast-install) enable_fast_install=no ;; -+ --install-ltlibs) install_ltlibs=yes ;; ++ --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 ;; -@@ -927,11 +931,11 @@ +@@ -971,11 +982,11 @@ $rm conftest.dat if ln -s X conftest.dat 2>/dev/null; then $rm conftest.dat @@ -48,7 +55,42 @@ echo "$ac_t"yes 1>&6 else echo "$ac_t"no 1>&6 -@@ -1742,19 +1746,17 @@ +@@ -1226,8 +1237,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 +@@ -1348,14 +1359,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' ;; +@@ -1732,7 +1735,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' +@@ -1829,19 +1832,21 @@ case "$version_type" in freebsd-elf*) deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object' @@ -68,23 +110,30 @@ - finish_cmds='PATH="\$PATH:/sbin" OBJFORMAT="'"$objformat"'" ldconfig -m $libdir' + 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' ++ 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 - ;; - -@@ -2613,6 +2615,12 @@ + case "$host_os" in + freebsd2* | freebsd3.[01]*) +@@ -2719,6 +2724,15 @@ # Shell to use when invoking shell scripts. SHELL=$LTSHELL + -+# Install PREFIX -+PREFIX=$PREFIX -+ +# 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 6f5fd6c51975..4834f846a05e 100644 --- a/devel/gnu-libtool/files/patch-ad +++ b/devel/gnu-libtool/files/patch-ad @@ -1,36 +1,28 @@ ---- ltmain.sh.orig Thu Apr 29 15:30:37 1999 -+++ ltmain.sh Sat May 22 13:59:59 1999 +--- ltmain.sh.orig Fri Jul 2 09:02:40 1999 ++++ ltmain.sh Fri Sep 3 02:01:51 1999 @@ -54,7 +54,7 @@ # Constants. PROGRAM=ltmain.sh PACKAGE=libtool --VERSION=1.3 -+VERSION=1.3-freebsd-ports - TIMESTAMP=" (1.385.2.117 1999/04/29 13:07:13)" +-VERSION=1.3.3 ++VERSION=1.3.3-freebsd-ports + TIMESTAMP=" (1.385.2.181 1999/07/02 15:49:11)" default_mode= -@@ -150,6 +150,11 @@ - exit 0 - ;; - -+ --prefix) -+ echo "$PREFIX" -+ exit 0 -+ ;; -+ - --debug) - echo "$progname: enabling shell trace mode" - set -x -@@ -928,7 +933,7 @@ +@@ -946,7 +946,11 @@ continue ;; release) - release="-$arg" -+ release="$arg" ++ if test "$release_suffix" = all; then ++ release="$arg" ++ elif test "$release_suffix" = yes; then ++ release="-$arg" ++ fi prev= continue ;; -@@ -981,6 +986,7 @@ +@@ -999,6 +1003,7 @@ ;; -avoid-version) @@ -38,7 +30,7 @@ avoid_version=yes continue ;; -@@ -1066,6 +1072,10 @@ +@@ -1085,6 +1090,10 @@ deplibs="$deplibs $arg" ;; @@ -49,7 +41,7 @@ -module) module=yes continue -@@ -1763,6 +1773,9 @@ +@@ -1789,6 +1798,9 @@ *-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*) # these systems don't actually have a c library (as such)! ;; @@ -59,34 +51,141 @@ *) # Add libc to deplibs on all other systems. deplibs="$deplibs -lc" -@@ -1785,7 +1798,7 @@ +@@ -1796,6 +1808,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}.*" +@@ -1811,7 +1911,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" -+ oldlibs="$oldlibs $output_objdir/$libname$release.$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` -@@ -1979,7 +1992,7 @@ +@@ -2005,7 +2109,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" -+ oldlibs="$output_objdir/$libname$release.$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 -@@ -2933,7 +2946,7 @@ +@@ -3026,7 +3134,11 @@ case "$output" in *.la) old_library= - test "$build_old_libs" = yes && old_library="$libname.$libext" -+ test "$build_old_libs" = yes && old_library="$libname$release.$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 -@@ -3230,10 +3243,12 @@ +@@ -3315,10 +3427,12 @@ fi # Install the pseudo-library for information purposes. @@ -103,7 +202,7 @@ # Maybe install the static library, too. test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" -@@ -3322,7 +3337,6 @@ +@@ -3407,7 +3521,6 @@ fi libfile="$libdir/`$echo "X$lib" | $Xsed -e 's%^.*/%%g'`" if test -n "$libdir" && test ! -f "$libfile"; then diff --git a/devel/gnu-libtool/files/patch-ae b/devel/gnu-libtool/files/patch-ae index 1468b8fed6bd..c92b003b58cd 100644 --- a/devel/gnu-libtool/files/patch-ae +++ b/devel/gnu-libtool/files/patch-ae @@ -1,6 +1,6 @@ ---- configure.orig Fri Feb 19 00:50:06 1999 -+++ configure Fri Feb 19 00:50:21 1999 -@@ -5288,10 +5288,6 @@ +--- 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 diff --git a/devel/gnu-libtool/files/patch-af b/devel/gnu-libtool/files/patch-af new file mode 100644 index 000000000000..a62485d06dc4 --- /dev/null +++ b/devel/gnu-libtool/files/patch-af @@ -0,0 +1,24 @@ +--- libltdl/Makefile.in.orig Fri Jul 2 09:02:06 1999 ++++ libltdl/Makefile.in Thu Sep 9 22:40:10 1999 +@@ -328,17 +328,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 $$/$$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/Makefile b/devel/libtool/Makefile index c39fc49c7f4b..f8eec75acd5c 100644 --- a/devel/libtool/Makefile +++ b/devel/libtool/Makefile @@ -1,12 +1,12 @@ # New ports collection makefile for: libtool -# Version required: 1.3 +# Version required: 1.3.3 # Date created: 6 May 1998 # Whom: Motoyuki Kasahara # # $FreeBSD$ # -DISTNAME= libtool-1.3 +DISTNAME= libtool-1.3.3 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= libtool diff --git a/devel/libtool/distinfo b/devel/libtool/distinfo index ae15cdfd6930..85d684bde45b 100644 --- a/devel/libtool/distinfo +++ b/devel/libtool/distinfo @@ -1 +1 @@ -MD5 (libtool-1.3.tar.gz) = 770f8b97b03e95b7e0cf383297906353 +MD5 (libtool-1.3.3.tar.gz) = 574b5a12423c2aa575efe122c6c5831b diff --git a/devel/libtool/files/patch-aa b/devel/libtool/files/patch-aa index 483466c69666..91ff871e5ae3 100644 --- a/devel/libtool/files/patch-aa +++ b/devel/libtool/files/patch-aa @@ -1,7 +1,7 @@ ---- doc/libtool.texi.orig Wed Mar 11 02:04:36 1998 -+++ doc/libtool.texi Mon Apr 27 16:57:24 1998 -@@ -10,7 +10,7 @@ - @set BUGADDR the libtool mailing list @email{bug-libtool@@gnu.org} +--- 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 diff --git a/devel/libtool/files/patch-ab b/devel/libtool/files/patch-ab index dd642b335b69..f96b92eac308 100644 --- a/devel/libtool/files/patch-ab +++ b/devel/libtool/files/patch-ab @@ -1,5 +1,5 @@ ---- doc/Makefile.in.orig Fri Mar 20 17:01:52 1998 -+++ doc/Makefile.in Mon Apr 27 17:22:55 1998 +--- 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@ @@ -7,5 +7,5 @@ -MAKEINFO = @MAKEINFO@ +MAKEINFO = @MAKEINFO@ --no-split NM = @NM@ + OBJDUMP = @OBJDUMP@ PACKAGE = @PACKAGE@ - RANLIB = @RANLIB@ diff --git a/devel/libtool/files/patch-ac b/devel/libtool/files/patch-ac index 149d89578115..32158c98ca68 100644 --- a/devel/libtool/files/patch-ac +++ b/devel/libtool/files/patch-ac @@ -1,40 +1,47 @@ ---- ltconfig.orig Thu Apr 29 15:30:36 1999 -+++ ltconfig Sat May 22 15:52:24 1999 +--- ltconfig.orig Fri Jul 2 09:02:37 1999 ++++ ltconfig Sat Sep 4 11:34:21 1999 @@ -169,7 +169,7 @@ # Constants: PROGRAM=ltconfig PACKAGE=libtool --VERSION=1.3 -+VERSION=1.3-freebsd-ports - TIMESTAMP=" (1.385.2.117 1999/04/29 13:07:13)" +-VERSION=1.3.3 ++VERSION=1.3.3-freebsd-ports + TIMESTAMP=" (1.385.2.181 1999/07/02 15:49:11)" ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.c 1>&5' ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.c $LIBS 1>&5' -@@ -184,6 +184,7 @@ - # All known linkers require a `.a' archive for static linking. +@@ -185,6 +185,8 @@ + # which needs '.lib'). enable_static=yes enable_fast_install=yes -+install_ltlibs=no ++install_ltlibs=yes ++release_suffix=yes enable_dlopen=unknown enable_win32_dll=no ltmain= -@@ -244,6 +245,7 @@ +@@ -246,6 +248,9 @@ --disable-shared do not build shared libraries --disable-static do not build static libraries --disable-fast-install do not optimize for fast installation -+ --install-ltlibs install the .la archives ++ --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 -@@ -277,6 +279,8 @@ +@@ -279,6 +284,12 @@ --disable-fast-install) enable_fast_install=no ;; -+ --install-ltlibs) install_ltlibs=yes ;; ++ --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 ;; -@@ -927,11 +931,11 @@ +@@ -971,11 +982,11 @@ $rm conftest.dat if ln -s X conftest.dat 2>/dev/null; then $rm conftest.dat @@ -48,7 +55,42 @@ echo "$ac_t"yes 1>&6 else echo "$ac_t"no 1>&6 -@@ -1742,19 +1746,17 @@ +@@ -1226,8 +1237,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 +@@ -1348,14 +1359,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' ;; +@@ -1732,7 +1735,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' +@@ -1829,19 +1832,21 @@ case "$version_type" in freebsd-elf*) deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object' @@ -68,23 +110,30 @@ - finish_cmds='PATH="\$PATH:/sbin" OBJFORMAT="'"$objformat"'" ldconfig -m $libdir' + 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' ++ 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 - ;; - -@@ -2613,6 +2615,12 @@ + case "$host_os" in + freebsd2* | freebsd3.[01]*) +@@ -2719,6 +2724,15 @@ # Shell to use when invoking shell scripts. SHELL=$LTSHELL + -+# Install PREFIX -+PREFIX=$PREFIX -+ +# 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 index 6f5fd6c51975..4834f846a05e 100644 --- a/devel/libtool/files/patch-ad +++ b/devel/libtool/files/patch-ad @@ -1,36 +1,28 @@ ---- ltmain.sh.orig Thu Apr 29 15:30:37 1999 -+++ ltmain.sh Sat May 22 13:59:59 1999 +--- ltmain.sh.orig Fri Jul 2 09:02:40 1999 ++++ ltmain.sh Fri Sep 3 02:01:51 1999 @@ -54,7 +54,7 @@ # Constants. PROGRAM=ltmain.sh PACKAGE=libtool --VERSION=1.3 -+VERSION=1.3-freebsd-ports - TIMESTAMP=" (1.385.2.117 1999/04/29 13:07:13)" +-VERSION=1.3.3 ++VERSION=1.3.3-freebsd-ports + TIMESTAMP=" (1.385.2.181 1999/07/02 15:49:11)" default_mode= -@@ -150,6 +150,11 @@ - exit 0 - ;; - -+ --prefix) -+ echo "$PREFIX" -+ exit 0 -+ ;; -+ - --debug) - echo "$progname: enabling shell trace mode" - set -x -@@ -928,7 +933,7 @@ +@@ -946,7 +946,11 @@ continue ;; release) - release="-$arg" -+ release="$arg" ++ if test "$release_suffix" = all; then ++ release="$arg" ++ elif test "$release_suffix" = yes; then ++ release="-$arg" ++ fi prev= continue ;; -@@ -981,6 +986,7 @@ +@@ -999,6 +1003,7 @@ ;; -avoid-version) @@ -38,7 +30,7 @@ avoid_version=yes continue ;; -@@ -1066,6 +1072,10 @@ +@@ -1085,6 +1090,10 @@ deplibs="$deplibs $arg" ;; @@ -49,7 +41,7 @@ -module) module=yes continue -@@ -1763,6 +1773,9 @@ +@@ -1789,6 +1798,9 @@ *-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*) # these systems don't actually have a c library (as such)! ;; @@ -59,34 +51,141 @@ *) # Add libc to deplibs on all other systems. deplibs="$deplibs -lc" -@@ -1785,7 +1798,7 @@ +@@ -1796,6 +1808,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}.*" +@@ -1811,7 +1911,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" -+ oldlibs="$oldlibs $output_objdir/$libname$release.$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` -@@ -1979,7 +1992,7 @@ +@@ -2005,7 +2109,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" -+ oldlibs="$output_objdir/$libname$release.$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 -@@ -2933,7 +2946,7 @@ +@@ -3026,7 +3134,11 @@ case "$output" in *.la) old_library= - test "$build_old_libs" = yes && old_library="$libname.$libext" -+ test "$build_old_libs" = yes && old_library="$libname$release.$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 -@@ -3230,10 +3243,12 @@ +@@ -3315,10 +3427,12 @@ fi # Install the pseudo-library for information purposes. @@ -103,7 +202,7 @@ # Maybe install the static library, too. test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" -@@ -3322,7 +3337,6 @@ +@@ -3407,7 +3521,6 @@ fi libfile="$libdir/`$echo "X$lib" | $Xsed -e 's%^.*/%%g'`" if test -n "$libdir" && test ! -f "$libfile"; then diff --git a/devel/libtool/files/patch-ae b/devel/libtool/files/patch-ae index 1468b8fed6bd..c92b003b58cd 100644 --- a/devel/libtool/files/patch-ae +++ b/devel/libtool/files/patch-ae @@ -1,6 +1,6 @@ ---- configure.orig Fri Feb 19 00:50:06 1999 -+++ configure Fri Feb 19 00:50:21 1999 -@@ -5288,10 +5288,6 @@ +--- 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 diff --git a/devel/libtool/files/patch-af b/devel/libtool/files/patch-af new file mode 100644 index 000000000000..a62485d06dc4 --- /dev/null +++ b/devel/libtool/files/patch-af @@ -0,0 +1,24 @@ +--- libltdl/Makefile.in.orig Fri Jul 2 09:02:06 1999 ++++ libltdl/Makefile.in Thu Sep 9 22:40:10 1999 +@@ -328,17 +328,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 $$/$$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/libtool13/Makefile b/devel/libtool13/Makefile index c39fc49c7f4b..f8eec75acd5c 100644 --- a/devel/libtool13/Makefile +++ b/devel/libtool13/Makefile @@ -1,12 +1,12 @@ # New ports collection makefile for: libtool -# Version required: 1.3 +# Version required: 1.3.3 # Date created: 6 May 1998 # Whom: Motoyuki Kasahara # # $FreeBSD$ # -DISTNAME= libtool-1.3 +DISTNAME= libtool-1.3.3 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= libtool diff --git a/devel/libtool13/distinfo b/devel/libtool13/distinfo index ae15cdfd6930..85d684bde45b 100644 --- a/devel/libtool13/distinfo +++ b/devel/libtool13/distinfo @@ -1 +1 @@ -MD5 (libtool-1.3.tar.gz) = 770f8b97b03e95b7e0cf383297906353 +MD5 (libtool-1.3.3.tar.gz) = 574b5a12423c2aa575efe122c6c5831b diff --git a/devel/libtool13/files/patch-aa b/devel/libtool13/files/patch-aa index 483466c69666..91ff871e5ae3 100644 --- a/devel/libtool13/files/patch-aa +++ b/devel/libtool13/files/patch-aa @@ -1,7 +1,7 @@ ---- doc/libtool.texi.orig Wed Mar 11 02:04:36 1998 -+++ doc/libtool.texi Mon Apr 27 16:57:24 1998 -@@ -10,7 +10,7 @@ - @set BUGADDR the libtool mailing list @email{bug-libtool@@gnu.org} +--- 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 diff --git a/devel/libtool13/files/patch-ab b/devel/libtool13/files/patch-ab index dd642b335b69..f96b92eac308 100644 --- a/devel/libtool13/files/patch-ab +++ b/devel/libtool13/files/patch-ab @@ -1,5 +1,5 @@ ---- doc/Makefile.in.orig Fri Mar 20 17:01:52 1998 -+++ doc/Makefile.in Mon Apr 27 17:22:55 1998 +--- 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@ @@ -7,5 +7,5 @@ -MAKEINFO = @MAKEINFO@ +MAKEINFO = @MAKEINFO@ --no-split NM = @NM@ + OBJDUMP = @OBJDUMP@ PACKAGE = @PACKAGE@ - RANLIB = @RANLIB@ diff --git a/devel/libtool13/files/patch-ac b/devel/libtool13/files/patch-ac index 149d89578115..32158c98ca68 100644 --- a/devel/libtool13/files/patch-ac +++ b/devel/libtool13/files/patch-ac @@ -1,40 +1,47 @@ ---- ltconfig.orig Thu Apr 29 15:30:36 1999 -+++ ltconfig Sat May 22 15:52:24 1999 +--- ltconfig.orig Fri Jul 2 09:02:37 1999 ++++ ltconfig Sat Sep 4 11:34:21 1999 @@ -169,7 +169,7 @@ # Constants: PROGRAM=ltconfig PACKAGE=libtool --VERSION=1.3 -+VERSION=1.3-freebsd-ports - TIMESTAMP=" (1.385.2.117 1999/04/29 13:07:13)" +-VERSION=1.3.3 ++VERSION=1.3.3-freebsd-ports + TIMESTAMP=" (1.385.2.181 1999/07/02 15:49:11)" ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.c 1>&5' ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.c $LIBS 1>&5' -@@ -184,6 +184,7 @@ - # All known linkers require a `.a' archive for static linking. +@@ -185,6 +185,8 @@ + # which needs '.lib'). enable_static=yes enable_fast_install=yes -+install_ltlibs=no ++install_ltlibs=yes ++release_suffix=yes enable_dlopen=unknown enable_win32_dll=no ltmain= -@@ -244,6 +245,7 @@ +@@ -246,6 +248,9 @@ --disable-shared do not build shared libraries --disable-static do not build static libraries --disable-fast-install do not optimize for fast installation -+ --install-ltlibs install the .la archives ++ --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 -@@ -277,6 +279,8 @@ +@@ -279,6 +284,12 @@ --disable-fast-install) enable_fast_install=no ;; -+ --install-ltlibs) install_ltlibs=yes ;; ++ --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 ;; -@@ -927,11 +931,11 @@ +@@ -971,11 +982,11 @@ $rm conftest.dat if ln -s X conftest.dat 2>/dev/null; then $rm conftest.dat @@ -48,7 +55,42 @@ echo "$ac_t"yes 1>&6 else echo "$ac_t"no 1>&6 -@@ -1742,19 +1746,17 @@ +@@ -1226,8 +1237,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 +@@ -1348,14 +1359,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' ;; +@@ -1732,7 +1735,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' +@@ -1829,19 +1832,21 @@ case "$version_type" in freebsd-elf*) deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object' @@ -68,23 +110,30 @@ - finish_cmds='PATH="\$PATH:/sbin" OBJFORMAT="'"$objformat"'" ldconfig -m $libdir' + 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' ++ 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 - ;; - -@@ -2613,6 +2615,12 @@ + case "$host_os" in + freebsd2* | freebsd3.[01]*) +@@ -2719,6 +2724,15 @@ # Shell to use when invoking shell scripts. SHELL=$LTSHELL + -+# Install PREFIX -+PREFIX=$PREFIX -+ +# 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/libtool13/files/patch-ad b/devel/libtool13/files/patch-ad index 6f5fd6c51975..4834f846a05e 100644 --- a/devel/libtool13/files/patch-ad +++ b/devel/libtool13/files/patch-ad @@ -1,36 +1,28 @@ ---- ltmain.sh.orig Thu Apr 29 15:30:37 1999 -+++ ltmain.sh Sat May 22 13:59:59 1999 +--- ltmain.sh.orig Fri Jul 2 09:02:40 1999 ++++ ltmain.sh Fri Sep 3 02:01:51 1999 @@ -54,7 +54,7 @@ # Constants. PROGRAM=ltmain.sh PACKAGE=libtool --VERSION=1.3 -+VERSION=1.3-freebsd-ports - TIMESTAMP=" (1.385.2.117 1999/04/29 13:07:13)" +-VERSION=1.3.3 ++VERSION=1.3.3-freebsd-ports + TIMESTAMP=" (1.385.2.181 1999/07/02 15:49:11)" default_mode= -@@ -150,6 +150,11 @@ - exit 0 - ;; - -+ --prefix) -+ echo "$PREFIX" -+ exit 0 -+ ;; -+ - --debug) - echo "$progname: enabling shell trace mode" - set -x -@@ -928,7 +933,7 @@ +@@ -946,7 +946,11 @@ continue ;; release) - release="-$arg" -+ release="$arg" ++ if test "$release_suffix" = all; then ++ release="$arg" ++ elif test "$release_suffix" = yes; then ++ release="-$arg" ++ fi prev= continue ;; -@@ -981,6 +986,7 @@ +@@ -999,6 +1003,7 @@ ;; -avoid-version) @@ -38,7 +30,7 @@ avoid_version=yes continue ;; -@@ -1066,6 +1072,10 @@ +@@ -1085,6 +1090,10 @@ deplibs="$deplibs $arg" ;; @@ -49,7 +41,7 @@ -module) module=yes continue -@@ -1763,6 +1773,9 @@ +@@ -1789,6 +1798,9 @@ *-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*) # these systems don't actually have a c library (as such)! ;; @@ -59,34 +51,141 @@ *) # Add libc to deplibs on all other systems. deplibs="$deplibs -lc" -@@ -1785,7 +1798,7 @@ +@@ -1796,6 +1808,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}.*" +@@ -1811,7 +1911,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" -+ oldlibs="$oldlibs $output_objdir/$libname$release.$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` -@@ -1979,7 +1992,7 @@ +@@ -2005,7 +2109,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" -+ oldlibs="$output_objdir/$libname$release.$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 -@@ -2933,7 +2946,7 @@ +@@ -3026,7 +3134,11 @@ case "$output" in *.la) old_library= - test "$build_old_libs" = yes && old_library="$libname.$libext" -+ test "$build_old_libs" = yes && old_library="$libname$release.$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 -@@ -3230,10 +3243,12 @@ +@@ -3315,10 +3427,12 @@ fi # Install the pseudo-library for information purposes. @@ -103,7 +202,7 @@ # Maybe install the static library, too. test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" -@@ -3322,7 +3337,6 @@ +@@ -3407,7 +3521,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 1468b8fed6bd..c92b003b58cd 100644 --- a/devel/libtool13/files/patch-ae +++ b/devel/libtool13/files/patch-ae @@ -1,6 +1,6 @@ ---- configure.orig Fri Feb 19 00:50:06 1999 -+++ configure Fri Feb 19 00:50:21 1999 -@@ -5288,10 +5288,6 @@ +--- 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 diff --git a/devel/libtool13/files/patch-af b/devel/libtool13/files/patch-af new file mode 100644 index 000000000000..a62485d06dc4 --- /dev/null +++ b/devel/libtool13/files/patch-af @@ -0,0 +1,24 @@ +--- libltdl/Makefile.in.orig Fri Jul 2 09:02:06 1999 ++++ libltdl/Makefile.in Thu Sep 9 22:40:10 1999 +@@ -328,17 +328,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 $$/$$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/libtool14/Makefile b/devel/libtool14/Makefile index c39fc49c7f4b..f8eec75acd5c 100644 --- a/devel/libtool14/Makefile +++ b/devel/libtool14/Makefile @@ -1,12 +1,12 @@ # New ports collection makefile for: libtool -# Version required: 1.3 +# Version required: 1.3.3 # Date created: 6 May 1998 # Whom: Motoyuki Kasahara # # $FreeBSD$ # -DISTNAME= libtool-1.3 +DISTNAME= libtool-1.3.3 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= libtool diff --git a/devel/libtool14/distinfo b/devel/libtool14/distinfo index ae15cdfd6930..85d684bde45b 100644 --- a/devel/libtool14/distinfo +++ b/devel/libtool14/distinfo @@ -1 +1 @@ -MD5 (libtool-1.3.tar.gz) = 770f8b97b03e95b7e0cf383297906353 +MD5 (libtool-1.3.3.tar.gz) = 574b5a12423c2aa575efe122c6c5831b diff --git a/devel/libtool14/files/patch-aa b/devel/libtool14/files/patch-aa index 483466c69666..91ff871e5ae3 100644 --- a/devel/libtool14/files/patch-aa +++ b/devel/libtool14/files/patch-aa @@ -1,7 +1,7 @@ ---- doc/libtool.texi.orig Wed Mar 11 02:04:36 1998 -+++ doc/libtool.texi Mon Apr 27 16:57:24 1998 -@@ -10,7 +10,7 @@ - @set BUGADDR the libtool mailing list @email{bug-libtool@@gnu.org} +--- 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 diff --git a/devel/libtool14/files/patch-ab b/devel/libtool14/files/patch-ab index dd642b335b69..f96b92eac308 100644 --- a/devel/libtool14/files/patch-ab +++ b/devel/libtool14/files/patch-ab @@ -1,5 +1,5 @@ ---- doc/Makefile.in.orig Fri Mar 20 17:01:52 1998 -+++ doc/Makefile.in Mon Apr 27 17:22:55 1998 +--- 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@ @@ -7,5 +7,5 @@ -MAKEINFO = @MAKEINFO@ +MAKEINFO = @MAKEINFO@ --no-split NM = @NM@ + OBJDUMP = @OBJDUMP@ PACKAGE = @PACKAGE@ - RANLIB = @RANLIB@ diff --git a/devel/libtool14/files/patch-ac b/devel/libtool14/files/patch-ac index 149d89578115..32158c98ca68 100644 --- a/devel/libtool14/files/patch-ac +++ b/devel/libtool14/files/patch-ac @@ -1,40 +1,47 @@ ---- ltconfig.orig Thu Apr 29 15:30:36 1999 -+++ ltconfig Sat May 22 15:52:24 1999 +--- ltconfig.orig Fri Jul 2 09:02:37 1999 ++++ ltconfig Sat Sep 4 11:34:21 1999 @@ -169,7 +169,7 @@ # Constants: PROGRAM=ltconfig PACKAGE=libtool --VERSION=1.3 -+VERSION=1.3-freebsd-ports - TIMESTAMP=" (1.385.2.117 1999/04/29 13:07:13)" +-VERSION=1.3.3 ++VERSION=1.3.3-freebsd-ports + TIMESTAMP=" (1.385.2.181 1999/07/02 15:49:11)" ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.c 1>&5' ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.c $LIBS 1>&5' -@@ -184,6 +184,7 @@ - # All known linkers require a `.a' archive for static linking. +@@ -185,6 +185,8 @@ + # which needs '.lib'). enable_static=yes enable_fast_install=yes -+install_ltlibs=no ++install_ltlibs=yes ++release_suffix=yes enable_dlopen=unknown enable_win32_dll=no ltmain= -@@ -244,6 +245,7 @@ +@@ -246,6 +248,9 @@ --disable-shared do not build shared libraries --disable-static do not build static libraries --disable-fast-install do not optimize for fast installation -+ --install-ltlibs install the .la archives ++ --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 -@@ -277,6 +279,8 @@ +@@ -279,6 +284,12 @@ --disable-fast-install) enable_fast_install=no ;; -+ --install-ltlibs) install_ltlibs=yes ;; ++ --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 ;; -@@ -927,11 +931,11 @@ +@@ -971,11 +982,11 @@ $rm conftest.dat if ln -s X conftest.dat 2>/dev/null; then $rm conftest.dat @@ -48,7 +55,42 @@ echo "$ac_t"yes 1>&6 else echo "$ac_t"no 1>&6 -@@ -1742,19 +1746,17 @@ +@@ -1226,8 +1237,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 +@@ -1348,14 +1359,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' ;; +@@ -1732,7 +1735,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' +@@ -1829,19 +1832,21 @@ case "$version_type" in freebsd-elf*) deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object' @@ -68,23 +110,30 @@ - finish_cmds='PATH="\$PATH:/sbin" OBJFORMAT="'"$objformat"'" ldconfig -m $libdir' + 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' ++ 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 - ;; - -@@ -2613,6 +2615,12 @@ + case "$host_os" in + freebsd2* | freebsd3.[01]*) +@@ -2719,6 +2724,15 @@ # Shell to use when invoking shell scripts. SHELL=$LTSHELL + -+# Install PREFIX -+PREFIX=$PREFIX -+ +# 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 6f5fd6c51975..4834f846a05e 100644 --- a/devel/libtool14/files/patch-ad +++ b/devel/libtool14/files/patch-ad @@ -1,36 +1,28 @@ ---- ltmain.sh.orig Thu Apr 29 15:30:37 1999 -+++ ltmain.sh Sat May 22 13:59:59 1999 +--- ltmain.sh.orig Fri Jul 2 09:02:40 1999 ++++ ltmain.sh Fri Sep 3 02:01:51 1999 @@ -54,7 +54,7 @@ # Constants. PROGRAM=ltmain.sh PACKAGE=libtool --VERSION=1.3 -+VERSION=1.3-freebsd-ports - TIMESTAMP=" (1.385.2.117 1999/04/29 13:07:13)" +-VERSION=1.3.3 ++VERSION=1.3.3-freebsd-ports + TIMESTAMP=" (1.385.2.181 1999/07/02 15:49:11)" default_mode= -@@ -150,6 +150,11 @@ - exit 0 - ;; - -+ --prefix) -+ echo "$PREFIX" -+ exit 0 -+ ;; -+ - --debug) - echo "$progname: enabling shell trace mode" - set -x -@@ -928,7 +933,7 @@ +@@ -946,7 +946,11 @@ continue ;; release) - release="-$arg" -+ release="$arg" ++ if test "$release_suffix" = all; then ++ release="$arg" ++ elif test "$release_suffix" = yes; then ++ release="-$arg" ++ fi prev= continue ;; -@@ -981,6 +986,7 @@ +@@ -999,6 +1003,7 @@ ;; -avoid-version) @@ -38,7 +30,7 @@ avoid_version=yes continue ;; -@@ -1066,6 +1072,10 @@ +@@ -1085,6 +1090,10 @@ deplibs="$deplibs $arg" ;; @@ -49,7 +41,7 @@ -module) module=yes continue -@@ -1763,6 +1773,9 @@ +@@ -1789,6 +1798,9 @@ *-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*) # these systems don't actually have a c library (as such)! ;; @@ -59,34 +51,141 @@ *) # Add libc to deplibs on all other systems. deplibs="$deplibs -lc" -@@ -1785,7 +1798,7 @@ +@@ -1796,6 +1808,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}.*" +@@ -1811,7 +1911,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" -+ oldlibs="$oldlibs $output_objdir/$libname$release.$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` -@@ -1979,7 +1992,7 @@ +@@ -2005,7 +2109,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" -+ oldlibs="$output_objdir/$libname$release.$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 -@@ -2933,7 +2946,7 @@ +@@ -3026,7 +3134,11 @@ case "$output" in *.la) old_library= - test "$build_old_libs" = yes && old_library="$libname.$libext" -+ test "$build_old_libs" = yes && old_library="$libname$release.$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 -@@ -3230,10 +3243,12 @@ +@@ -3315,10 +3427,12 @@ fi # Install the pseudo-library for information purposes. @@ -103,7 +202,7 @@ # Maybe install the static library, too. test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" -@@ -3322,7 +3337,6 @@ +@@ -3407,7 +3521,6 @@ fi libfile="$libdir/`$echo "X$lib" | $Xsed -e 's%^.*/%%g'`" if test -n "$libdir" && test ! -f "$libfile"; then diff --git a/devel/libtool14/files/patch-ae b/devel/libtool14/files/patch-ae index 1468b8fed6bd..c92b003b58cd 100644 --- a/devel/libtool14/files/patch-ae +++ b/devel/libtool14/files/patch-ae @@ -1,6 +1,6 @@ ---- configure.orig Fri Feb 19 00:50:06 1999 -+++ configure Fri Feb 19 00:50:21 1999 -@@ -5288,10 +5288,6 @@ +--- 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 diff --git a/devel/libtool14/files/patch-af b/devel/libtool14/files/patch-af new file mode 100644 index 000000000000..a62485d06dc4 --- /dev/null +++ b/devel/libtool14/files/patch-af @@ -0,0 +1,24 @@ +--- libltdl/Makefile.in.orig Fri Jul 2 09:02:06 1999 ++++ libltdl/Makefile.in Thu Sep 9 22:40:10 1999 +@@ -328,17 +328,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 $$/$$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/libtool15/Makefile b/devel/libtool15/Makefile index c39fc49c7f4b..f8eec75acd5c 100644 --- a/devel/libtool15/Makefile +++ b/devel/libtool15/Makefile @@ -1,12 +1,12 @@ # New ports collection makefile for: libtool -# Version required: 1.3 +# Version required: 1.3.3 # Date created: 6 May 1998 # Whom: Motoyuki Kasahara # # $FreeBSD$ # -DISTNAME= libtool-1.3 +DISTNAME= libtool-1.3.3 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= libtool diff --git a/devel/libtool15/distinfo b/devel/libtool15/distinfo index ae15cdfd6930..85d684bde45b 100644 --- a/devel/libtool15/distinfo +++ b/devel/libtool15/distinfo @@ -1 +1 @@ -MD5 (libtool-1.3.tar.gz) = 770f8b97b03e95b7e0cf383297906353 +MD5 (libtool-1.3.3.tar.gz) = 574b5a12423c2aa575efe122c6c5831b diff --git a/devel/libtool15/files/patch-aa b/devel/libtool15/files/patch-aa index 483466c69666..91ff871e5ae3 100644 --- a/devel/libtool15/files/patch-aa +++ b/devel/libtool15/files/patch-aa @@ -1,7 +1,7 @@ ---- doc/libtool.texi.orig Wed Mar 11 02:04:36 1998 -+++ doc/libtool.texi Mon Apr 27 16:57:24 1998 -@@ -10,7 +10,7 @@ - @set BUGADDR the libtool mailing list @email{bug-libtool@@gnu.org} +--- 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 diff --git a/devel/libtool15/files/patch-ab b/devel/libtool15/files/patch-ab index dd642b335b69..f96b92eac308 100644 --- a/devel/libtool15/files/patch-ab +++ b/devel/libtool15/files/patch-ab @@ -1,5 +1,5 @@ ---- doc/Makefile.in.orig Fri Mar 20 17:01:52 1998 -+++ doc/Makefile.in Mon Apr 27 17:22:55 1998 +--- 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@ @@ -7,5 +7,5 @@ -MAKEINFO = @MAKEINFO@ +MAKEINFO = @MAKEINFO@ --no-split NM = @NM@ + OBJDUMP = @OBJDUMP@ PACKAGE = @PACKAGE@ - RANLIB = @RANLIB@ diff --git a/devel/libtool15/files/patch-ac b/devel/libtool15/files/patch-ac index 149d89578115..32158c98ca68 100644 --- a/devel/libtool15/files/patch-ac +++ b/devel/libtool15/files/patch-ac @@ -1,40 +1,47 @@ ---- ltconfig.orig Thu Apr 29 15:30:36 1999 -+++ ltconfig Sat May 22 15:52:24 1999 +--- ltconfig.orig Fri Jul 2 09:02:37 1999 ++++ ltconfig Sat Sep 4 11:34:21 1999 @@ -169,7 +169,7 @@ # Constants: PROGRAM=ltconfig PACKAGE=libtool --VERSION=1.3 -+VERSION=1.3-freebsd-ports - TIMESTAMP=" (1.385.2.117 1999/04/29 13:07:13)" +-VERSION=1.3.3 ++VERSION=1.3.3-freebsd-ports + TIMESTAMP=" (1.385.2.181 1999/07/02 15:49:11)" ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.c 1>&5' ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.c $LIBS 1>&5' -@@ -184,6 +184,7 @@ - # All known linkers require a `.a' archive for static linking. +@@ -185,6 +185,8 @@ + # which needs '.lib'). enable_static=yes enable_fast_install=yes -+install_ltlibs=no ++install_ltlibs=yes ++release_suffix=yes enable_dlopen=unknown enable_win32_dll=no ltmain= -@@ -244,6 +245,7 @@ +@@ -246,6 +248,9 @@ --disable-shared do not build shared libraries --disable-static do not build static libraries --disable-fast-install do not optimize for fast installation -+ --install-ltlibs install the .la archives ++ --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 -@@ -277,6 +279,8 @@ +@@ -279,6 +284,12 @@ --disable-fast-install) enable_fast_install=no ;; -+ --install-ltlibs) install_ltlibs=yes ;; ++ --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 ;; -@@ -927,11 +931,11 @@ +@@ -971,11 +982,11 @@ $rm conftest.dat if ln -s X conftest.dat 2>/dev/null; then $rm conftest.dat @@ -48,7 +55,42 @@ echo "$ac_t"yes 1>&6 else echo "$ac_t"no 1>&6 -@@ -1742,19 +1746,17 @@ +@@ -1226,8 +1237,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 +@@ -1348,14 +1359,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' ;; +@@ -1732,7 +1735,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' +@@ -1829,19 +1832,21 @@ case "$version_type" in freebsd-elf*) deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object' @@ -68,23 +110,30 @@ - finish_cmds='PATH="\$PATH:/sbin" OBJFORMAT="'"$objformat"'" ldconfig -m $libdir' + 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' ++ 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 - ;; - -@@ -2613,6 +2615,12 @@ + case "$host_os" in + freebsd2* | freebsd3.[01]*) +@@ -2719,6 +2724,15 @@ # Shell to use when invoking shell scripts. SHELL=$LTSHELL + -+# Install PREFIX -+PREFIX=$PREFIX -+ +# 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 6f5fd6c51975..4834f846a05e 100644 --- a/devel/libtool15/files/patch-ad +++ b/devel/libtool15/files/patch-ad @@ -1,36 +1,28 @@ ---- ltmain.sh.orig Thu Apr 29 15:30:37 1999 -+++ ltmain.sh Sat May 22 13:59:59 1999 +--- ltmain.sh.orig Fri Jul 2 09:02:40 1999 ++++ ltmain.sh Fri Sep 3 02:01:51 1999 @@ -54,7 +54,7 @@ # Constants. PROGRAM=ltmain.sh PACKAGE=libtool --VERSION=1.3 -+VERSION=1.3-freebsd-ports - TIMESTAMP=" (1.385.2.117 1999/04/29 13:07:13)" +-VERSION=1.3.3 ++VERSION=1.3.3-freebsd-ports + TIMESTAMP=" (1.385.2.181 1999/07/02 15:49:11)" default_mode= -@@ -150,6 +150,11 @@ - exit 0 - ;; - -+ --prefix) -+ echo "$PREFIX" -+ exit 0 -+ ;; -+ - --debug) - echo "$progname: enabling shell trace mode" - set -x -@@ -928,7 +933,7 @@ +@@ -946,7 +946,11 @@ continue ;; release) - release="-$arg" -+ release="$arg" ++ if test "$release_suffix" = all; then ++ release="$arg" ++ elif test "$release_suffix" = yes; then ++ release="-$arg" ++ fi prev= continue ;; -@@ -981,6 +986,7 @@ +@@ -999,6 +1003,7 @@ ;; -avoid-version) @@ -38,7 +30,7 @@ avoid_version=yes continue ;; -@@ -1066,6 +1072,10 @@ +@@ -1085,6 +1090,10 @@ deplibs="$deplibs $arg" ;; @@ -49,7 +41,7 @@ -module) module=yes continue -@@ -1763,6 +1773,9 @@ +@@ -1789,6 +1798,9 @@ *-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*) # these systems don't actually have a c library (as such)! ;; @@ -59,34 +51,141 @@ *) # Add libc to deplibs on all other systems. deplibs="$deplibs -lc" -@@ -1785,7 +1798,7 @@ +@@ -1796,6 +1808,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}.*" +@@ -1811,7 +1911,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" -+ oldlibs="$oldlibs $output_objdir/$libname$release.$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` -@@ -1979,7 +1992,7 @@ +@@ -2005,7 +2109,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" -+ oldlibs="$output_objdir/$libname$release.$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 -@@ -2933,7 +2946,7 @@ +@@ -3026,7 +3134,11 @@ case "$output" in *.la) old_library= - test "$build_old_libs" = yes && old_library="$libname.$libext" -+ test "$build_old_libs" = yes && old_library="$libname$release.$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 -@@ -3230,10 +3243,12 @@ +@@ -3315,10 +3427,12 @@ fi # Install the pseudo-library for information purposes. @@ -103,7 +202,7 @@ # Maybe install the static library, too. test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" -@@ -3322,7 +3337,6 @@ +@@ -3407,7 +3521,6 @@ fi libfile="$libdir/`$echo "X$lib" | $Xsed -e 's%^.*/%%g'`" if test -n "$libdir" && test ! -f "$libfile"; then diff --git a/devel/libtool15/files/patch-ae b/devel/libtool15/files/patch-ae index 1468b8fed6bd..c92b003b58cd 100644 --- a/devel/libtool15/files/patch-ae +++ b/devel/libtool15/files/patch-ae @@ -1,6 +1,6 @@ ---- configure.orig Fri Feb 19 00:50:06 1999 -+++ configure Fri Feb 19 00:50:21 1999 -@@ -5288,10 +5288,6 @@ +--- 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 diff --git a/devel/libtool15/files/patch-af b/devel/libtool15/files/patch-af new file mode 100644 index 000000000000..a62485d06dc4 --- /dev/null +++ b/devel/libtool15/files/patch-af @@ -0,0 +1,24 @@ +--- libltdl/Makefile.in.orig Fri Jul 2 09:02:06 1999 ++++ libltdl/Makefile.in Thu Sep 9 22:40:10 1999 +@@ -328,17 +328,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 $$/$$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: -- cgit v1.2.3