[pkgsrc/trunk]: pkgsrc/pkgtools/url2pkg/files pkgtools/url2pkg: fix for p5-HT...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9d1b50c99886
branches:  trunk
changeset: 399812:9d1b50c99886
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sat Aug 17 13:12:00 2019 +0000

description:
pkgtools/url2pkg: fix for p5-HTML-Quoted

diffstat:

 pkgtools/url2pkg/files/MakeMaker.pm |   6 +++++-
 pkgtools/url2pkg/files/url2pkg.pl   |  11 ++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diffs (47 lines):

diff -r 6369ff90ddbf -r 9d1b50c99886 pkgtools/url2pkg/files/MakeMaker.pm
--- a/pkgtools/url2pkg/files/MakeMaker.pm       Sat Aug 17 12:50:00 2019 +0000
+++ b/pkgtools/url2pkg/files/MakeMaker.pm       Sat Aug 17 13:12:00 2019 +0000
@@ -52,7 +52,7 @@
 
 our $Verbose   = 0;    # exported
 our @EXPORT    = qw(&WriteMakefile &prompt $Verbose $version);
-our @EXPORT_OK = qw(&neatvalue);
+our @EXPORT_OK = qw(&neatvalue &_sprintf562);
 
 # Finds and returns the category a given package lies in.
 # If the package does not exist, C<undef> is returned.
@@ -113,4 +113,8 @@
        return;
 }
 
+sub _sprintf562 {
+       return sprintf(@_);
+}
+
 1;
diff -r 6369ff90ddbf -r 9d1b50c99886 pkgtools/url2pkg/files/url2pkg.pl
--- a/pkgtools/url2pkg/files/url2pkg.pl Sat Aug 17 12:50:00 2019 +0000
+++ b/pkgtools/url2pkg/files/url2pkg.pl Sat Aug 17 13:12:00 2019 +0000
@@ -1,5 +1,5 @@
 #! @PERL@
-# $NetBSD: url2pkg.pl,v 1.40 2019/08/17 11:57:36 rillig Exp $
+# $NetBSD: url2pkg.pl,v 1.41 2019/08/17 13:12:00 rillig Exp $
 #
 
 # Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -181,10 +181,11 @@
                push(@build_vars, ["PERL5_MODULE_TYPE", "Module::Build"]);
 
        } elsif (-f "${abs_wrksrc}/Makefile.PL") {
-               # To avoid fix_up_makefile error, generate Makefile previously.
-               # Ignore exit status (no "or die").
-               system("cd ${abs_wrksrc} && perl Makefile.PL");
-               open(DEPS, "cd ${abs_wrksrc} && perl -I${perllibdir} Makefile.PL |") or die;
+
+               # To avoid fix_up_makefile error for p5-HTML-Quoted, generate Makefile first.
+               system("cd ${abs_wrksrc} && perl -I. Makefile.PL < /dev/null") or "ignore";
+
+               open(DEPS, "cd ${abs_wrksrc} && perl -I${perllibdir} -I. Makefile.PL |") or die;
                while (defined(my $dep = <DEPS>)) {
                        chomp($dep);
                        if ($dep =~ qr"\.\./\.\./") {