Fix build with dtrace option.

3 files changed, 12 insertions, 38 deletions

diff --git a/lang/perl5/distinfo b/lang/perl5/distinfo
index d635bace174..48694aa48fb 100644
--- a/lang/perl5/distinfo
+++ b/lang/perl5/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.142 2017/06/05 18:58:44 bsiegert Exp $
+$NetBSD: distinfo,v 1.143 2017/06/06 12:37:50 jperkin Exp $
 
 SHA1 (perl-5.26.0.tar.bz2) = 2ca1b28f2c3ed4cc3b74be89d150ed0377f0336a
 RMD160 (perl-5.26.0.tar.bz2) = a853a1ec299d7c6ba8239e8ed444ee6d922b8938
@@ -6,7 +6,7 @@ SHA512 (perl-5.26.0.tar.bz2) = 1e3849c0fbf3a1903f83f86470d44f55f0f22136a1bdeb829
 Size (perl-5.26.0.tar.bz2) = 14708010 bytes
 SHA1 (patch-Configure) = 13455c1b32b0f602b339787af4ddcd481f9c2dd5
 SHA1 (patch-MANIFEST) = b27b0e1754fe2c4484931219fa17c562db88d41a
-SHA1 (patch-Makefile.SH) = 32ffc30831b0af49f90119510021037b066367dc
+SHA1 (patch-Makefile.SH) = e9353181a286f52303d09cb4ce0b2c04ec104217
 SHA1 (patch-aa) = 3a2b39c9eb903e68ef7d03ae448c51c147c19aa1
 SHA1 (patch-ab) = c899b7221a78e74cc9b1480834baba047dd19f38
 SHA1 (patch-ac) = 4baa8f80695687abb53d4f4e1830cf86db5b2bf7
@@ -20,7 +20,6 @@ SHA1 (patch-dist_Carp_lib_Carp.pm) = fb628ee983462cec9303ceea09852378ec654ecf
 SHA1 (patch-ext_Errno_Errno__pm.PL) = 4f135e267da17de38f8f1e7e03d5209bfd09a323
 SHA1 (patch-ext_File-Glob_bsd_glob.c) = e43252b55f04bb1cd69d48e8155aa110532c9fbe
 SHA1 (patch-ext_File-Glob_t_rt131211.t) = 9aeddad078cdc920e64ed2e73f952be341745d7e
-SHA1 (patch-ext_XS-APItest_Makefile.PL) = 7094aa4cb021c1f29054a40c4f5f4c15c59f13de
 SHA1 (patch-hints_cygwin.sh) = 1b21d927d6b7379754c4cd64a2b05d3632c35470
 SHA1 (patch-hints_netbsd.sh) = 0d549a48800372d75fe34b783529a78cba90f646
 SHA1 (patch-hints_sco.sh) = 8d43cdc0632799e1cdb5dc6fdb968052a9ae4216
diff --git a/lang/perl5/patches/patch-Makefile.SH b/lang/perl5/patches/patch-Makefile.SH
index 54bf5f2e752..731e18dc7b8 100644
--- a/lang/perl5/patches/patch-Makefile.SH
+++ b/lang/perl5/patches/patch-Makefile.SH
@@ -1,15 +1,14 @@
-$NetBSD: patch-Makefile.SH,v 1.5 2016/06/14 11:47:21 jperkin Exp $
+$NetBSD: patch-Makefile.SH,v 1.6 2017/06/06 12:37:50 jperkin Exp $
 
-Do not generate DTrace objects for objects which do not contain DTrace probes.
+Fix DTrace object generation.
 
---- Makefile.SH.orig	2016-05-08 13:28:35.000000000 +0000
+--- Makefile.SH.orig	2017-05-30 09:57:56.000000000 +0000
 +++ Makefile.SH
-@@ -396,7 +396,7 @@ DTRACE_H = $dtrace_h
- 
- DTRACE_PERLLIB_O = $dtrace_perllib_o # "dtrace -G" output for perllib_objs
- DTRACE_MINI_O    = $dtrace_mini_o    # "dtrace -G" output for common and mini
--DTRACE_MAIN_O    = $dtrace_main_o    # "dtrace -G" output for perlmain.o
-+#DTRACE_MAIN_O    = $dtrace_main_o    # "dtrace -G" output for perlmain.o
- 
- FIRSTMAKEFILE = $firstmakefile
+@@ -270,6 +270,7 @@ LNS = $lns
+ # NOTE: some systems don't grok "cp -f". XXX Configure test needed?
+ CPS = $cp
+ RMS = rm -f
++ECHO = $echo
+ ranlib = $ranlib
  
+ # The following are mentioned only to make metaconfig include the
diff --git a/lang/perl5/patches/patch-ext_XS-APItest_Makefile.PL b/lang/perl5/patches/patch-ext_XS-APItest_Makefile.PL
deleted file mode 100644
index 5dd3ba6bd92..00000000000
--- a/lang/perl5/patches/patch-ext_XS-APItest_Makefile.PL
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ext_XS-APItest_Makefile.PL,v 1.1 2016/06/14 11:47:21 jperkin Exp $
-
-Do not generate DTrace objects for objects which do not contain DTrace probes.
-
---- ext/XS-APItest/Makefile.PL.orig	2016-04-06 12:31:16.000000000 +0000
-+++ ext/XS-APItest/Makefile.PL
-@@ -3,7 +3,7 @@ use ExtUtils::MakeMaker;
- use ExtUtils::Constant 0.11 'WriteConstants';
- use Config;
- 
--my $dtrace_o = $Config{dtraceobject} ? ' dtrace$(OBJ_EXT)' : '';
-+my $dtrace_o = $Config{notdtraceobject} ? ' dtrace$(OBJ_EXT)' : '';
- 
- WriteMakefile(
-     'NAME'		=> 'XS::APItest',
-@@ -49,7 +49,7 @@ sub MY::postamble
-     package MY;
-     my $post = shift->SUPER::postamble(@_);
-     use Config;
--    return $post unless $Config{dtraceobject};
-+    return $post unless $Config{notdtraceobject};
- 
-     # core.o is build using PERL_CORE, so picks up any dtrace probes
-