Fix aout brokenness. Bump libtool to 1.3.5nb3.

5 files changed, 34 insertions, 17 deletions

diff --git a/devel/libtool/Makefile b/devel/libtool/Makefile
index 4b00d98ee88..b4f15d1b4ad 100644
--- a/devel/libtool/Makefile
+++ b/devel/libtool/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2000/06/04 16:46:46 rh Exp $
+# $NetBSD: Makefile,v 1.18 2000/06/04 17:56:16 rh Exp $
 #
 
 DISTNAME=	libtool-1.3.5
-PKGNAME=	libtool-1.3.5nb2
+PKGNAME=	libtool-1.3.5nb3
 CATEGORIES=	devel pkgtools
 MASTER_SITES=	${MASTER_SITE_GNU:=libtool/}
 
diff --git a/devel/libtool/files/patch-sum b/devel/libtool/files/patch-sum
index a4906ebc9a4..089a6604f77 100644
--- a/devel/libtool/files/patch-sum
+++ b/devel/libtool/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.6 2000/06/04 16:46:47 rh Exp $
+$NetBSD: patch-sum,v 1.7 2000/06/04 17:56:17 rh Exp $
 
-MD5 (patch-aa) = 3360a0a89685cd87223e951550b11b66
-MD5 (patch-ab) = 56cd37b198da2cbeecc473a6e4922c3a
+MD5 (patch-aa) = 9872a6807c4d4ffc5383b81882d7779b
+MD5 (patch-ab) = d7098941b9d7b79822bb02cfef632b4b
diff --git a/devel/libtool/patches/patch-aa b/devel/libtool/patches/patch-aa
index e63b28dad85..d8a120c319d 100644
--- a/devel/libtool/patches/patch-aa
+++ b/devel/libtool/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.9 2000/05/31 17:25:56 rh Exp $
+$NetBSD: patch-aa,v 1.10 2000/06/04 17:56:17 rh Exp $
 
---- ltconfig.in.orig	Wed May 31 19:08:31 2000
-+++ ltconfig.in	Wed May 31 19:13:22 2000
+--- ltconfig.in.orig	Sat May 27 03:58:57 2000
++++ ltconfig.in	Sun Jun  4 19:35:00 2000
 @@ -1194,11 +1194,11 @@
  
    netbsd*)
@@ -12,8 +12,8 @@ $NetBSD: patch-aa,v 1.9 2000/05/31 17:25:56 rh Exp $
        archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
        # can we support soname and/or expsyms with a.out? -oliva
 +    else
-+      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 $libobjs $deplibs $wllinkopts ${wl}-soname $wl$soname -o $lib'
++      archive_expsym_cmds='$CC -shared $libobjs $deplibs $wllinkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
      fi
      ;;
  
diff --git a/devel/libtool/patches/patch-ab b/devel/libtool/patches/patch-ab
index 5e9bf178241..41494f63de0 100644
--- a/devel/libtool/patches/patch-ab
+++ b/devel/libtool/patches/patch-ab
@@ -1,8 +1,16 @@
-$NetBSD: patch-ab,v 1.9 2000/06/04 16:46:47 rh Exp $
+$NetBSD: patch-ab,v 1.10 2000/06/04 17:56:17 rh Exp $
 
 --- ltmain.in.orig	Sat May 27 03:53:15 2000
-+++ ltmain.in	Thu Jun  1 11:21:17 2000
-@@ -1154,6 +1154,24 @@
++++ ltmain.in	Sun Jun  4 19:33:08 2000
+@@ -819,6 +819,7 @@
+     old_convenience=
+     deplibs=
+     linkopts=
++    wllinkopts=
+ 
+     if test -n "$shlibpath_var"; then
+       # get the directories listed in $shlibpath_var
+@@ -1154,6 +1155,25 @@
  	continue
  	;;
  
@@ -18,7 +26,8 @@ $NetBSD: patch-ab,v 1.9 2000/06/04 16:46:47 rh Exp $
 +           ;;
 +         esac
 +         arg="$arg $wl$flag"
-+         linkopts="$linkopts $wl$flag"
++         linkopts="$linkopts $flag"
++         wllinkopts="$wllinkopts $wl$flag"
 +       done
 +       IFS="$save_ifs"
 +       arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
@@ -27,3 +36,11 @@ $NetBSD: patch-ab,v 1.9 2000/06/04 16:46:47 rh Exp $
        # Some other compiler flag.
        -* | +*)
  	# Unknown arguments in both finalize_command and compile_command need
+@@ -2146,6 +2166,7 @@
+ 	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
+ 	  eval flag=\"$thread_safe_flag_spec\"
+ 	  linkopts="$linkopts $flag"
++          wllinkopts="$wllinkopts $wl$flag"
+ 	fi
+ 
+ 	# Do each of the archive commands.
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 677f3159e86..e4c4a6cb930 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.475 2000/06/04 16:47:37 rh Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.476 2000/06/04 17:56:15 rh Exp $
 #
 # This file is in the public domain.
 #
@@ -153,9 +153,9 @@ DEPENDS+=		gtexinfo-3.12:../../devel/gtexinfo
 .if defined(USE_LIBTOOL)
 LIBTOOL=		${LOCALBASE}/bin/libtool
 # XXX: actually, here we would need something like
-# BUILD_DEPENDS+=libtool>1.3.5nb1:../../devel/libtool
+# BUILD_DEPENDS+=libtool>1.3.5nb2:../../devel/libtool
 .if make(misc-depends)
-DEPENDS+=		libtool>1.3.5nb1:../../devel/libtool
+DEPENDS+=		libtool>1.3.5nb2:../../devel/libtool
 .endif
 .elif defined(USE_PKGLIBTOOL)
 .if ${OPSYS} == "NetBSD" || ${OPSYS} == "SunOS"