Update Darwin patches to match libtool 1.4.3

4 files changed, 9 insertions, 11 deletions

diff --git a/devel/libtool/Makefile.common b/devel/libtool/Makefile.common
index 3e40f8a1056..9476001edd7 100644
--- a/devel/libtool/Makefile.common
+++ b/devel/libtool/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.32 2003/07/17 21:31:45 grant Exp $
+# $NetBSD: Makefile.common,v 1.33 2003/09/25 02:09:03 danw Exp $
 #
 
 DISTNAME=	libtool-ml-20010614
 PKGPFX=		${DISTNAME:C/ml-/1.4./}
-PKGREVISION=	14
+PKGREVISION=	15
 WRKSRC=		${WRKDIR}/libtool-ml
 CATEGORIES=	devel pkgtools
 MASTER_SITES=	${MASTER_SITE_LOCAL}
diff --git a/devel/libtool/distinfo b/devel/libtool/distinfo
index 872edd83e23..ee4e38e3d46 100644
--- a/devel/libtool/distinfo
+++ b/devel/libtool/distinfo
@@ -1,18 +1,16 @@
-$NetBSD: distinfo,v 1.25 2003/03/27 18:56:57 jschauma Exp $
+$NetBSD: distinfo,v 1.26 2003/09/25 02:09:03 danw Exp $
 
-SHA1 (libtool-ml-20010614.tar.gz) = ff746666737e420592c3017d65bf4c47f1430dac
-Size (libtool-ml-20010614.tar.gz) = 784246 bytes
 SHA1 (patch-aa) = a3b37684e39b34077c3026a72787218942648bdf
 SHA1 (patch-ab) = 82350e1a9b03ecb8a26ebd02692f5cb3bb289fae
 SHA1 (patch-ac) = 61196acaa12edee0b1209b2ba7c6414453bfa438
 SHA1 (patch-ad) = 6aab76688d0f55648e35adc45a3492ba9c87acfb
 SHA1 (patch-ae) = 03de2a4fc9d828d62c6e6126ecf2dbbfeb1d82ea
 SHA1 (patch-af) = 2a0630e92b355ee86800c4f3a7993fbb126a0999
-SHA1 (patch-ag) = 17fd063e27035841a63c94334d535cb7063149c6
+SHA1 (patch-ag) = df18e0d735df9b102d70b054e0cbaa1fd209bfff
 SHA1 (patch-ah) = 7f0a0153f5e23aab4a3fcd6ae395b5b56d2b52a1
 SHA1 (patch-ai) = bf5296409ccba34bccbc5ed289eeaa8350d7176e
 SHA1 (patch-aj) = 5382fc0a6a58687da5523c596118a4eeb948f675
 SHA1 (patch-ak) = 7e7c6a515361863b683bbc8be24c8146501ca864
 SHA1 (patch-al) = 22f1b7289d9ba477255e66364ae23af24a298dd0
-SHA1 (patch-am) = 0057a15d9bdb5a70d4964df49aa3e905ff7d9cf5
+SHA1 (patch-am) = 2c99398e34686ea5bcecaae254b1b240b53e46df
 SHA1 (patch-ao) = 4e115e9d6ddde556205dc786cde471bfee5a5e9e
diff --git a/devel/libtool/patches/patch-ag b/devel/libtool/patches/patch-ag
index c18d9213da0..9666e40599f 100644
--- a/devel/libtool/patches/patch-ag
+++ b/devel/libtool/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.7 2002/08/25 18:38:35 jlam Exp $
+$NetBSD: patch-ag,v 1.8 2003/09/25 02:09:03 danw Exp $
 
 --- ltcf-cxx.sh.orig	Wed May 23 05:05:06 2001
 +++ ltcf-cxx.sh
@@ -15,7 +15,7 @@ $NetBSD: patch-ag,v 1.7 2002/08/25 18:38:35 jlam Exp $
 +	  allow_undefined_flag='-flat_namespace -undefined suppress'
 +	  ;;
 +	esac
-+    archive_cmds='$CC $(if test .$module = .yes; then echo -bundle; else echo -dynamiclib; fi) $allow_undefined_flag -o $lib $libobjs $deplibs $linkopts -install_name $rpath/$soname $verstring'
++    archive_cmds='$CC $(if test .$module = .yes; then echo -bundle; else echo -dynamiclib; fi) $allow_undefined_flag -o $lib $libobjs $deplibs $linker_flags -install_name $rpath/$soname $verstring'
 +    # We need to add '_' to the symbols in $export_symbols first 
 +    #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols $lib'
 +    hardcode_direct=yes
diff --git a/devel/libtool/patches/patch-am b/devel/libtool/patches/patch-am
index c6fff94b711..2a3724fa674 100644
--- a/devel/libtool/patches/patch-am
+++ b/devel/libtool/patches/patch-am
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.5 2003/01/31 20:33:52 skrll Exp $
+$NetBSD: patch-am,v 1.6 2003/09/25 02:09:03 danw Exp $
 
 --- ltcf-c.sh.orig	2001-04-25 04:05:02.000000000 +0000
 +++ ltcf-c.sh
@@ -41,7 +41,7 @@ $NetBSD: patch-am,v 1.5 2003/01/31 20:33:52 skrll Exp $
 +      allow_undefined_flag='-flat_namespace -undefined suppress'
 +      ;;
 +    esac
-+    archive_cmds='$CC $(if test .$module = .yes; then echo -bundle; else echo -dynamiclib; fi) $allow_undefined_flag -o $lib $libobjs $deplibs $linkopts -install_name $rpath/$soname $verstring'
++    archive_cmds='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs && $CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $linker_flags $(test .$module != .yes && echo -install_name $rpath/$soname $verstring)'
 +    # We need to add '_' to the symbols in $export_symbols first
 +    #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols $lib'
 +    hardcode_direct=yes