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.

6 files changed, 83 insertions, 3 deletions

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
+   ;;
+