Update libtool to a newer snapshot.

Notable changes are:

	* Fix memory leak in libltdl
	* Handle large dependency_libs entries in .la files better
	* Integration of a lot of the NetBSD changes

16 files changed, 79 insertions, 333 deletions

diff --git a/devel/libtool/Makefile.common b/devel/libtool/Makefile.common
index 0cce4e61b70..ab49e315494 100644
--- a/devel/libtool/Makefile.common
+++ b/devel/libtool/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.10 2001/05/09 10:24:11 agc Exp $
+# $NetBSD: Makefile.common,v 1.11 2001/06/14 14:55:45 skrll Exp $
 #
 
-DISTNAME=	libtool-ml-20010219
+DISTNAME=	libtool-ml-20010614
 PKGPFX=		${DISTNAME:C/ml-/1.4./}
-PKGREV=		nb6
+PKGREV=		nb1
 WRKSRC=		${WRKDIR}/libtool-ml
 CATEGORIES=	devel pkgtools
 MASTER_SITES=	${MASTER_SITE_LOCAL}
diff --git a/devel/libtool/distinfo b/devel/libtool/distinfo
index ae72a8ce652..d376d260512 100644
--- a/devel/libtool/distinfo
+++ b/devel/libtool/distinfo
@@ -1,18 +1,10 @@
-$NetBSD: distinfo,v 1.5 2001/05/22 10:31:07 abs Exp $
+$NetBSD: distinfo,v 1.6 2001/06/14 14:55:45 skrll Exp $
 
-SHA1 (libtool-ml-20010219.tar.gz) = e8a2da617bd6cd2adddc6693a1e7be0eceefcac1
-Size (libtool-ml-20010219.tar.gz) = 720382 bytes
-SHA1 (patch-aa) = ff537b5767f7fbd8b287cff1d079cb34ac68e346
-SHA1 (patch-ab) = 8e7c5b6e330ea5d5104874dedb046dd3d053dff6
-SHA1 (patch-ac) = 85ea8ee09d9cf2d2ea005042538466b68d754722
-SHA1 (patch-ad) = 8ca40b71f51a294fc4120ea75c3ee156c2f58abe
-SHA1 (patch-ae) = a390e23d205f7cd1a9f533427e63f636ee7ef58d
-SHA1 (patch-af) = c5aa39c4be10c7028168d2a39c25035e2c2bbfb2
-SHA1 (patch-ag) = e344f9bb8e42af588b337962e725540aa268c6f6
-SHA1 (patch-ah) = 742b24c1b9f64ca60d55ef2f92eabc65555990cf
-SHA1 (patch-ai) = 1ad95b88b8ae0c546bbb72566c94ad8abb4b8a58
-SHA1 (patch-aj) = 597c28fc779b9cf2b8e1ebb4afbc3c5fc3367ebd
-SHA1 (patch-ak) = 12df4e6e0add692fdd8ab817509a0a94c4da7093
-SHA1 (patch-al) = 0f52dca46ad4bbaff5f7ac936f1ef32b51278521
-SHA1 (patch-am) = ce2d0680ced8463f2f943d17c551bbac8cf7489e
-SHA1 (patch-an) = 244b17f7a0493c2f18ffa11f0bd9e34274bd1c56
+SHA1 (libtool-ml-20010614.tar.gz) = ff746666737e420592c3017d65bf4c47f1430dac
+Size (libtool-ml-20010614.tar.gz) = 784246 bytes
+SHA1 (patch-ac-new) = 61196acaa12edee0b1209b2ba7c6414453bfa438
+SHA1 (patch-aa) = 4789e2ec97fbb987ce74992c5e78e918f2156b49
+SHA1 (patch-ab) = 37846c9ff30a6c422abd5150466b06190a5976bd
+SHA1 (patch-ac) = 61196acaa12edee0b1209b2ba7c6414453bfa438
+SHA1 (patch-ad) = 6aab76688d0f55648e35adc45a3492ba9c87acfb
+SHA1 (patch-ag) = 95ffb845d931e5ca32cbe73759baf725d435da10
diff --git a/devel/libtool/patches/patch-aa b/devel/libtool/patches/patch-aa
index 8f3f5a55e05..f25311be017 100644
--- a/devel/libtool/patches/patch-aa
+++ b/devel/libtool/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.24 2001/05/22 10:31:08 abs Exp $
+$NetBSD: patch-aa,v 1.25 2001/06/14 14:55:46 skrll Exp $
 
---- ltconfig.in.orig	Tue May 22 11:10:20 2001
-+++ ltconfig.in	Tue May 22 11:07:29 2001
-@@ -1118,7 +1118,7 @@
+--- ltconfig.in.orig	Mon May 21 05:05:06 2001
++++ ltconfig.in
+@@ -1198,7 +1198,7 @@
  
  # This must be Linux ELF.
  linux-gnu*)
@@ -11,16 +11,7 @@ $NetBSD: patch-aa,v 1.24 2001/05/22 10:31:08 abs Exp $
    need_lib_prefix=no
    need_version=no
    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-@@ -1142,6 +1142,8 @@
- 
- netbsd*)
-   version_type=sunos
-+  need_lib_prefix=no
-+  need_version=no
-   if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-     library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
-     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-@@ -1200,7 +1202,7 @@
+@@ -1282,7 +1282,7 @@
    ;;
  
  solaris*)
diff --git a/devel/libtool/patches/patch-ab b/devel/libtool/patches/patch-ab
index 4baa2dd5f35..8c0b757fd37 100644
--- a/devel/libtool/patches/patch-ab
+++ b/devel/libtool/patches/patch-ab
@@ -1,12 +1,18 @@
-$NetBSD: patch-ab,v 1.21 2001/05/09 10:24:11 agc Exp $
+$NetBSD: patch-ab,v 1.22 2001/06/14 14:55:47 skrll Exp $
 
---- ltmain.sh.orig	Mon Feb 19 05:05:23 2001
-+++ ltmain.sh	Wed May  9 11:13:29 2001
-@@ -484,7 +484,14 @@
+--- ltmain.sh.orig	Wed May 23 05:05:43 2001
++++ ltmain.sh
+@@ -494,11 +494,18 @@
+     # command doesn't match the default compiler.
+     if test -n "$available_tags" && test -z "$tagname"; then
+       case $base_compile in
+-      "$CC "*) ;;
++      "$CC "*) tagname=CC ;;
        # Blanks in the command may have been stripped by the calling shell,
        # but not from the CC environment variable when ltconfig was run.
-       "`$echo $CC` "*) ;;
+-      "`$echo $CC` "*) ;;
 -      *)
++      "`$echo $CC` "*) tagname=CC ;;
 +      *)   base_compiler=`echo $base_compile | awk '{ print $1 }'`
 +	   case $base_compiler in
 +	   *cc)	tagname=CC ;;
@@ -18,7 +24,7 @@ $NetBSD: patch-ab,v 1.21 2001/05/09 10:24:11 agc Exp $
          for z in $available_tags; do
            if grep "^### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
  	    # Evaluate the configuration.
-@@ -514,8 +521,6 @@
+@@ -528,8 +535,6 @@
  #        else
  #          echo "$modename: using $tagname tagged configuration"
          fi
@@ -27,11 +33,17 @@ $NetBSD: patch-ab,v 1.21 2001/05/09 10:24:11 agc Exp $
      fi
  
      objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
-@@ -1423,7 +1428,14 @@
+@@ -1528,11 +1533,18 @@
+     # command doesn't match the default compiler.
+     if test -n "$available_tags" && test -z "$tagname"; then
+       case $base_compile in
+-      "$CC "*) ;;
++      "$CC "*) tagname=CC ;;
        # Blanks in the command may have been stripped by the calling shell,
        # but not from the CC environment variable when ltconfig was run.
-       "`$echo $CC` "*) ;;
+-      "`$echo $CC` "*) ;;
 -      *)
++      "`$echo $CC` "*) tagname=CC ;;
 +      *)   base_compiler=`echo $base_compile | awk '{ print $1 }'`
 +	   case $base_compiler in
 +	   *cc)	tagname=CC ;;
@@ -43,7 +55,7 @@ $NetBSD: patch-ab,v 1.21 2001/05/09 10:24:11 agc Exp $
          for z in $available_tags; do
            if grep "^### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
  	    # Evaluate the configuration.
-@@ -1453,8 +1465,6 @@
+@@ -1562,8 +1574,6 @@
  #       else
  #         echo "$modename: using $tagname tagged configuration"
          fi
@@ -52,81 +64,3 @@ $NetBSD: patch-ab,v 1.21 2001/05/09 10:24:11 agc Exp $
      fi
  
      if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
-@@ -2397,7 +2407,7 @@
- 
- 	# Check that each of the things are valid numbers.
- 	case "$current" in
--	0 | [1-9] | [1-9][0-9]*) ;;
-+	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
- 	*)
- 	  $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
- 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-@@ -2406,7 +2416,7 @@
- 	esac
- 
- 	case "$revision" in
--	0 | [1-9] | [1-9][0-9]*) ;;
-+	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
- 	*)
- 	  $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
- 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-@@ -2415,7 +2425,7 @@
- 	esac
- 
- 	case "$age" in
--	0 | [1-9] | [1-9][0-9]*) ;;
-+	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
- 	*)
- 	  $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
- 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-@@ -2612,6 +2622,9 @@
- 	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
- 	    # these systems don't actually have a c library (as such)!
- 	    ;;
-+          *-*-netbsd*)
-+            # Don't link with libc until the a.out ld.so is fixed.
-+            ;;
- 	  *)
-  	    # Add libc to deplibs on all other systems if necessary.
-  	    if test $build_libtool_need_lc = "yes"; then
-@@ -2771,6 +2784,40 @@
- 	    fi
- 	  done # Gone through all deplibs.
- 	  ;;
-+        match_pattern*)
-+          set dummy $deplibs_check_method
-+          match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
-+          for a_deplib in $deplibs; do
-+            name="`expr $a_deplib : '-l\(.*\)'`"
-+            # If $name is empty we are operating on a -L argument.
-+            if test "$name" != "" -a "$name" != "0"; then
-+              libname=`eval \\$echo \"$libname_spec\"`
-+              for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-+                potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-+                for potent_lib in $potential_libs; do
-+                  if eval echo \"$potent_lib\" 2>/dev/null \
-+                      | sed 10q \
-+                      | egrep "$match_pattern_regex" > /dev/null; then
-+                    newdeplibs="$newdeplibs $a_deplib"
-+                    a_deplib=""
-+                    break 2
-+                  fi
-+                done
-+              done
-+              if test -n "$a_deplib" ; then
-+                droppeddeps=yes
-+                echo
-+                echo "*** Warning: This library needs some functionality provided by $a_deplib."
-+                echo "*** I have the capability to make that library automatically link in when"
-+                echo "*** you link to this library.  But I can only do this if you have a"
-+                echo "*** shared version of the library, which you do not appear to have."
-+              fi
-+            else
-+              # Add a -L argument.
-+              newdeplibs="$newdeplibs $a_deplib"
-+            fi
-+          done # Gone through all deplibs.
-+          ;;
- 	none | unknown | *)
- 	  newdeplibs=""
- 	  if $echo "X $deplibs" | $Xsed -e 's/ -lc$//' \
diff --git a/devel/libtool/patches/patch-ac b/devel/libtool/patches/patch-ac
index b91965df514..d8f52d31ad7 100644
--- a/devel/libtool/patches/patch-ac
+++ b/devel/libtool/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.7 2001/02/27 08:20:25 skrll Exp $
+$NetBSD: patch-ac,v 1.8 2001/06/14 14:55:47 skrll Exp $
 
---- config.guess.orig	Mon Aug 28 05:05:02 2000
+--- config.guess.orig	Thu Apr 12 05:05:02 2001
 +++ config.guess
-@@ -118,33 +118,24 @@
+@@ -135,41 +135,24 @@
  	# compatibility and a consistent mechanism for selecting the
  	# object file format.
  	# Determine the machine/vendor (is the vendor relevant).
@@ -16,37 +16,45 @@ $NetBSD: patch-ac,v 1.7 2001/02/27 08:20:25 skrll Exp $
 -	    hp3[0-9][05]) machine=m68k-hp ;;
 -	    ibmrt|romp-ibm) machine=romp-ibm ;;
 -	    *) machine=${UNAME_MACHINE}-unknown ;;
-+	PATH=$PATH:/sbin:/usr/sbin
-+	UNAME_MACHINE_ARCH=`(uname -p || sysctl -n hw.machine_arch || echo unknown) 2>/dev/null`
-+	case "${UNAME_MACHINE_ARCH}:${UNAME_RELEASE}" in
-+	    arm26:*)			UNAME_MACHINE_ARCH=armv2;;
-+	    arm32:*)			UNAME_MACHINE_ARCH=arm;;
-+	    mips:*)			UNAME_MACHINE_ARCH=mipsel;;
-+	    i386:*|m68k:*|ns32k:*|sparc:*|vax:*)
-+		# The Operating System including object format.
-+		if echo __ELF__ | $CC_FOR_BUILD -E - | grep -q __ELF__; then
-+		    UNAME_OBJFORMAT=
-+		else
-+		    UNAME_OBJFORMAT=elf
-+		fi;;
++ 	PATH=$PATH:/sbin:/usr/sbin
++ 	UNAME_MACHINE_ARCH=`(uname -p || sysctl -n hw.machine_arch || echo unknown) 2>/dev/null`
++ 	case "${UNAME_MACHINE_ARCH}:${UNAME_RELEASE}" in
++ 	    arm26:*)			UNAME_MACHINE_ARCH=armv2;;
++ 	    arm32:*)			UNAME_MACHINE_ARCH=arm;;
++ 	    mips:*)			UNAME_MACHINE_ARCH=mipsel;;
++ 	    i386:*|m68k:*|ns32k:*|sparc:*|vax:*)
++ 		# The Operating System including object format.
++ 		if echo __ELF__ | $CC_FOR_BUILD -E - | grep -q __ELF__; then
++ 		    UNAME_OBJFORMAT=
++ 		else
++ 		    UNAME_OBJFORMAT=elf
++ 		fi;;
  	esac
--	# The Operating System including object format.
--	if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
--		| grep __ELF__ >/dev/null
--	then
--	    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
--	    # Return netbsd for either.  FIX?
--	    os=netbsd
--	else
--	    os=netbsdelf
--	fi
+-	# The Operating System including object format, if it has switched
+-	# to ELF recently, or will in the future.
+-	case "${UNAME_MACHINE}" in
+-	    i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k)
+-		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+-			| grep __ELF__ >/dev/null
+-		then
+-		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+-		    # Return netbsd for either.  FIX?
+-		    os=netbsd
+-		else
+-		    os=netbsdelf
+-		fi
+-		;;
+-	    *)
+-	        os=netbsd
+-		;;
+-	esac
 -	# The OS release
 -	release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
  	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
  	# contains redundant information, the shorter form:
  	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 -	echo "${machine}-${os}${release}"
-+	echo ${UNAME_MACHINE_ARCH}-netbsd${UNAME_OBJFORMAT}`echo ${UNAME_RELEASE} | sed -e 's/[-_].*/\./'`
++ 	echo ${UNAME_MACHINE_ARCH}-netbsd${UNAME_OBJFORMAT}`echo ${UNAME_RELEASE} | sed -e 's/[-_].*/\./'`
  	exit 0 ;;
      alpha:OSF1:*:*)
  	if test $UNAME_RELEASE = "V4.0"; then
diff --git a/devel/libtool/patches/patch-ad b/devel/libtool/patches/patch-ad
index ab46d553864..23bb26d9bca 100644
--- a/devel/libtool/patches/patch-ad
+++ b/devel/libtool/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.4 2001/05/08 13:38:42 skrll Exp $
+$NetBSD: patch-ad,v 1.5 2001/06/14 14:55:47 skrll Exp $
 
---- Makefile.in.orig	Mon Feb 19 05:06:14 2001
+--- Makefile.in.orig	Wed May 23 05:07:23 2001
 +++ Makefile.in
 @@ -93,7 +93,7 @@
  
@@ -11,21 +11,3 @@ $NetBSD: patch-ad,v 1.4 2001/05/08 13:38:42 skrll Exp $
  SUBDIRS = $(BUILD_SUBDIRS)
  DIST_SUBDIRS = $(BUILD_SUBDIRS) $(CONF_SUBDIRS)
  
-@@ -476,6 +476,17 @@
- 	file_magic_cmd="$(file_magic_cmd)" \
- 	$(SHELL) $(srcdir)/ltconfig $(LIBTOOL_FLAGS) --srcdir=$(srcdir) \
- 	  --output=$@T $(srcdir)/ltmain.sh $(host_triplet)
-+	AR="$(AR)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
-+	LTCC="$(CC)" FILE="$(FILE)" LD="$(LD)" LDFLAGS="$(LDFLAGS)" \
-+	LIBS="$(LIBS)" LN_S="$(LN_S)" NM="$(NM)" RANLIB="$(RANLIB)" \
-+	STRIP="$(STRIP)" AS="$(AS)" DLLTOOL="$(DLLTOOL)" \
-+	OBJDUMP="$(OBJDUMP)" \
-+	objext="$(OBJEXT)" exeext="$(EXEEXT)" \
-+	reload_flag="$(reload_flag)" \
-+	deplibs_check_method="$(deplibs_check_method)" \
-+	file_magic_cmd="$(file_magic_cmd)" \
-+	$(SHELL) $(srcdir)/ltconfig $(LIBTOOL_FLAGS) --srcdir=$(srcdir) \
-+	  --add-tag=CC --output=$@T $(srcdir)/ltcf-c.sh $(host_triplet)
- @HAVE_CXX_TRUE@	AR="$(AR)" CC="$(CXX)" CFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
- @HAVE_CXX_TRUE@	LTCC="$(CC)" FILE="$(FILE)" LD="$(LD)" LDFLAGS="$(LDFLAGS)" \
- @HAVE_CXX_TRUE@	LIBS="$(LIBS)" LN_S="$(LN_S)" NM="$(NM)" RANLIB="$(RANLIB)" \
diff --git a/devel/libtool/patches/patch-ae b/devel/libtool/patches/patch-ae
deleted file mode 100644
index 65909bf0544..00000000000
--- a/devel/libtool/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2001/03/26 07:35:50 skrll Exp $
-
---- libltdl/ltdl.c.orig	Sat Feb  3 05:05:05 2001
-+++ libltdl/ltdl.c
-@@ -87,7 +87,7 @@
- 
- /* max. filename length */
- #ifndef LT_FILENAME_MAX
--#  define LT_FILENAME_MAX	1024
-+#  define LT_FILENAME_MAX	4196
- #endif
- 
- /* This is the maximum symbol size that won't require malloc/free */
diff --git a/devel/libtool/patches/patch-af b/devel/libtool/patches/patch-af
deleted file mode 100644
index b094ed66ced..00000000000
--- a/devel/libtool/patches/patch-af
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-af,v 1.2 2001/03/18 17:10:28 skrll Exp $
-
---- ltcf-c.sh.orig	Fri Feb 16 05:05:03 2001
-+++ ltcf-c.sh
-@@ -184,8 +184,8 @@
-       archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-       wlarc=
-     else
--      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+      archive_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+      archive_expsym_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-     fi
-     ;;
- 
diff --git a/devel/libtool/patches/patch-ag b/devel/libtool/patches/patch-ag
index 218539e2e22..d7375fe4126 100644
--- a/devel/libtool/patches/patch-ag
+++ b/devel/libtool/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.2 2001/03/18 17:10:29 skrll Exp $
+$NetBSD: patch-ag,v 1.3 2001/06/14 14:55:48 skrll Exp $
 
---- ltcf-cxx.sh.orig	Fri Feb 16 05:05:03 2001
+--- ltcf-cxx.sh.orig	Wed May 23 05:05:06 2001
 +++ ltcf-cxx.sh
-@@ -368,7 +368,23 @@
+@@ -383,7 +383,23 @@
      esac
      ;;
    netbsd*)
@@ -27,7 +27,7 @@ $NetBSD: patch-ag,v 1.2 2001/03/18 17:10:29 skrll Exp $
      ;;
    osf3*)
      if test "$with_gcc" = yes && test "$with_gnu_ld" = no; then
-@@ -943,6 +959,14 @@
+@@ -982,6 +998,14 @@
  
      esac
    done
diff --git a/devel/libtool/patches/patch-ah b/devel/libtool/patches/patch-ah
deleted file mode 100644
index 7f4245b8611..00000000000
--- a/devel/libtool/patches/patch-ah
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2001/04/03 17:06:17 skrll Exp $
-
---- configure.orig	Mon Feb 19 05:05:06 2001
-+++ configure
-@@ -1526,12 +1526,10 @@
- 
- netbsd*)
-   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
--    lt_cv_deplibs_check_method='file_magic NetBSD/[a-z0-9]* demand paged shared library'
-+    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
-   else
--    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
-+    lt_cv_deplibs_check_method='match_pattern /lib[^\/.]+\.so$'
-   fi
--  lt_cv_file_magic_cmd='/usr/bin/file -L'
--  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-   ;;
- 
- newsos6)
diff --git a/devel/libtool/patches/patch-ai b/devel/libtool/patches/patch-ai
deleted file mode 100644
index 988c02be528..00000000000
--- a/devel/libtool/patches/patch-ai
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2001/04/03 17:06:17 skrll Exp $
-
---- libltdl/configure.orig	Mon Feb 19 05:05:08 2001
-+++ libltdl/configure
-@@ -1639,12 +1639,10 @@
- 
- netbsd*)
-   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
--    lt_cv_deplibs_check_method='file_magic NetBSD/[a-z0-9]* demand paged shared library'
-+    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
-   else
--    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
-+    lt_cv_deplibs_check_method='match_pattern /lib[^\/.]+\.so$'
-   fi
--  lt_cv_file_magic_cmd='/usr/bin/file -L'
--  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-   ;;
- 
- newsos6)
diff --git a/devel/libtool/patches/patch-aj b/devel/libtool/patches/patch-aj
deleted file mode 100644
index c6d95779b67..00000000000
--- a/devel/libtool/patches/patch-aj
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2001/04/03 17:06:17 skrll Exp $
-
---- depdemo/configure.orig	Mon Feb 19 05:05:12 2001
-+++ depdemo/configure
-@@ -1490,12 +1490,10 @@
- 
- netbsd*)
-   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
--    lt_cv_deplibs_check_method='file_magic NetBSD/[a-z0-9]* demand paged shared library'
-+    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
-   else
--    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
-+    lt_cv_deplibs_check_method='match_pattern /lib[^\/.]+\.so$'
-   fi
--  lt_cv_file_magic_cmd='/usr/bin/file -L'
--  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-   ;;
- 
- newsos6)
diff --git a/devel/libtool/patches/patch-ak b/devel/libtool/patches/patch-ak
deleted file mode 100644
index 9a45da6787d..00000000000
--- a/devel/libtool/patches/patch-ak
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2001/04/03 17:06:18 skrll Exp $
-
---- demo/configure.orig	Mon Feb 19 05:05:10 2001
-+++ demo/configure
-@@ -1566,12 +1566,10 @@
- 
- netbsd*)
-   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
--    lt_cv_deplibs_check_method='file_magic NetBSD/[a-z0-9]* demand paged shared library'
-+    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
-   else
--    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
-+    lt_cv_deplibs_check_method='match_pattern /lib[^\/.]+\.so$'
-   fi
--  lt_cv_file_magic_cmd='/usr/bin/file -L'
--  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-   ;;
- 
- newsos6)
diff --git a/devel/libtool/patches/patch-al b/devel/libtool/patches/patch-al
deleted file mode 100644
index b759c206725..00000000000
--- a/devel/libtool/patches/patch-al
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-al,v 1.1 2001/04/03 17:06:18 skrll Exp $
-
---- cdemo/configure.orig	Mon Feb 19 05:05:14 2001
-+++ cdemo/configure
-@@ -1490,12 +1490,10 @@
- 
- netbsd*)
-   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
--    lt_cv_deplibs_check_method='file_magic NetBSD/[a-z0-9]* demand paged shared library'
-+    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
-   else
--    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
-+    lt_cv_deplibs_check_method='match_pattern /lib[^\/.]+\.so$'
-   fi
--  lt_cv_file_magic_cmd='/usr/bin/file -L'
--  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-   ;;
- 
- newsos6)
diff --git a/devel/libtool/patches/patch-am b/devel/libtool/patches/patch-am
deleted file mode 100644
index 6c1cad93a24..00000000000
--- a/devel/libtool/patches/patch-am
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-am,v 1.1 2001/04/03 17:06:18 skrll Exp $
-
---- mdemo/configure.orig	Mon Feb 19 05:05:13 2001
-+++ mdemo/configure
-@@ -1577,12 +1577,10 @@
- 
- netbsd*)
-   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
--    lt_cv_deplibs_check_method='file_magic NetBSD/[a-z0-9]* demand paged shared library'
-+    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
-   else
--    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
-+    lt_cv_deplibs_check_method='match_pattern /lib[^\/.]+\.so$'
-   fi
--  lt_cv_file_magic_cmd='/usr/bin/file -L'
--  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-   ;;
- 
- newsos6)
diff --git a/devel/libtool/patches/patch-an b/devel/libtool/patches/patch-an
deleted file mode 100644
index 17f64a06cc1..00000000000
--- a/devel/libtool/patches/patch-an
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-an,v 1.1 2001/04/03 17:06:18 skrll Exp $
-
---- tagdemo/configure.orig	Mon Feb 19 05:05:15 2001
-+++ tagdemo/configure
-@@ -1906,12 +1906,10 @@
- 
- netbsd*)
-   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
--    lt_cv_deplibs_check_method='file_magic NetBSD/[a-z0-9]* demand paged shared library'
-+    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
-   else
--    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
-+    lt_cv_deplibs_check_method='match_pattern /lib[^\/.]+\.so$'
-   fi
--  lt_cv_file_magic_cmd='/usr/bin/file -L'
--  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-   ;;
- 
- newsos6)