Implement a new deplibs_check_method called match_pattern and use it.

The use of file(1) was always disliked and it proved to cause problems
on some platforms.

Fixes pkg/12516 from Dam McMahill <mcmahill@mtl.mit.edu>

10 files changed, 186 insertions, 5 deletions

diff --git a/devel/libtool/Makefile.common b/devel/libtool/Makefile.common
index 22bf2843851..14e88437c96 100644
--- a/devel/libtool/Makefile.common
+++ b/devel/libtool/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.6 2001/03/18 17:10:27 skrll Exp $
+# $NetBSD: Makefile.common,v 1.7 2001/04/03 17:06:16 skrll Exp $
 #
 
 DISTNAME=	libtool-ml-20010219
 PKGPFX=		${DISTNAME:C/ml-/1.4./}
-PKGREV=		nb4
+PKGREV=		nb5
 WRKSRC=		${WRKDIR}/libtool-ml
 CATEGORIES=	devel pkgtools
 MASTER_SITES=	${MASTER_SITE_LOCAL}
diff --git a/devel/libtool/files/patch-sum b/devel/libtool/files/patch-sum
index b17753e6573..db2c2e7c634 100644
--- a/devel/libtool/files/patch-sum
+++ b/devel/libtool/files/patch-sum
@@ -1,9 +1,16 @@
-$NetBSD: patch-sum,v 1.32 2001/03/26 07:35:50 skrll Exp $
+$NetBSD: patch-sum,v 1.33 2001/04/03 17:06:17 skrll Exp $
 
 SHA1 (patch-aa) = 5524bcb4b3ec3faf79e903134ddcb6c8d3dfefe7
-SHA1 (patch-ab) = 18c73a32c1c35c750bd93b1d77e5a1b927d994bf
+SHA1 (patch-ab) = 86bc59afc6fc678b6ac9cae131fbf8631c45f724
 SHA1 (patch-ac) = 85ea8ee09d9cf2d2ea005042538466b68d754722
 SHA1 (patch-ad) = 2407b8ef5c210b64c6c7bec28b56e4390f9f0300
 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
diff --git a/devel/libtool/patches/patch-ab b/devel/libtool/patches/patch-ab
index 625c4820433..0b4f9c77b45 100644
--- a/devel/libtool/patches/patch-ab
+++ b/devel/libtool/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.19 2001/03/12 11:23:04 skrll Exp $
+$NetBSD: patch-ab,v 1.20 2001/04/03 17:06:17 skrll Exp $
 
 --- ltmain.sh.orig	Mon Feb 19 05:05:23 2001
 +++ ltmain.sh
@@ -39,3 +39,44 @@ $NetBSD: patch-ab,v 1.19 2001/03/12 11:23:04 skrll Exp $
  	  *)
   	    # Add libc to deplibs on all other systems if necessary.
   	    if test $build_libtool_need_lc = "yes"; then
+@@ -2771,6 +2774,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-ah b/devel/libtool/patches/patch-ah
new file mode 100644
index 00000000000..7f4245b8611
--- /dev/null
+++ b/devel/libtool/patches/patch-ah
@@ -0,0 +1,19 @@
+$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
new file mode 100644
index 00000000000..988c02be528
--- /dev/null
+++ b/devel/libtool/patches/patch-ai
@@ -0,0 +1,19 @@
+$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
new file mode 100644
index 00000000000..c6d95779b67
--- /dev/null
+++ b/devel/libtool/patches/patch-aj
@@ -0,0 +1,19 @@
+$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
new file mode 100644
index 00000000000..9a45da6787d
--- /dev/null
+++ b/devel/libtool/patches/patch-ak
@@ -0,0 +1,19 @@
+$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
new file mode 100644
index 00000000000..b759c206725
--- /dev/null
+++ b/devel/libtool/patches/patch-al
@@ -0,0 +1,19 @@
+$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
new file mode 100644
index 00000000000..6c1cad93a24
--- /dev/null
+++ b/devel/libtool/patches/patch-am
@@ -0,0 +1,19 @@
+$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
new file mode 100644
index 00000000000..17f64a06cc1
--- /dev/null
+++ b/devel/libtool/patches/patch-an
@@ -0,0 +1,19 @@
+$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)