Changes from maintainer:

    1. Add a -prefix arguement to libtool, to find where the installed
       copies of ltconfig and ltmain.sh reside.
    2. Don't install the .la files unless --install-ltlibs is passed to
       ltconfig.
    3. Don't force linking with -lc, and allow -?thread to be passed to
       the linker.
    4. Don't build static libs if not using version numbers (for
       plugins).
    5. Install                      instead of
         lib${release}.a              lib.a
         lib${release}.so             lib.so
         lib${release}.so.${ver}      lib${release}.so.${ver}
       to support multi-release installations.
    6. Change version to "1.3-freebsd-ports" so people know who to
       blame.
    7. Misc fixes.

PR:		11839
Submitted by:	maintainer

4 files changed, 195 insertions, 19 deletions

diff --git a/devel/gnu-libtool/Makefile b/devel/gnu-libtool/Makefile
index 6dc68697c98e..858490520dc5 100644
--- a/devel/gnu-libtool/Makefile
+++ b/devel/gnu-libtool/Makefile
@@ -3,7 +3,7 @@
 # Date created:		6 May 1998
 # Whom:			Motoyuki Kasahara <m-kasahr@sra.co.jp>
 #
-# $Id: Makefile,v 1.3 1999/01/27 07:41:08 fenner Exp $
+# $Id: Makefile,v 1.4 1999/05/04 22:35:26 steve Exp $
 #
 
 DISTNAME=	libtool-1.3
@@ -15,10 +15,6 @@ MAINTAINER=	reg@shale.csir.co.za
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-ltdl-install
-
-pre-install:
-	@if [ -d ${PREFIX}/info -a ! -f ${PREFIX}/info/dir -a -f /usr/share/info/dir ]; then \
-	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	 fi
+CONFIGURE_ENV=	PREFIX=${PREFIX}
 
 .include <bsd.port.mk>
diff --git a/devel/gnu-libtool/files/patch-ac b/devel/gnu-libtool/files/patch-ac
index 43bdc69d080d..149d89578115 100644
--- a/devel/gnu-libtool/files/patch-ac
+++ b/devel/gnu-libtool/files/patch-ac
@@ -1,22 +1,90 @@
---- ltconfig.orig	Mon Mar 15 19:38:58 1999
-+++ ltconfig	Mon Apr  5 01:40:53 1999
-@@ -1672,14 +1672,16 @@
+--- ltconfig.orig	Thu Apr 29 15:30:36 1999
++++ ltconfig	Sat May 22 15:52:24 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)"
+ 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.
+ enable_static=yes
+ enable_fast_install=yes
++install_ltlibs=no
+ enable_dlopen=unknown
+ enable_win32_dll=no
+ ltmain=
+@@ -244,6 +245,7 @@
+     --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
+     --enable-dlopen        enable dlopen support
+     --enable-win32-dll     enable building dlls on win32 hosts
+     --help                 display this help and exit
+@@ -277,6 +279,8 @@
+ 
+   --disable-fast-install) enable_fast_install=no ;;
+ 
++  --install-ltlibs) install_ltlibs=yes ;;
++
+   --enable-dlopen) enable_dlopen=yes ;;
+ 
+   --enable-win32-dll) enable_win32_dll=yes ;;
+@@ -927,11 +931,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
+@@ -1742,19 +1746,17 @@
+   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_cmd=/usr/bin/file
 -      file_magic_test_file=`echo /usr/lib/libc.so*`
-+      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
+-      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
+-      need_version=no
+-      need_lib_prefix=no
        ;;
      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'
-+      file_magic_cmd=/usr/bin/file
-+      file_magic_test_file=`echo /usr/lib/libc.so.*`
-+      library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix $libname.so'
-       need_version=yes
        ;;
    esac
+-  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'
++  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 @@
+ 
+ # Shell to use when invoking shell scripts.
+ SHELL=$LTSHELL
++
++# Install PREFIX
++PREFIX=$PREFIX
++
++# Whether to waste disk space.
++install_ltlibs=$install_ltlibs 
+ 
+ # 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
new file mode 100644
index 000000000000..6f5fd6c51975
--- /dev/null
+++ b/devel/gnu-libtool/files/patch-ad
@@ -0,0 +1,113 @@
+--- ltmain.sh.orig	Thu Apr 29 15:30:37 1999
++++ ltmain.sh	Sat May 22 13:59:59 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)"
+ 
+ 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 @@
+ 	  continue
+ 	  ;;
+ 	release)
+-	  release="-$arg"
++	  release="$arg"
+ 	  prev=
+ 	  continue
+ 	  ;;
+@@ -981,6 +986,7 @@
+ 	;;
+ 
+       -avoid-version)
++	build_old_libs=no
+ 	avoid_version=yes
+ 	continue
+ 	;;
+@@ -1066,6 +1072,10 @@
+ 	deplibs="$deplibs $arg"
+ 	;;
+ 
++      -?thread)
++	deplibs="$deplibs $arg"
++	;;
++
+       -module)
+ 	module=yes
+ 	continue
+@@ -1763,6 +1773,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"
+@@ -1785,7 +1798,7 @@
+ 
+       # 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"
+ 
+ 	# Transform .lo files to .o files.
+ 	oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
+@@ -1979,7 +1992,7 @@
+ 	      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"
+ 	      build_libtool_libs=module
+ 	      build_old_libs=yes
+ 	    else
+@@ -2933,7 +2946,7 @@
+     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"
+       $show "creating $output"
+ 
+       if test -n "$xrpath"; then
+@@ -3230,10 +3243,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"
+@@ -3322,7 +3337,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/pkg-plist b/devel/gnu-libtool/pkg-plist
index 82d8b30bf09a..a2bd473cdef0 100644
--- a/devel/gnu-libtool/pkg-plist
+++ b/devel/gnu-libtool/pkg-plist
@@ -2,7 +2,6 @@ bin/libtool
 bin/libtoolize
 @unexec install-info --delete %D/info/libtool.info %D/info/dir
 info/libtool.info
-@exec [ -f %D/info/dir -o ! -f /usr/share/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/libtool.info %D/info/dir
 share/aclocal/libtool.m4
 share/libtool/config.guess