perl: updated to 5.30.0

what is new for perl v5.30.0

Core Enhancements
   Limited variable length lookbehind in regular expression pattern matching is now experimentally supported
       Using a lookbehind assertion (like "(?<=foo?)" or "(?<!ba{1,9}r)" previously would generate an error and
       refuse to compile.  Now it compiles (if the maximum lookbehind is at most 255 characters), but raises a
       warning in the new "experimental::vlb" warnings category.  This is to caution you that the precise behavior
       is subject to change based on feedback from use in the field.

       See "(?<=pattern)" in perlre and "(?<!pattern)" in perlre.

   The upper limit "n" specifiable in a regular expression quantifier of the form "{m,n}" has been doubled to 65534
       The meaning of an unbounded upper quantifier "{m,}" remains unchanged.  It matches 2**31 - 1 times on most
       platforms, and more on ones where a C language short variable is more than 4 bytes long.

   Unicode 12.1 is supported
       Because of a change in Unicode release cycles, Perl jumps from Unicode 10.0 in Perl 5.28 to Unicode 12.1 in
       Perl 5.30.

       For details on the Unicode changes, see <https://www.unicode.org/versions/Unicode11.0.0/> for 11.0;
       <https://www.unicode.org/versions/Unicode12.0.0/> for 12.0; and
       <https://www.unicode.org/versions/Unicode12.1.0/> for 12.1.  (Unicode 12.1 differs from 12.0 only in the
       addition of a single character, that for the new Japanese era name.)

       The Word_Break property, as in past Perl releases, remains tailored to behave more in line with expectations
       of Perl users.  This means that sequential runs of horizontal white space characters are not broken apart,
       but kept as a single run.  Unicode 11 changed from past versions to be more in line with Perl, but it left
       several white space characters as causing breaks: TAB, NO BREAK SPACE, and FIGURE SPACE (U+2007).  We have
       decided to continue to use the previous Perl tailoring with regards to these.

   Wildcards in Unicode property value specifications are now partially supported
       You can now do something like this in a regular expression pattern

        qr! \p{nv= /(?x) \A [0-5] \z / }!

       which matches all Unicode code points whose numeric value is between 0 and 5 inclusive.  So, it could match
       the Thai or Bengali digits whose numeric values are 0, 1, 2, 3, 4, or 5.

       This marks another step in implementing the regular expression features the Unicode Consortium suggests.

       Most properties are supported, with the remainder planned for 5.32.  Details are in "Wildcards in Property
       Values" in perlunicode.

   qr'\N{name}' is now supported
       Previously it was an error to evaluate a named character "\N{...}" within a single quoted regular expression
       pattern (whose evaluation is deferred from the normal place).  This restriction is now removed.

   Turkic UTF-8 locales are now seamlessly supported
       Turkic languages have different casing rules than other languages for the characters "i" and "I".  The
       uppercase of "i" is LATIN CAPITAL LETTER I WITH DOT ABOVE (U+0130); and the lowercase of "I" is LATIN SMALL
       LETTER DOTLESS I (U+0131).  Unicode furnishes alternate casing rules for use with Turkic languages.
       Previously, Perl ignored these, but now, it uses them when it detects that it is operating under a Turkic
       UTF-8 locale.

   It is now possible to compile perl to always use thread-safe locale operations.
       Previously, these calls were only used when the perl was compiled to be multi-threaded.  To always enable
       them, add

        -Accflags='-DUSE_THREAD_SAFE_LOCALE'

       to your Configure flags.

   Eliminate opASSIGN macro usage from core
       This macro is still defined but no longer used in core

   "-Drv" now means something on "-DDEBUGGING" builds
       Now, adding the verbose flag ("-Dv") to the "-Dr" flag turns on all possible regular expression debugging.

Incompatible Changes
   Assigning non-zero to $[ is fatal
       Setting $[ to a non-zero value has been deprecated since Perl 5.12 and now throws a fatal error.  See
       "Assigning non-zero to $[ is fatal" in perldeprecation.

   Delimiters must now be graphemes
       See "Use of unassigned code point or non-standalone grapheme for a delimiter." in perldeprecation

   Some formerly deprecated uses of an unescaped left brace "{" in regular expression patterns are now illegal
       But to avoid breaking code unnecessarily, most instances that issued a deprecation warning, remain legal and
       now have a non-deprecation warning raised.  See "Unescaped left braces in regular expressions" in
       perldeprecation.

   Previously deprecated sysread()/syswrite() on :utf8 handles is now fatal
       Calling sysread(), syswrite(), send() or recv() on a ":utf8" handle, whether applied explicitly or
       implicitly, is now fatal.  This was deprecated in perl 5.24.

       There were two problems with calling these functions on ":utf8" handles:

       o   All four functions only paid attention to the ":utf8" flag.  Other layers were completely ignored, so a
           handle with ":encoding(UTF-16LE)" layer would be treated as UTF-8.  Other layers, such as compression
           are completely ignored with or without the ":utf8" flag.

       o   sysread() and recv() would read from the handle, skipping any validation by the layers, and do no
           validation of their own.  This could lead to invalidly encoded perl scalars.


   my() in false conditional prohibited

       Declarations such as "my $x if 0" are no longer permitted.

   Fatalize $* and $#
       These special variables, long deprecated, now throw exceptions when used.

   Fatalize unqualified use of dump()
       The "dump()" function, long discouraged, may no longer be used unless it is fully qualified, i.e.,
       "CORE::dump()".

   Remove File::Glob::glob()
       The "File::Glob::glob()" function, long deprecated, has been removed and now throws an exception which
       advises use of "File::Glob::bsd_glob()" instead.

   "pack()" no longer can return malformed UTF-8
       It croaks if it would otherwise return a UTF-8 string that contains malformed UTF-8.  This protects against
       potential security threats.  This is considered a bug fix as well.

   Any set of digits in the Common script are legal in a script run of another script
       There are several sets of digits in the Common script.  "[0-9]" is the most familiar.  But there are also
       "[\x{FF10}-\x{FF19}]" (FULLWIDTH DIGIT ZERO - FULLWIDTH DIGIT NINE), and several sets for use in
       mathematical notation, such as the MATHEMATICAL DOUBLE-STRUCK DIGITs.  Any of these sets should be able to
       appear in script runs of, say, Greek.  But the design of 5.30 overlooked all but the ASCII digits "[0-9]",
       so the design was flawed.  This has been fixed, so is both a bug fix and an incompatibility.

       All digits in a run still have to come from the same set of ten digits.

   JSON::PP enables allow_nonref by default
       As JSON::XS 4.0 changed its policy and enabled allow_nonref by default, JSON::PP also enabled allow_nonref
       by default.

Deprecations
   In XS code, use of various macros dealing with UTF-8.
       This deprecation was scheduled to become fatal in 5.30, but has been delayed to 5.32 due to problems that
       showed up with some CPAN modules.  For details of what's affected, see perldeprecation.

Performance Enhancements
       o   Translating from UTF-8 into the code point it represents now is done via a deterministic finite
           automaton, speeding it up.  As a typical example, "ord("\x7fff")" now requires 12% fewer instructions
           than before.  The performance of checking that a sequence of bytes is valid UTF-8 is similarly improved,
           again by using a DFA.

       o   Eliminate recursion from finalize_op().

       o   A handful of small optimizations related to character folding and character classes in regular
           expressions.

       o   Optimization of "IV" to "UV" conversions.

       o   Speed up of the integer stringification algorithm by processing two digits at a time instead of one.

       o   Improvements based on LGTM analysis and recommendation.

       o   Code optimizations in regcomp.c, regcomp.h, regexec.c.

       o   Regular expression pattern matching of things like "qr/[^a]/" is significantly sped up, where a is any
           ASCII character.  Other classes can get this speed up, but which ones is complicated and depends on the
           underlying bit patterns of those characters, so differs between ASCII and EBCDIC platforms, but all case
           pairs, like "qr/[Gg]/" are included, as is "[^01]".

12 files changed, 44 insertions, 140 deletions

diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile
index 61ae49babf7..67bca082eef 100644
--- a/lang/perl5/Makefile
+++ b/lang/perl5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.254 2019/05/05 07:58:38 adam Exp $
+# $NetBSD: Makefile,v 1.255 2019/08/11 10:14:17 adam Exp $
 
 .include "license.mk"
 .include "Makefile.common"
@@ -239,7 +239,7 @@ SUBST_VARS.policysh+=	SYSLIBPATH
 .include "../../mk/dlopen.buildlink3.mk"
 .include "options.mk"
 
-.if !empty(MACHINE_PLATFORM:MMirBSD)
+.if ${MACHINE_PLATFORM} == "MirBSD"
 SUBST_CLASSES+=			mirbsd-paths
 SUBST_STAGE.mirbsd-paths=	pre-configure
 SUBST_FILES.mirbsd-paths=	hints/mirbsd.sh
@@ -285,13 +285,7 @@ SUBST_FILES.dirmode=	installhtml install_lib.pl
 SUBST_SED.dirmode=	-e "s/755/${PKGDIRMODE}/g;/umask(/d"
 
 post-extract:
-	cp ${FILESDIR}/Policy.sh ${WRKSRC}/Policy.sh
-	cp ${FILESDIR}/cpan-DB_File-hints-netbsd.pl \
-		${WRKSRC}/cpan/DB_File/hints/netbsd.pl
-	cp ${FILESDIR}/cpan-DB_File-hints-openbsd.pl \
-		${WRKSRC}/cpan/DB_File/hints/openbsd.pl
-	cp ${FILESDIR}/cpan-DB_File-hints-minix.pl \
-		${WRKSRC}/cpan/DB_File/hints/minix.pl
+	${CP} ${FILESDIR}/Policy.sh ${WRKSRC}/Policy.sh
 
 pre-configure:
 	${FIND} ${WRKSRC} -name "*.orig" -type f -exec rm -f {} \;
diff --git a/lang/perl5/Makefile.common b/lang/perl5/Makefile.common
index fbbb1b04daa..693a821d060 100644
--- a/lang/perl5/Makefile.common
+++ b/lang/perl5/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.36 2019/04/23 09:27:46 adam Exp $
+# $NetBSD: Makefile.common,v 1.37 2019/08/11 10:14:17 adam Exp $
 #
 # used by lang/perl5/Makefile
 # used by databases/p5-gdbm/Makefile
 
-DISTNAME=	perl-5.28.2
+DISTNAME=	perl-5.30.0
 CATEGORIES=	lang devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:S,/modules/by-module/$,/src/5.0/,}
 DISTFILES+=	${DISTNAME}${EXTRACT_SUFX}
diff --git a/lang/perl5/buildlink3.mk b/lang/perl5/buildlink3.mk
index b954fe69fa3..6bb34025f7c 100644
--- a/lang/perl5/buildlink3.mk
+++ b/lang/perl5/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.62 2018/08/22 09:42:52 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.63 2019/08/11 10:14:17 adam Exp $
 
 BUILDLINK_TREE+=	perl
 
@@ -6,13 +6,13 @@ BUILDLINK_TREE+=	perl
 PERL_BUILDLINK3_MK:=
 
 .include "../../mk/bsd.fast.prefs.mk"
-PERL5_REQD+=			5.28.0
+PERL5_REQD+=			5.30.0
 .for _perl5_ver_ in ${PERL5_REQD}
 BUILDLINK_API_DEPENDS.perl+=	perl>=${_perl5_ver_}
 .endfor
-# Prevent p5-* etc. packages built for 5.28.0 to be used
+# Prevent p5-* etc. packages built for 5.30.0 to be used
 # with the next incompatible version of perl:
-BUILDLINK_API_DEPENDS.perl+=	perl<5.30.0
+BUILDLINK_API_DEPENDS.perl+=	perl<=5.30.0
 
 BUILDLINK_PKGSRCDIR.perl?=	../../lang/perl5
 
diff --git a/lang/perl5/distinfo b/lang/perl5/distinfo
index 4ef7eb3b53c..2541c0716d7 100644
--- a/lang/perl5/distinfo
+++ b/lang/perl5/distinfo
@@ -1,19 +1,17 @@
-$NetBSD: distinfo,v 1.157 2019/04/23 09:27:46 adam Exp $
+$NetBSD: distinfo,v 1.158 2019/08/11 10:14:17 adam Exp $
 
-SHA1 (perl-5.28.2.tar.xz) = e7be78eca9ac5596783e6abcf957408050a7b650
-RMD160 (perl-5.28.2.tar.xz) = 8ec4c3a3fa2df12c47cf3e9613dc215333f3d042
-SHA512 (perl-5.28.2.tar.xz) = 0f2e4f7cb5d8cf6e00054b3842907e29b6c85902d97fb881d5bea65edbc875fef4e15e064561fac7c8db4939586576dd76a225026c7cca9624261c887b1fdb08
-Size (perl-5.28.2.tar.xz) = 12374448 bytes
-SHA1 (patch-Configure) = 00754ccc8bbeb38f8a0363d1bfba908fea9ef4d6
-SHA1 (patch-Makefile.SH) = a267630c3476baf6361e35a914f7cc741e313e72
+SHA1 (perl-5.30.0.tar.xz) = cc8d1e08ffe4624c197a44d02855632725d39f8e
+RMD160 (perl-5.30.0.tar.xz) = 64ff4c65823122c337e18278585d71def1de9c5d
+SHA512 (perl-5.30.0.tar.xz) = 68a295eccd64debd9d6a10f0d5577f872a19ad8c2d702798f6b0f45b8c3af6ab3230768056e2131e9e2e2506d1035b27cfd627c845e32263fe448649c4b98ae9
+Size (perl-5.30.0.tar.xz) = 12419868 bytes
+SHA1 (patch-Configure) = 6000aafeb993fd096c9b1327302b510aa0d386bb
+SHA1 (patch-Makefile.SH) = 93cae9736ef94cdd9e5748f7e0a0183332c2f3b3
 SHA1 (patch-caretx.c) = b76b4175a58123fa4dfd2adf36b2207dcb6cf65a
 SHA1 (patch-cflags.SH) = 7ad64e5a17b876bff4bbe238abc4a57354acf4fe
 SHA1 (patch-cpan_ExtUtils-MakeMaker_lib_ExtUtils_MM__Unix.pm) = 3a2b39c9eb903e68ef7d03ae448c51c147c19aa1
-SHA1 (patch-dist_Storable_Makefile.PL) = 9664a9851d08eeb078da12210a41190d082aab9b
 SHA1 (patch-hints_cygwin.sh) = 1b21d927d6b7379754c4cd64a2b05d3632c35470
 SHA1 (patch-hints_linux.sh) = 4baa8f80695687abb53d4f4e1830cf86db5b2bf7
 SHA1 (patch-hints_minix.sh) = cb62ad0be5c38ca5b79f180252ca0843a0444f8a
 SHA1 (patch-hints_netbsd.sh) = 0d549a48800372d75fe34b783529a78cba90f646
 SHA1 (patch-hints_solaris__2.sh) = 0e54889648a6f0f2a0232c5e01bef89d245c213d
 SHA1 (patch-installperl) = 0ad5988b7cadfb13d9646a59a57f6cf884a6238a
-SHA1 (patch-t_io_fs.t) = a9d13eeec22733e4087942f217a0d47a19498a6f
diff --git a/lang/perl5/files/cpan-DB_File-hints-bitrig.pl b/lang/perl5/files/cpan-DB_File-hints-bitrig.pl
deleted file mode 100644
index dd1b432476d..00000000000
--- a/lang/perl5/files/cpan-DB_File-hints-bitrig.pl
+++ /dev/null
@@ -1,6 +0,0 @@
-# $NetBSD: cpan-DB_File-hints-bitrig.pl,v 1.1 2015/06/05 12:25:30 sevan Exp $
-
-# cpan/DB_File:
-# Bitrig does not provide -ldb, so avoid linking to it
-
-$self->{LIBS} = [''];
diff --git a/lang/perl5/files/cpan-DB_File-hints-minix.pl b/lang/perl5/files/cpan-DB_File-hints-minix.pl
deleted file mode 100644
index f3443e9fd7b..00000000000
--- a/lang/perl5/files/cpan-DB_File-hints-minix.pl
+++ /dev/null
@@ -1,6 +0,0 @@
-# $NetBSD: cpan-DB_File-hints-minix.pl,v 1.1 2018/10/29 14:25:25 sevan Exp $
-
-# cpan/DB_File:
-# Minix through NetBSD does not provide -ldb, so avoid linking to it
-
-$self->{LIBS} = [''];
diff --git a/lang/perl5/files/cpan-DB_File-hints-netbsd.pl b/lang/perl5/files/cpan-DB_File-hints-netbsd.pl
deleted file mode 100644
index aa2de3357cd..00000000000
--- a/lang/perl5/files/cpan-DB_File-hints-netbsd.pl
+++ /dev/null
@@ -1,6 +0,0 @@
-# $NetBSD: cpan-DB_File-hints-netbsd.pl,v 1.1 2011/09/17 18:51:36 brook Exp $
-
-# cpan/DB_File:
-# NetBSD does not provide -ldb, so avoid linking to it
-
-$self->{LIBS} = [''];
diff --git a/lang/perl5/files/cpan-DB_File-hints-openbsd.pl b/lang/perl5/files/cpan-DB_File-hints-openbsd.pl
deleted file mode 100644
index 1a79a39bda8..00000000000
--- a/lang/perl5/files/cpan-DB_File-hints-openbsd.pl
+++ /dev/null
@@ -1,6 +0,0 @@
-# $NetBSD: cpan-DB_File-hints-openbsd.pl,v 1.1 2014/01/24 16:37:19 ryoon Exp $
-
-# cpan/DB_File:
-# OpenBSD does not provide -ldb, so avoid linking to it
-
-$self->{LIBS} = [''];
diff --git a/lang/perl5/patches/patch-Configure b/lang/perl5/patches/patch-Configure
index 9a72daaaa70..ee270fbec2a 100644
--- a/lang/perl5/patches/patch-Configure
+++ b/lang/perl5/patches/patch-Configure
@@ -1,4 +1,4 @@
-$NetBSD: patch-Configure,v 1.7 2018/10/29 14:25:25 sevan Exp $
+$NetBSD: patch-Configure,v 1.8 2019/08/11 10:14:18 adam Exp $
 
 * Use "uname -r" to get OS version for *BSD.
 * Move $loclibpth to the end of $dlist, instead of the beginning.
@@ -7,9 +7,9 @@ $NetBSD: patch-Configure,v 1.7 2018/10/29 14:25:25 sevan Exp $
 * Add Minix
 * Several other changes.
 
---- Configure.orig	Mon May 21 12:29:23 2018
-+++ Configure	Mon Oct 29 01:18:22 2018
-@@ -3471,13 +3471,14 @@
+--- Configure.orig	2019-05-11 09:50:20.000000000 +0000
++++ Configure
+@@ -3475,13 +3475,14 @@ EOM
  			osvers="$3"
  			;;
  		dragonfly) osname=dragonfly
@@ -26,9 +26,9 @@ $NetBSD: patch-Configure,v 1.7 2018/10/29 14:25:25 sevan Exp $
  		genix)	osname=genix ;;
  		gnu)	osname=gnu
  			osvers="$3" ;;
-@@ -3499,8 +3500,11 @@
- 			;;
- 		MiNT)	osname=mint
+@@ -3506,8 +3507,11 @@ EOM
+ 		minix)	osname=minix
+ 			osvers=`$uname -r`
  			;;
 +		minix*) osname=minix
 +			osvers=`$uname -r`
@@ -39,7 +39,7 @@ $NetBSD: patch-Configure,v 1.7 2018/10/29 14:25:25 sevan Exp $
  			;;
  		news-os) osvers="$3"
  			case "$3" in
-@@ -3510,7 +3514,7 @@
+@@ -3517,7 +3521,7 @@ EOM
  			;;
  		nonstop-ux) osname=nonstopux ;;
  		openbsd) osname=openbsd
@@ -48,7 +48,7 @@ $NetBSD: patch-Configure,v 1.7 2018/10/29 14:25:25 sevan Exp $
  			;;
  		os2)	osname=os2
  			osvers="$4"
-@@ -3525,6 +3529,9 @@
+@@ -3532,6 +3536,9 @@ EOM
  		qnx) osname=qnx
  			osvers="$4"
  			;;
@@ -58,7 +58,7 @@ $NetBSD: patch-Configure,v 1.7 2018/10/29 14:25:25 sevan Exp $
  		solaris) osname=solaris
  			case "$3" in
  			5*) osvers=`echo $3 | $sed 's/^5/2/g'` ;;
-@@ -4963,7 +4970,7 @@
+@@ -4970,7 +4977,7 @@ esac
  # 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.
@@ -67,7 +67,7 @@ $NetBSD: patch-Configure,v 1.7 2018/10/29 14:25:25 sevan Exp $
      gcc)
  	$echo 'extern int foo;' > try.c
  	set X `$cppstdin -v try.c 2>&1 | $awk '/^#include </,/^End of search /'|$cppfilter $grep '/include'`
-@@ -5039,14 +5046,14 @@
+@@ -5046,14 +5053,14 @@ case "$plibpth" in
  esac
  case "$libpth" in
  ' ') dlist='';;
@@ -84,7 +84,7 @@ $NetBSD: patch-Configure,v 1.7 2018/10/29 14:25:25 sevan Exp $
  		case " $libpth " in
  		*" $xxx "*) ;;
  		*) libpth="$libpth $xxx";;
-@@ -5162,7 +5169,7 @@
+@@ -5169,7 +5176,7 @@ lib_ext=$_a
  obj_ext=$_o
  path_sep=$p_
  
@@ -93,7 +93,7 @@ $NetBSD: patch-Configure,v 1.7 2018/10/29 14:25:25 sevan Exp $
  
  : Which makefile gets called first.  This is used by make depend.
  case "$firstmakefile" in
-@@ -5493,7 +5500,7 @@
+@@ -5500,7 +5507,7 @@ default|recommended)
  	# thing. (NWC)
  	case "$osname" in
  	amigaos) ;; # -fstack-protector builds but doesn't work
@@ -102,7 +102,7 @@ $NetBSD: patch-Configure,v 1.7 2018/10/29 14:25:25 sevan Exp $
  		?*)	set stack-protector-strong -fstack-protector-strong
  			eval $checkccflag
  			case "$dflt" in
-@@ -6477,6 +6484,15 @@
+@@ -6484,6 +6491,15 @@ case "$nm_so_opt" in
  	;;
  esac
  
@@ -118,7 +118,7 @@ $NetBSD: patch-Configure,v 1.7 2018/10/29 14:25:25 sevan Exp $
  : Figure out where the libc is located
  case "$runnm" in
  true)
-@@ -7604,7 +7620,9 @@
+@@ -7611,7 +7627,9 @@ rp='Pathname for the site-specific libra
  . ./getfile
  prefixvar=sitelib
  . ./setprefixvar
@@ -129,7 +129,7 @@ $NetBSD: patch-Configure,v 1.7 2018/10/29 14:25:25 sevan Exp $
  
  : Determine list of previous versions to include in @INC
  $cat > getverlist <<EOPL
-@@ -8015,7 +8033,9 @@
+@@ -8022,7 +8040,9 @@ case "$vendorprefix" in
  	vendorlibexp="$ansexp"
  	;;
  esac
@@ -140,7 +140,7 @@ $NetBSD: patch-Configure,v 1.7 2018/10/29 14:25:25 sevan Exp $
  prefixvar=vendorlib
  . ./installprefix
  
-@@ -8511,6 +8531,7 @@
+@@ -8518,6 +8538,7 @@ EOM
  			  esac
  			  ;;
  		    *linux*|irix*|gnu*)  dflt="-shared $optimize" ;;
@@ -148,7 +148,7 @@ $NetBSD: patch-Configure,v 1.7 2018/10/29 14:25:25 sevan Exp $
  		    solaris) # See [perl #66604].
  			    # On Solaris 11, gcc -m64 on amd64
  			    # appears not to understand -G.  gcc versions at
-@@ -8550,7 +8571,7 @@
+@@ -8557,7 +8578,7 @@ EOM
  	esac
  	for thisflag in $ldflags; do
  	    case "$thisflag" in
@@ -157,14 +157,7 @@ $NetBSD: patch-Configure,v 1.7 2018/10/29 14:25:25 sevan Exp $
  		    case " $dflt " in
  			*" $thisflag "*) ;;
  			*) dflt="$dflt $thisflag" ;;
-@@ -8803,12 +8824,16 @@
- 	solaris)
- 		xxx="-R $shrpdir"
- 		;;
--	freebsd|mirbsd|netbsd|openbsd|interix|dragonfly|bitrig)
-+	freebsd|minix|mirbsd|netbsd|openbsd|interix|dragonfly|bitrig)
- 		xxx="-Wl,-R$shrpdir"
- 		;;
+@@ -8816,6 +8837,10 @@ if "$useshrplib"; then
  	bsdos|linux|irix*|dec_osf|gnu*|haiku)
  		xxx="-Wl,-rpath,$shrpdir"
  		;;
@@ -175,7 +168,7 @@ $NetBSD: patch-Configure,v 1.7 2018/10/29 14:25:25 sevan Exp $
  	hpux*)
  		# hpux doesn't like the default, either.
  		tmp_shrpenv="env LDOPTS=\"+s +b${shrpdir}\""
-@@ -8816,6 +8841,9 @@
+@@ -8823,6 +8848,9 @@ if "$useshrplib"; then
  	cygwin)
  		# cygwin needs only ldlibpth
  		;;
@@ -185,7 +178,7 @@ $NetBSD: patch-Configure,v 1.7 2018/10/29 14:25:25 sevan Exp $
  	*)
  		tmp_shrpenv="env LD_RUN_PATH=$shrpdir"
  		;;
-@@ -9896,6 +9924,13 @@
+@@ -9903,6 +9931,13 @@ esac
  : Check if we want perlio
  useperlio="$define"
  
@@ -199,7 +192,7 @@ $NetBSD: patch-Configure,v 1.7 2018/10/29 14:25:25 sevan Exp $
  : Set the vendorbin variables
  case "$vendorprefix" in
  '')	d_vendorbin="$undef"
-@@ -19825,7 +19860,15 @@
+@@ -20058,7 +20093,15 @@ RCAT(Rei,ser)
  ACAT(Cir,cus)
  EOCP
  $cppstdin $cppflags $cppminus <cpp_stuff.c >cpp_stuff.out 2>&1
@@ -216,7 +209,7 @@ $NetBSD: patch-Configure,v 1.7 2018/10/29 14:25:25 sevan Exp $
  	echo "Oh!  Smells like ANSI's been here." >&4
  	echo "We can catify or stringify, separately or together!"
  	cpp_stuff=42
-@@ -22641,6 +22684,21 @@
+@@ -22864,6 +22907,21 @@ eval $inhdr
  set fenv.h i_fenv
  eval $inhdr
  
@@ -238,8 +231,3 @@ $NetBSD: patch-Configure,v 1.7 2018/10/29 14:25:25 sevan Exp $
  : see if this is a fp.h system
  set fp.h i_fp
  eval $inhdr
-@@ -25015,4 +25073,3 @@
- $rm -rf UU
- 
- : End of Configure
--
diff --git a/lang/perl5/patches/patch-Makefile.SH b/lang/perl5/patches/patch-Makefile.SH
index 336c3ae2827..cbeecd1ea71 100644
--- a/lang/perl5/patches/patch-Makefile.SH
+++ b/lang/perl5/patches/patch-Makefile.SH
@@ -1,13 +1,11 @@
-$NetBSD: patch-Makefile.SH,v 1.8 2019/04/23 09:27:46 adam Exp $
+$NetBSD: patch-Makefile.SH,v 1.9 2019/08/11 10:14:18 adam Exp $
 
 Use correct -install_name on Darwin.
 Fix DTrace object generation.
-Fix Storable build on OS X where DYLD_LIBRARY_PATH is no longer
-inherited by child processes.
 
---- Makefile.SH.orig	2019-04-02 22:36:35.000000000 +0200
-+++ Makefile.SH	2019-04-23 10:07:15.000000000 +0200
-@@ -70,7 +70,7 @@
+--- Makefile.SH.orig	2019-05-11 23:02:19.000000000 +0000
++++ Makefile.SH
+@@ -70,7 +70,7 @@ true)
  				${revision}.${patchlevel}.${subversion}"
  		case "$osvers" in
  	        1[5-9]*|[2-9]*)
@@ -16,7 +14,7 @@ inherited by child processes.
  			exeldflags="-Xlinker -headerpad_max_install_names"
  			;;
  		*)
-@@ -283,6 +283,7 @@
+@@ -278,6 +278,7 @@ LNS = $lns
  # NOTE: some systems don't grok "cp -f". XXX Configure test needed?
  CPS = $cp
  RMS = rm -f
@@ -24,12 +22,3 @@ inherited by child processes.
  ranlib = $ranlib
  
  # The following are mentioned only to make metaconfig include the
-@@ -1197,7 +1198,7 @@
- $spitshell >>$Makefile <<EOT
- 
- dist/Storable/lib/Storable/Limit.pm : \$(PERL_EXE) dist/Storable/stacksize $storable_limit_dep
--	cd dist/Storable ; \$(LDLIBPTH) \$(MAKE) lib/Storable/Limit.pm
-+	cd dist/Storable ; LDLIBPTH=\$(LDLIBPTH) \$(MAKE) lib/Storable/Limit.pm
- 
- lib/Storable/Limit.pm : dist/Storable/lib/Storable/Limit.pm
- 	test -d lib/Storable || mkdir lib/Storable
diff --git a/lang/perl5/patches/patch-dist_Storable_Makefile.PL b/lang/perl5/patches/patch-dist_Storable_Makefile.PL
deleted file mode 100644
index 7f8e79ff3dd..00000000000
--- a/lang/perl5/patches/patch-dist_Storable_Makefile.PL
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-dist_Storable_Makefile.PL,v 1.2 2019/04/23 09:27:46 adam Exp $
-
-Fix Storable build on OS X where DYLD_LIBRARY_PATH is no longer
-inherited by child processes.
-
---- dist/Storable/Makefile.PL.orig	2019-04-02 20:36:35.000000000 +0000
-+++ dist/Storable/Makefile.PL
-@@ -102,7 +102,7 @@ sub depend {
-     "
- $limit_pm : stacksize \$(INST_$linktype)$extra_deps
- 	\$(MKPATH) \$(INST_LIB)
--	$whichperl stacksize $options
-+	\$(LDLIBPTH) $whichperl stacksize $options
- 
- release : dist
- 	git tag \$(VERSION)
diff --git a/lang/perl5/patches/patch-t_io_fs.t b/lang/perl5/patches/patch-t_io_fs.t
deleted file mode 100644
index 6f7dc138fa1..00000000000
--- a/lang/perl5/patches/patch-t_io_fs.t
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-t_io_fs.t,v 1.1 2019/04/23 09:27:46 adam Exp $
-
-On NetBSD, filesystems may be mounted with the noatime option.
-
---- t/io/fs.t.orig	2013-05-01 02:52:56.000000000 +0000
-+++ t/io/fs.t
-@@ -275,15 +275,15 @@ sub check_utime_result {
- 		is( $atime, 500000001,          'atime' );
- 		is( $mtime, 500000000 + $delta, 'mtime' );
- 	    }
--	    elsif ($^O eq 'haiku') {
-+	    elsif ($^O eq 'haiku' || $^O eq 'netbsd') {
-             SKIP: {
- 		    skip "atime not updated", 1;
- 		}
- 		is($mtime, 500000001, 'mtime');
- 	    }
- 	    else {
--		fail("atime");
--		fail("mtime");
-+		fail("atime: expected 500000000, got ${atime}");
-+		fail("mtime: expected ".(500000000+$delta).", got ${mtime}");
- 	    }
- 	}
-     }