Use ldflags during build.

Allow -Wl,-z arguments into lddlflags.

Fixes RELRO build.

Bump PKGREVISION.

While here, remove bogus comment from patch and remove reference
to two non-existing files.

4 files changed, 37 insertions, 30 deletions

diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile
index 2d39b84352f..e50b1cbd3dd 100644
--- a/lang/perl5/Makefile
+++ b/lang/perl5/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.239 2017/06/05 18:58:44 bsiegert Exp $
+# $NetBSD: Makefile,v 1.240 2017/07/07 05:54:24 wiz Exp $
 
 .include "license.mk"
 .include "Makefile.common"
 
 COMMENT=	Practical Extraction and Report Language
-PKGREVISION=	1
+PKGREVISION=	2
 
 CONFLICTS+=	perl-base-[0-9]* perl-thread-[0-9]*
 
@@ -119,6 +119,7 @@ PERL5_API_VERS_cmd=	\
 HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	./Configure
 CONFIGURE_ARGS+=	-sde
+CONFIGURE_ARGS+=	-Dldflags=${LDFLAGS:Q}
 MAKE_ENV+=		LC_ALL="C"
 
 .if ${OPSYS} == "SunOS"
@@ -249,8 +250,6 @@ SUBST_MESSAGE.mirbsd-paths=	Do not use non-pkgsrc paths on MirBSD.
 REPLACE_PERL+=		cpan/Config-Perl-V/V.pm
 REPLACE_PERL+=		cpan/Getopt-Long/lib/Getopt/Long.pm
 REPLACE_PERL+=		cpan/version/lib/version.pm
-REPLACE_PERL+=		dist/bignum/lib/Math/BigFloat/Trace.pm
-REPLACE_PERL+=		dist/bignum/lib/Math/BigInt/Trace.pm
 REPLACE_PERL+=		dist/ExtUtils-ParseXS/lib/ExtUtils/xsubpp
 REPLACE_PERL+=		ext/ExtUtils-Miniperl/lib/ExtUtils/Miniperl.pm
 REPLACE_PERL+=		ext/File-DosGlob/lib/File/DosGlob.pm
diff --git a/lang/perl5/distinfo b/lang/perl5/distinfo
index 48694aa48fb..fac73259888 100644
--- a/lang/perl5/distinfo
+++ b/lang/perl5/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.143 2017/06/06 12:37:50 jperkin Exp $
+$NetBSD: distinfo,v 1.144 2017/07/07 05:54:24 wiz Exp $
 
 SHA1 (perl-5.26.0.tar.bz2) = 2ca1b28f2c3ed4cc3b74be89d150ed0377f0336a
 RMD160 (perl-5.26.0.tar.bz2) = a853a1ec299d7c6ba8239e8ed444ee6d922b8938
 SHA512 (perl-5.26.0.tar.bz2) = 1e3849c0fbf3a1903f83f86470d44f55f0f22136a1bdeb829af9c47351b6c817d7d8961a2db4c9172285f5abc087ea105ccfd4c93025acbd73569e628669aab3
 Size (perl-5.26.0.tar.bz2) = 14708010 bytes
-SHA1 (patch-Configure) = 13455c1b32b0f602b339787af4ddcd481f9c2dd5
+SHA1 (patch-Configure) = d65082b236c81c310eb683a07c8ab60fc2a3e2f0
 SHA1 (patch-MANIFEST) = b27b0e1754fe2c4484931219fa17c562db88d41a
 SHA1 (patch-Makefile.SH) = e9353181a286f52303d09cb4ce0b2c04ec104217
 SHA1 (patch-aa) = 3a2b39c9eb903e68ef7d03ae448c51c147c19aa1
-SHA1 (patch-ab) = c899b7221a78e74cc9b1480834baba047dd19f38
+SHA1 (patch-ab) = 0ad5988b7cadfb13d9646a59a57f6cf884a6238a
 SHA1 (patch-ac) = 4baa8f80695687abb53d4f4e1830cf86db5b2bf7
 SHA1 (patch-aq) = 4bf5a76f0277b0939b2ca7720f4bb045a788b5cc
 SHA1 (patch-caretx.c) = 9f53a9133f8dd2f962b448d7288b5b20454c86fb
diff --git a/lang/perl5/patches/patch-Configure b/lang/perl5/patches/patch-Configure
index 4edfeef90d7..6c2a29d97b6 100644
--- a/lang/perl5/patches/patch-Configure
+++ b/lang/perl5/patches/patch-Configure
@@ -1,13 +1,14 @@
-$NetBSD: patch-Configure,v 1.3 2016/06/08 17:39:30 he Exp $
+$NetBSD: patch-Configure,v 1.4 2017/07/07 05:54:24 wiz Exp $
 
 * Use "uname -r" to get OS version for *BSD.
 * Move $loclibpth to the end of $dlist, instead of the beginning.
 * Detect systems which have <fenv.h> but where using it fails.
+* Honor more ldflags in shared objects.
 * Several other changes.
 
---- Configure.orig	2016-04-26 22:11:09.000000000 +0000
-+++ Configure
-@@ -3468,13 +3468,14 @@ EOM
+--- Configure.orig	2017-05-30 09:57:56.000000000 +0000
++++ Configure	2017-07-07 05:44:48.961150149 +0000
+@@ -3485,13 +3485,14 @@
  			osvers="$3"
  			;;
  		dragonfly) osname=dragonfly
@@ -24,7 +25,7 @@ $NetBSD: patch-Configure,v 1.3 2016/06/08 17:39:30 he Exp $
  		genix)	osname=genix ;;
  		gnu)	osname=gnu
  			osvers="$3" ;;
-@@ -3497,7 +3498,7 @@ EOM
+@@ -3514,7 +3515,7 @@
  		MiNT)	osname=mint
  			;;
  		netbsd*) osname=netbsd
@@ -33,7 +34,7 @@ $NetBSD: patch-Configure,v 1.3 2016/06/08 17:39:30 he Exp $
  			;;
  		news-os) osvers="$3"
  			case "$3" in
-@@ -3507,7 +3508,7 @@ EOM
+@@ -3524,7 +3525,7 @@
  			;;
  		nonstop-ux) osname=nonstopux ;;
  		openbsd) osname=openbsd
@@ -42,7 +43,7 @@ $NetBSD: patch-Configure,v 1.3 2016/06/08 17:39:30 he Exp $
                  	;;
  		os2)	osname=os2
  			osvers="$4"
-@@ -3522,6 +3523,9 @@ EOM
+@@ -3539,6 +3540,9 @@
  		qnx) osname=qnx
  			osvers="$4"
  			;;
@@ -52,7 +53,7 @@ $NetBSD: patch-Configure,v 1.3 2016/06/08 17:39:30 he Exp $
  		solaris) osname=solaris
  			case "$3" in
  			5*) osvers=`echo $3 | $sed 's/^5/2/g'` ;;
-@@ -4960,7 +4964,7 @@ esac
+@@ -4977,7 +4981,7 @@
  # If using gcc or clang, we can get better values for libpth, incpth
  # and usrinc directly from the compiler.
  # Note that ccname for clang is also gcc.
@@ -61,7 +62,7 @@ $NetBSD: patch-Configure,v 1.3 2016/06/08 17:39:30 he Exp $
      gcc)
  	$echo 'extern int foo;' > try.c
  	set X `$cppstdin -v try.c 2>&1 | $awk '/^#include </,/^End of search /'|$cppfilter $grep '/include'`
-@@ -5036,14 +5040,14 @@ case "$plibpth" in
+@@ -5053,14 +5057,14 @@
  esac
  case "$libpth" in
  ' ') dlist='';;
@@ -78,7 +79,7 @@ $NetBSD: patch-Configure,v 1.3 2016/06/08 17:39:30 he Exp $
  		case " $libpth " in
  		*" $xxx "*) ;;
  		*) libpth="$libpth $xxx";;
-@@ -5159,7 +5163,7 @@ lib_ext=$_a
+@@ -5176,7 +5180,7 @@
  obj_ext=$_o
  path_sep=$p_
  
@@ -87,7 +88,7 @@ $NetBSD: patch-Configure,v 1.3 2016/06/08 17:39:30 he Exp $
  
  : Which makefile gets called first.  This is used by make depend.
  case "$firstmakefile" in
-@@ -6461,6 +6465,15 @@ case "$nm_so_opt" in
+@@ -6492,6 +6496,15 @@
  	;;
  esac
  
@@ -103,7 +104,7 @@ $NetBSD: patch-Configure,v 1.3 2016/06/08 17:39:30 he Exp $
  : Figure out where the libc is located
  case "$runnm" in
  true)
-@@ -7564,7 +7577,9 @@ rp='Pathname for the site-specific libra
+@@ -7626,7 +7639,9 @@
  . ./getfile
  prefixvar=sitelib
  . ./setprefixvar
@@ -114,7 +115,7 @@ $NetBSD: patch-Configure,v 1.3 2016/06/08 17:39:30 he Exp $
  
  : Determine list of previous versions to include in @INC
  $cat > getverlist <<EOPL
-@@ -7976,7 +7991,9 @@ case "$vendorprefix" in
+@@ -8038,7 +8053,9 @@
  	vendorlibexp="$ansexp"
  	;;
  esac
@@ -125,7 +126,7 @@ $NetBSD: patch-Configure,v 1.3 2016/06/08 17:39:30 he Exp $
  prefixvar=vendorlib
  . ./installprefix
  
-@@ -8518,6 +8535,7 @@ EOM
+@@ -8580,6 +8597,7 @@
  			  esac
  			  ;;
  		    *linux*|irix*|gnu*)  dflt="-shared $optimize" ;;
@@ -133,7 +134,16 @@ $NetBSD: patch-Configure,v 1.3 2016/06/08 17:39:30 he Exp $
  		    solaris) # See [perl #66604].
  			    # On Solaris 11, gcc -m64 on amd64
  			    # appears not to understand -G.  gcc versions at
-@@ -8816,6 +8834,10 @@ if "$useshrplib"; then
+@@ -8619,7 +8637,7 @@
+ 	esac
+ 	for thisflag in $ldflags; do
+ 	    case "$thisflag" in
+-		-L*|-R*|-Wl,-R*)
++		-L*|-R*|-Wl,-R*|-Wl,-z*)
+ 		    case " $dflt " in
+ 			*" $thisflag "*) ;;
+ 			*) dflt="$dflt $thisflag" ;;
+@@ -8878,6 +8896,10 @@
  	bsdos|linux|irix*|dec_osf|gnu*|haiku)
  		xxx="-Wl,-rpath,$shrpdir"
  		;;
@@ -144,7 +154,7 @@ $NetBSD: patch-Configure,v 1.3 2016/06/08 17:39:30 he Exp $
  	hpux*)
  		# hpux doesn't like the default, either.
  		tmp_shrpenv="env LDOPTS=\"+s +b${shrpdir}\""
-@@ -8823,6 +8845,9 @@ if "$useshrplib"; then
+@@ -8885,6 +8907,9 @@
  	cygwin)
  		# cygwin needs only ldlibpth
  		;;
@@ -154,7 +164,7 @@ $NetBSD: patch-Configure,v 1.3 2016/06/08 17:39:30 he Exp $
  	*)
  		tmp_shrpenv="env LD_RUN_PATH=$shrpdir"
  		;;
-@@ -9901,6 +9926,13 @@ esac
+@@ -9966,6 +9991,13 @@
  : Check if we want perlio
  useperlio="$define"
  
@@ -168,7 +178,7 @@ $NetBSD: patch-Configure,v 1.3 2016/06/08 17:39:30 he Exp $
  : Set the vendorbin variables
  case "$vendorprefix" in
  '')	d_vendorbin="$undef"
-@@ -20262,7 +20294,15 @@ RCAT(Rei,ser)
+@@ -20424,7 +20456,15 @@
  ACAT(Cir,cus)
  EOCP
  $cppstdin $cppflags $cppminus <cpp_stuff.c >cpp_stuff.out 2>&1
@@ -185,7 +195,7 @@ $NetBSD: patch-Configure,v 1.3 2016/06/08 17:39:30 he Exp $
  	echo "Oh!  Smells like ANSI's been here." >&4
  	echo "We can catify or stringify, separately or together!"
  	cpp_stuff=42
-@@ -23049,6 +23089,21 @@ eval $inhdr
+@@ -23296,6 +23336,21 @@
  set fenv.h i_fenv
  eval $inhdr
  
@@ -207,7 +217,7 @@ $NetBSD: patch-Configure,v 1.3 2016/06/08 17:39:30 he Exp $
  : see if this is a fp.h system
  set fp.h i_fp
  eval $inhdr
-@@ -25402,4 +25457,3 @@ $rm -f kit*isdone ark*isdone
+@@ -25665,4 +25720,3 @@
  $rm -rf UU
  
  : End of Configure
diff --git a/lang/perl5/patches/patch-ab b/lang/perl5/patches/patch-ab
index d4c651737d1..5731f9baa00 100644
--- a/lang/perl5/patches/patch-ab
+++ b/lang/perl5/patches/patch-ab
@@ -1,6 +1,4 @@
-$NetBSD: patch-ab,v 1.20 2014/05/29 07:57:07 adam Exp $
-
-* XXX
+$NetBSD: patch-ab,v 1.21 2017/07/07 05:54:24 wiz Exp $
 
 --- installperl.orig	2014-05-26 13:34:20.000000000 +0000
 +++ installperl