fix test for Solaris linker by also grepping for "ld: Solaris Link

Editors", reported by Dima Veselov <kab00m@lich.phys.spbu.ru> in
private mail.

also move hints/ patches to patch-b* to keep track of them more
easily.

7 files changed, 41 insertions, 9 deletions

diff --git a/lang/perl5/distinfo b/lang/perl5/distinfo
index 17ebeba83a8..a8059388fa2 100644
--- a/lang/perl5/distinfo
+++ b/lang/perl5/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.17 2003/10/04 07:38:45 reed Exp $
+$NetBSD: distinfo,v 1.18 2003/10/05 14:19:09 grant Exp $
 
 SHA1 (perl-5.6.1.tar.gz) = c718b38685f90d51a9a6b1b008de0d7d198c0744
 Size (perl-5.6.1.tar.gz) = 5983695 bytes
-SHA1 (patch-aa) = ceb14704b03223679cb08099c3fe71dc1bc08be2
-SHA1 (patch-ab) = c30dbcbcd72896c324ad18c4adb3304a340c379f
+SHA1 (patch-aa) = f15f873160a611e35978a24fdabad29dabdff043
 SHA1 (patch-ac) = dfebafeec171c86de3d6105e5543270a30f82691
 SHA1 (patch-ad) = 7a3ca903d958026473f593fdeb172f86f2ef66d2
 SHA1 (patch-ae) = 677797f38279b7602fc5bbac8ee80c0e09f6e285
@@ -11,6 +10,8 @@ SHA1 (patch-af) = 94d91fba0731c9ee43b3e544f81cc9367a75a77c
 SHA1 (patch-ag) = 3ffe02cc745234b067c991b66024c17864f5babe
 SHA1 (patch-ah) = 4c689dde8cba8cb3c30295d52536ff09a0c7f589
 SHA1 (patch-aj) = 4da55b4bb1e1607fde7a3d9510ca3d6a90f8c10b
-SHA1 (patch-ak) = 7aa35848111a62c608e792f025b7095513d7041b
 SHA1 (patch-al) = 96b68e38900053109caeb10326cce6e17f58dcab
 SHA1 (patch-am) = 57af2f39327951e321fcb6985aa2d74c090278c6
+SHA1 (patch-ba) = c30dbcbcd72896c324ad18c4adb3304a340c379f
+SHA1 (patch-bb) = 7aa35848111a62c608e792f025b7095513d7041b
+SHA1 (patch-bc) = 6f3c2a279065872f836a9d7bb79d127975227952
diff --git a/lang/perl5/patches/patch-ab b/lang/perl5/patches/patch-ba
index 1aec6bcfdbc..f342b3cca99 100644
--- a/lang/perl5/patches/patch-ab
+++ b/lang/perl5/patches/patch-ba
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.12 2003/06/23 07:45:02 jlam Exp $
+$NetBSD: patch-ba,v 1.1 2003/10/05 14:19:09 grant Exp $
 
 --- hints/netbsd.sh.orig	Thu Feb 22 18:57:55 2001
 +++ hints/netbsd.sh	Fri Jun 20 17:59:50 2003
diff --git a/lang/perl5/patches/patch-ak b/lang/perl5/patches/patch-bb
index 85eb14df18b..cf591922306 100644
--- a/lang/perl5/patches/patch-ak
+++ b/lang/perl5/patches/patch-bb
@@ -1,4 +1,4 @@
-$NetBSD: patch-ak,v 1.1 2003/02/21 14:42:15 grant Exp $
+$NetBSD: patch-bb,v 1.1 2003/10/05 14:19:09 grant Exp $
 
 --- hints/freebsd.sh.orig	Sun Apr  8 16:09:16 2001
 +++ hints/freebsd.sh
diff --git a/lang/perl5/patches/patch-bc b/lang/perl5/patches/patch-bc
new file mode 100644
index 00000000000..4a19ca1f77a
--- /dev/null
+++ b/lang/perl5/patches/patch-bc
@@ -0,0 +1,15 @@
+$NetBSD: patch-bc,v 1.1 2003/10/05 14:19:09 grant Exp $
+
+--- hints/solaris_2.sh.orig	2001-02-23 13:57:55.000000000 +1100
++++ hints/solaris_2.sh
+@@ -239,6 +239,10 @@ END
+ 	    # All Solaris versions of ld I've seen contain the magic
+ 	    # string used in the grep.
+ 	    :
++	elif echo "$verbose" | grep "ld: Solaris Link Editors" >/dev/null 2>&1; then
++	    # This string has also been observed "in the wild" as
++	    # being the Solaris linker.
++	    :
+ 	else
+ 	    # No evidence yet of /usr/ccs/bin/ld.  Some versions
+ 	    # of egcs's ld wrapper call /usr/ccs/bin/ld in turn but
diff --git a/lang/perl58/distinfo b/lang/perl58/distinfo
index e2a5513d8b9..0eb1446c38d 100644
--- a/lang/perl58/distinfo
+++ b/lang/perl58/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.8 2003/10/05 07:07:14 jlam Exp $
+$NetBSD: distinfo,v 1.9 2003/10/05 14:26:00 grant Exp $
 
 SHA1 (perl-5.8.1.tar.gz) = 838a2f55927d14a9c8f239ebd8f40e33572f2800
 Size (perl-5.8.1.tar.gz) = 11857808 bytes
-SHA1 (patch-ab) = cdceb712bae08c6041e5aa175e5989d48b3a3f4e
 SHA1 (patch-ae) = fa3bbb1561192ce9214a7a7c756ccb2595a52c80
 SHA1 (patch-ah) = 2bfaf2503589ae3dbedaf7ee61561ed58054938e
+SHA1 (patch-ba) = cdceb712bae08c6041e5aa175e5989d48b3a3f4e
+SHA1 (patch-bc) = 6bd07e902563079dd5642eac321ca7f9271ab8a6
 SHA1 (patch-zc) = eb81edd1144ec46285898afc641c03a3aad54977
diff --git a/lang/perl58/patches/patch-ab b/lang/perl58/patches/patch-ba
index a7e9a4d2048..b90e829bdde 100644
--- a/lang/perl58/patches/patch-ab
+++ b/lang/perl58/patches/patch-ba
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.4 2003/10/05 07:07:14 jlam Exp $
+$NetBSD: patch-ba,v 1.1 2003/10/05 14:26:00 grant Exp $
 
 --- hints/netbsd.sh.orig	Tue Jul  1 23:49:58 2003
 +++ hints/netbsd.sh	Wed Jul  2 11:49:17 2003
diff --git a/lang/perl58/patches/patch-bc b/lang/perl58/patches/patch-bc
new file mode 100644
index 00000000000..9545ee5b389
--- /dev/null
+++ b/lang/perl58/patches/patch-bc
@@ -0,0 +1,15 @@
+$NetBSD: patch-bc,v 1.1 2003/10/05 14:26:00 grant Exp $
+
+--- hints/solaris_2.sh.orig	2003-09-18 19:21:49.000000000 +1000
++++ hints/solaris_2.sh
+@@ -241,6 +241,10 @@ END
+ 	    # All Solaris versions of ld I've seen contain the magic
+ 	    # string used in the grep.
+ 	    :
++	elif echo "$verbose" | grep "ld: Solaris Link Editors" >/dev/null 2>&1; then
++	    # This string has also been observed "in the wild" as
++	    # being the Solaris linker.
++	    :
+ 	else
+ 	    # No evidence yet of /usr/ccs/bin/ld.  Some versions
+ 	    # of egcs's ld wrapper call /usr/ccs/bin/ld in turn but