Disable -fstack-protector on SunOS, it causes more trouble than its worth.

Bump PKGREVISION.

3 files changed, 24 insertions, 24 deletions

diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile
index 35d5a4112dd..85d0368abcb 100644
--- a/lang/perl5/Makefile
+++ b/lang/perl5/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.210 2013/09/11 14:31:31 jperkin Exp $
+# $NetBSD: Makefile,v 1.211 2013/11/01 14:02:37 jperkin Exp $
 
 .include "license.mk"
 .include "Makefile.common"
 
-PKGREVISION=	1
+PKGREVISION=	2
 COMMENT=	Practical Extraction and Report Language
 
 CONFLICTS=	perl-base-[0-9]* perl-thread-[0-9]*			\
diff --git a/lang/perl5/distinfo b/lang/perl5/distinfo
index a5cef51b430..4e7bbcb2c70 100644
--- a/lang/perl5/distinfo
+++ b/lang/perl5/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.110 2013/09/11 14:31:31 jperkin Exp $
+$NetBSD: distinfo,v 1.111 2013/11/01 14:02:37 jperkin Exp $
 
 SHA1 (perl-5.18.1.tar.bz2) = eb6b402682168a9735b2806d09c1ca5d567b2de8
 RMD160 (perl-5.18.1.tar.bz2) = 015c4c617474e1f2716a8c1484c44852ab459b74
@@ -8,7 +8,7 @@ SHA1 (patch-ab) = ddddf24cfa96c3b95202c2081006e0c7216afa1d
 SHA1 (patch-ac) = cd918ae7aedddfcd3d555a1d1388c4c8719ccd12
 SHA1 (patch-ah) = f66b496ba8f7b7d3e5a1f0c6f03d051a652f426e
 SHA1 (patch-aq) = 4bf5a76f0277b0939b2ca7720f4bb045a788b5cc
-SHA1 (patch-ca) = 2664703693f9151e6403512b54cd6aecff26c06b
+SHA1 (patch-ca) = 8d060de546b2ea3ab08e6b0f3b25bfe357fd8279
 SHA1 (patch-ch) = 5b6a89c82e158bab0a5f06add48c28e600678099
 SHA1 (patch-ck) = 5c381db130cdf4c315678e2d65380eaaa3065fee
 SHA1 (patch-cn) = d1877383e213a414562b5bb4c1e8aa785926fab7
diff --git a/lang/perl5/patches/patch-ca b/lang/perl5/patches/patch-ca
index 4a939b43d73..267583f591f 100644
--- a/lang/perl5/patches/patch-ca
+++ b/lang/perl5/patches/patch-ca
@@ -1,10 +1,10 @@
-$NetBSD: patch-ca,v 1.16 2013/09/11 14:31:31 jperkin Exp $
+$NetBSD: patch-ca,v 1.17 2013/11/01 14:02:37 jperkin Exp $
 
 * Use "uname -r" to get OS version for *BSD.
 
 * Move $loclibpth to the end of $dlist, instead of the beginning.
 
-* Add -lssp when using -fstack-protector on SunOS
+* Disable -fstack-protector on SunOS
 
 * Several other changes.
 
@@ -72,7 +72,19 @@ $NetBSD: patch-ca,v 1.16 2013/09/11 14:31:31 jperkin Exp $
  
  : Which makefile gets called first.  This is used by make depend.
  case "$firstmakefile" in
-@@ -6486,7 +6487,9 @@ rp='Pathname for the site-specific libra
+@@ -5119,8 +5120,10 @@ default|recommended)
+ 	# as that way the compiler can do the right implementation dependant
+ 	# thing. (NWC)
+ 	case "$gccversion" in
+-	?*)	set stack-protector -fstack-protector
++	?*)	if test "X$osname" != "Xsolaris"; then
++		set stack-protector -fstack-protector
+ 		eval $checkccflag
++		fi
+ 		;;
+ 	esac
+ 	;;
+@@ -6486,7 +6489,9 @@ rp='Pathname for the site-specific libra
  . ./getfile
  prefixvar=sitelib
  . ./setprefixvar
@@ -83,7 +95,7 @@ $NetBSD: patch-ca,v 1.16 2013/09/11 14:31:31 jperkin Exp $
  
  : Determine list of previous versions to include in @INC
  $cat > getverlist <<EOPL
-@@ -6999,7 +7002,9 @@ case "$vendorprefix" in
+@@ -6999,7 +7004,9 @@ case "$vendorprefix" in
  	vendorlibexp="$ansexp"
  	;;
  esac
@@ -94,7 +106,7 @@ $NetBSD: patch-ca,v 1.16 2013/09/11 14:31:31 jperkin Exp $
  prefixvar=vendorlib
  . ./installprefix
  
-@@ -7476,6 +7481,15 @@ case "$nm_so_opt" in
+@@ -7476,6 +7483,15 @@ case "$nm_so_opt" in
  	;;
  esac
  
@@ -110,19 +122,7 @@ $NetBSD: patch-ca,v 1.16 2013/09/11 14:31:31 jperkin Exp $
  : Figure out where the libc is located
  case "$runnm" in
  true)
-@@ -8094,7 +8108,10 @@ EOM
- 	*-fstack-protector*)
- 	    case "$dflt" in
- 			*-fstack-protector*) ;; # Don't add it again
--			*) dflt="$dflt -fstack-protector" ;; 
-+			*) case "$osname" in
-+				solaris) dflt="$dflt -fstack-protector -lssp" ;;
-+				*) dflt="$dflt -fstack-protector" ;;
-+			esac ;;
- 		esac
- 		;;
- 	esac
-@@ -8347,7 +8364,7 @@ if "$useshrplib"; then
+@@ -8347,7 +8363,7 @@ if "$useshrplib"; then
  		# next doesn't like the default...
  		;;
  	haiku)
@@ -131,7 +131,7 @@ $NetBSD: patch-ca,v 1.16 2013/09/11 14:31:31 jperkin Exp $
  		;;
  	hpux*)
  		# hpux doesn't like the default, either.
-@@ -9431,6 +9448,13 @@ esac
+@@ -9431,6 +9447,13 @@ esac
  : Check if we want perlio
  useperlio="$define"
  
@@ -145,7 +145,7 @@ $NetBSD: patch-ca,v 1.16 2013/09/11 14:31:31 jperkin Exp $
  : Set the vendorbin variables
  case "$vendorprefix" in
  '')	d_vendorbin="$undef"
-@@ -19243,7 +19267,15 @@ RCAT(Rei,ser)
+@@ -19243,7 +19266,15 @@ RCAT(Rei,ser)
  ACAT(Cir,cus)
  EOCP
  $cppstdin $cppflags $cppminus <cpp_stuff.c >cpp_stuff.out 2>&1