8 files changed, 61 insertions, 61 deletions

diff --git a/devel/libtool/Makefile b/devel/libtool/Makefile
index ba6ad0aa8d69..6dc68697c98e 100644
--- a/devel/libtool/Makefile
+++ b/devel/libtool/Makefile
@@ -1,26 +1,24 @@
 # New ports collection makefile for:	libtool
-# Version required:	1.2
+# Version required:	1.3
 # Date created:		6 May 1998
 # Whom:			Motoyuki Kasahara <m-kasahr@sra.co.jp>
 #
-# $Id: Makefile,v 1.2 1998/09/23 16:15:53 vanilla Exp $
+# $Id: Makefile,v 1.3 1999/01/27 07:41:08 fenner Exp $
 #
 
-DISTNAME=	libtool-1.2
+DISTNAME=	libtool-1.3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	libtool
 
-MAINTAINER=	m-kasahr@sra.co.jp
+MAINTAINER=	reg@shale.csir.co.za
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
-		INSTALL_DATA="${INSTALL_DATA}"
+CONFIGURE_ARGS=	--disable-ltdl-install
 
-post-install:
-	@if [ ! -f ${PREFIX}/info/dir ]; then \
+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
-	@install-info ${PREFIX}/info/libtool.info ${PREFIX}/info/dir
 
 .include <bsd.port.mk>
diff --git a/devel/libtool/distinfo b/devel/libtool/distinfo
index 9eed3ca272e3..ae15cdfd6930 100644
--- a/devel/libtool/distinfo
+++ b/devel/libtool/distinfo
@@ -1 +1 @@
-MD5 (libtool-1.2.tar.gz) = 66b016fdf220682affbfdcaa2225a9bd
+MD5 (libtool-1.3.tar.gz) = 770f8b97b03e95b7e0cf383297906353
diff --git a/devel/libtool/files/patch-aa b/devel/libtool/files/patch-aa
index 8a3acab1cee7..483466c69666 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>}
+ @set BUGADDR the libtool mailing list @email{bug-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 ef0aedff5c3d..dd642b335b69 100644
--- a/devel/libtool/files/patch-ab
+++ b/devel/libtool/files/patch-ab
@@ -1,8 +1,8 @@
 --- doc/Makefile.in.orig	Fri Mar 20 17:01:52 1998
 +++ doc/Makefile.in	Mon Apr 27 17:22:55 1998
-@@ -56,7 +56,7 @@
- LD = @LD@
+@@ -70,7 +70,7 @@
  LIBTOOL = @LIBTOOL@
+ LIBTOOL_FLAGS = @LIBTOOL_FLAGS@
  LN_S = @LN_S@
 -MAKEINFO = @MAKEINFO@
 +MAKEINFO = @MAKEINFO@ --no-split
diff --git a/devel/libtool/files/patch-ac b/devel/libtool/files/patch-ac
index fc686d6e785d..43bdc69d080d 100644
--- a/devel/libtool/files/patch-ac
+++ b/devel/libtool/files/patch-ac
@@ -1,26 +1,22 @@
---- ltconfig.orig	Fri Mar 20 16:00:29 1998
-+++ ltconfig	Tue Feb  2 05:31:37 1999
-@@ -777,7 +777,7 @@
-     ;;
- 
-   # FreeBSD 3, at last, uses gcc -shared to do shared libraries.
--  freebsd3*)
-+  freebsd*)
-     archive_cmds='$CC -shared -o $lib$libobjs'
-     hardcode_libdir_flag_spec='-R$libdir'
-     hardcode_direct=yes
-@@ -1123,10 +1123,11 @@
-   finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
-   ;;
- 
--freebsd2* | freebsd3*)
--  version_type=sunos
-+freebsd*)
-+  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+  version_type=freebsd-$objformat
-   library_names_spec='${libname}${release}.so.$versuffix $libname.so'
--  finish_cmds='PATH="$PATH:/sbin" ldconfig -m $libdir'
-+  finish_cmds="PATH=\"\$PATH:/sbin\" OBJFORMAT=$objformat ldconfig -m \$libdir"
-   shlibpath_var=LD_LIBRARY_PATH
-   ;;
- 
+--- ltconfig.orig	Mon Mar 15 19:38:58 1999
++++ ltconfig	Mon Apr  5 01:40:53 1999
+@@ -1672,14 +1672,16 @@
+     freebsd-elf*)
+       deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
+       file_magic_cmd=/usr/bin/file
+-      file_magic_test_file=`echo /usr/lib/libc.so*`
++      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
+       ;;
+     freebsd-*)
+-      deplibs_check_method=unknown
+-      library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix'
++      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
diff --git a/devel/libtool/files/patch-ad b/devel/libtool/files/patch-ad
index 34b60ec9a08a..e69de29bb2d1 100644
--- a/devel/libtool/files/patch-ad
+++ b/devel/libtool/files/patch-ad
@@ -1,21 +0,0 @@
---- ltmain.sh.orig	Fri Mar 20 17:00:29 1998
-+++ ltmain.sh	Sat Dec 12 09:13:28 1998
-@@ -967,6 +967,18 @@
-         versuffix="$current.$revision"
-         ;;
- 
-+      freebsd-aout)
-+        version_vars="$version_vars major versuffix"
-+        major="$current"
-+        versuffix="$current.$revision";
-+        ;;
-+
-+      freebsd-elf)
-+        version_vars="$version_vars major versuffix"
-+        major="$current"
-+        versuffix="$current";
-+        ;;
-+
-       *)
-         $echo "$modename: unknown library version type \`$version_type'" 1>&2
-         echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
diff --git a/devel/libtool/files/patch-ae b/devel/libtool/files/patch-ae
new file mode 100644
index 000000000000..1468b8fed6bd
--- /dev/null
+++ b/devel/libtool/files/patch-ae
@@ -0,0 +1,13 @@
+--- configure.orig	Fri Feb 19 00:50:06 1999
++++ configure	Fri Feb 19 00:50:21 1999
+@@ -5288,10 +5288,6 @@
+       *) # Relative path.
+         ac_sub_cache_file="$ac_dots$cache_file" ;;
+       esac
+-  case "$ac_given_INSTALL" in
+-        [/$]*) INSTALL="$ac_given_INSTALL" ;;
+-        *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
+-        esac
+ 
+       echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir"
+       # The eval makes quoting arguments work.
diff --git a/devel/libtool/pkg-plist b/devel/libtool/pkg-plist
index 647349a4280d..82d8b30bf09a 100644
--- a/devel/libtool/pkg-plist
+++ b/devel/libtool/pkg-plist
@@ -2,12 +2,26 @@ bin/libtool
 bin/libtoolize
 @unexec install-info --delete %D/info/libtool.info %D/info/dir
 info/libtool.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
+@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
 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
 @unexec rmdir %D/share/aclocal 2>/dev/null || true