CVS commit: pkgsrc/pkgtools/url2pkg/files

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Sat Aug 17 13:12:00 UTC 2019

Modified Files:
        pkgsrc/pkgtools/url2pkg/files: MakeMaker.pm url2pkg.pl

Log Message:
pkgtools/url2pkg: fix for p5-HTML-Quoted


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/pkgtools/url2pkg/files/MakeMaker.pm
cvs rdiff -u -r1.40 -r1.41 pkgsrc/pkgtools/url2pkg/files/url2pkg.pl

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/pkgtools/url2pkg/files/MakeMaker.pm
diff -u pkgsrc/pkgtools/url2pkg/files/MakeMaker.pm:1.7 pkgsrc/pkgtools/url2pkg/files/MakeMaker.pm:1.8
--- pkgsrc/pkgtools/url2pkg/files/MakeMaker.pm:1.7      Sat Aug 17 12:50:00 2019
+++ pkgsrc/pkgtools/url2pkg/files/MakeMaker.pm  Sat Aug 17 13:12:00 2019
@@ -52,7 +52,7 @@ our $VERSION = '6.66';
 
 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 @@ sub neatvalue {
        return;
 }
 
+sub _sprintf562 {
+       return sprintf(@_);
+}
+
 1;

Index: pkgsrc/pkgtools/url2pkg/files/url2pkg.pl
diff -u pkgsrc/pkgtools/url2pkg/files/url2pkg.pl:1.40 pkgsrc/pkgtools/url2pkg/files/url2pkg.pl:1.41
--- pkgsrc/pkgtools/url2pkg/files/url2pkg.pl:1.40       Sat Aug 17 11:57:36 2019
+++ pkgsrc/pkgtools/url2pkg/files/url2pkg.pl    Sat Aug 17 13:12:00 2019
@@ -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 @@ sub magic_perlmod() {
                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"\.\./\.\./") {