Fix the pattern that matches valid library files so that it allows '.'

in the library name. This fixes pkg/15981 from Dan McMahill
<dmcmahill@netbsd.org>

Patch up the test configure scripts while we're here.

Bump the PKGREV, but don't require it just yet.

8 files changed, 92 insertions, 7 deletions

diff --git a/devel/libtool/Makefile.common b/devel/libtool/Makefile.common
index 2a0e1071b53..62544e89c95 100644
--- a/devel/libtool/Makefile.common
+++ b/devel/libtool/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.18 2002/03/01 15:40:43 skrll Exp $
+# $NetBSD: Makefile.common,v 1.19 2002/03/21 09:00:12 skrll Exp $
 #
 
 DISTNAME=	libtool-ml-20010614
 PKGPFX=		${DISTNAME:C/ml-/1.4./}
-PKGREV=		nb6
+PKGREV=		nb7
 WRKSRC=		${WRKDIR}/libtool-ml
 CATEGORIES=	devel pkgtools
 MASTER_SITES=	${MASTER_SITE_LOCAL}
diff --git a/devel/libtool/distinfo b/devel/libtool/distinfo
index 5162d7606d2..c55b86cd02e 100644
--- a/devel/libtool/distinfo
+++ b/devel/libtool/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2002/03/01 15:40:43 skrll Exp $
+$NetBSD: distinfo,v 1.14 2002/03/21 09:00:13 skrll Exp $
 
 SHA1 (libtool-ml-20010614.tar.gz) = ff746666737e420592c3017d65bf4c47f1430dac
 Size (libtool-ml-20010614.tar.gz) = 784246 bytes
@@ -7,7 +7,12 @@ SHA1 (patch-aa) = c085c1dd5a3f3f56bfa279076724fc13311d83bb
 SHA1 (patch-ab) = 42f3b5de63994cc69a230cfcabdb6df47cd00a0e
 SHA1 (patch-ac) = 61196acaa12edee0b1209b2ba7c6414453bfa438
 SHA1 (patch-ad) = 6aab76688d0f55648e35adc45a3492ba9c87acfb
-SHA1 (patch-ae) = 9ee61238e4bd84687f0788be600dad9e5cf676fb
+SHA1 (patch-ae) = 03de2a4fc9d828d62c6e6126ecf2dbbfeb1d82ea
 SHA1 (patch-af) = 2a0630e92b355ee86800c4f3a7993fbb126a0999
 SHA1 (patch-ag) = 93c0ed94970c69f1a4af9ccec31463f2e3adc670
+SHA1 (patch-ah) = 7f0a0153f5e23aab4a3fcd6ae395b5b56d2b52a1
+SHA1 (patch-ai) = bf5296409ccba34bccbc5ed289eeaa8350d7176e
+SHA1 (patch-aj) = 5382fc0a6a58687da5523c596118a4eeb948f675
+SHA1 (patch-ak) = 7e7c6a515361863b683bbc8be24c8146501ca864
+SHA1 (patch-al) = 22f1b7289d9ba477255e66364ae23af24a298dd0
 SHA1 (patch-ao) = 4e115e9d6ddde556205dc786cde471bfee5a5e9e
diff --git a/devel/libtool/patches/patch-ae b/devel/libtool/patches/patch-ae
index edc4a076ce9..083cb01a27f 100644
--- a/devel/libtool/patches/patch-ae
+++ b/devel/libtool/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.4 2002/01/04 15:20:29 skrll Exp $
+$NetBSD: patch-ae,v 1.5 2002/03/21 09:00:13 skrll Exp $
 
 --- configure.orig	Thu Jun 14 05:06:29 2001
 +++ configure
@@ -7,10 +7,10 @@ $NetBSD: patch-ae,v 1.4 2002/01/04 15:20:29 skrll Exp $
  netbsd*)
    if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
 -    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
-+    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$$'
++    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$$'
    else
 -    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$'
-+    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+(\.so|_pic\.a)$$'
++    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$$'
    fi
    ;;
  
diff --git a/devel/libtool/patches/patch-ah b/devel/libtool/patches/patch-ah
new file mode 100644
index 00000000000..65b009937d3
--- /dev/null
+++ b/devel/libtool/patches/patch-ah
@@ -0,0 +1,16 @@
+$NetBSD: patch-ah,v 1.3 2002/03/21 09:00:13 skrll Exp $
+
+--- demo/configure.orig	Wed Mar 20 10:42:55 2002
++++ demo/configure
+@@ -1573,9 +1573,9 @@
+ 
+ netbsd*)
+   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+-    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
++    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$$'
+   else
+-    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$'
++    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$$'
+   fi
+   ;;
+ 
diff --git a/devel/libtool/patches/patch-ai b/devel/libtool/patches/patch-ai
new file mode 100644
index 00000000000..52a051de656
--- /dev/null
+++ b/devel/libtool/patches/patch-ai
@@ -0,0 +1,16 @@
+$NetBSD: patch-ai,v 1.3 2002/03/21 09:00:13 skrll Exp $
+
+--- cdemo/configure.orig	Wed Mar 20 10:42:55 2002
++++ cdemo/configure
+@@ -1497,9 +1497,9 @@
+ 
+ netbsd*)
+   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+-    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
++    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$$'
+   else
+-    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$'
++    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$$'
+   fi
+   ;;
+ 
diff --git a/devel/libtool/patches/patch-aj b/devel/libtool/patches/patch-aj
new file mode 100644
index 00000000000..607246f86cc
--- /dev/null
+++ b/devel/libtool/patches/patch-aj
@@ -0,0 +1,16 @@
+$NetBSD: patch-aj,v 1.3 2002/03/21 09:00:13 skrll Exp $
+
+--- pdemo/configure.orig	Wed Mar 20 10:42:55 2002
++++ pdemo/configure
+@@ -1573,9 +1573,9 @@
+ 
+ netbsd*)
+   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+-    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
++    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$$'
+   else
+-    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$'
++    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$$'
+   fi
+   ;;
+ 
diff --git a/devel/libtool/patches/patch-ak b/devel/libtool/patches/patch-ak
new file mode 100644
index 00000000000..9cd38bf9126
--- /dev/null
+++ b/devel/libtool/patches/patch-ak
@@ -0,0 +1,16 @@
+$NetBSD: patch-ak,v 1.3 2002/03/21 09:00:13 skrll Exp $
+
+--- tagdemo/configure.orig	Wed Mar 20 10:43:26 2002
++++ tagdemo/configure
+@@ -1913,9 +1913,9 @@
+ 
+ netbsd*)
+   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+-    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
++    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$$'
+   else
+-    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$'
++    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$$'
+   fi
+   ;;
+ 
diff --git a/devel/libtool/patches/patch-al b/devel/libtool/patches/patch-al
new file mode 100644
index 00000000000..2ab56418190
--- /dev/null
+++ b/devel/libtool/patches/patch-al
@@ -0,0 +1,16 @@
+$NetBSD: patch-al,v 1.3 2002/03/21 09:00:13 skrll Exp $
+
+--- mdemo/configure.orig	Wed Mar 20 10:43:26 2002
++++ mdemo/configure
+@@ -1584,9 +1584,9 @@
+ 
+ netbsd*)
+   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+-    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
++    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$$'
+   else
+-    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$'
++    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$$'
+   fi
+   ;;
+