diff options
| author | ryoon <ryoon@pkgsrc.org> | 2013-12-28 16:46:29 +0000 |
|---|---|---|
| committer | ryoon <ryoon@pkgsrc.org> | 2013-12-28 16:46:29 +0000 |
| commit | 081ab00f478acd6752648d669dfad0da86fb09da (patch) | |
| tree | fa024ef18307f0b66cb184591c81f0db2b7b9f6a /pkgtools | |
| parent | ab401cd4d05a0855cc631bf1736e65e5ea6188c2 (diff) | |
| download | pkgsrc-081ab00f478acd6752648d669dfad0da86fb09da.tar.gz | |
Update to 2.18
* Partial fix for PR pkg/47335
** Define some variables
** Define empty function neatvalue
** Generate Makefile before custom MakeMaker.pm invocation
to avoid no Makefile error.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/url2pkg/Makefile | 5 | ||||
| -rw-r--r-- | pkgtools/url2pkg/files/MakeMaker.pm | 11 | ||||
| -rw-r--r-- | pkgtools/url2pkg/files/url2pkg.pl | 5 |
3 files changed, 17 insertions, 4 deletions
diff --git a/pkgtools/url2pkg/Makefile b/pkgtools/url2pkg/Makefile index 1ddebf96e40..e34ed2c100c 100644 --- a/pkgtools/url2pkg/Makefile +++ b/pkgtools/url2pkg/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.69 2013/05/31 12:41:47 wiz Exp $ +# $NetBSD: Makefile,v 1.70 2013/12/28 16:46:29 ryoon Exp $ # -DISTNAME= url2pkg-2.17 -PKGREVISION= 1 +DISTNAME= url2pkg-2.18 CATEGORIES= pkgtools MASTER_SITES= # none DISTFILES= # none diff --git a/pkgtools/url2pkg/files/MakeMaker.pm b/pkgtools/url2pkg/files/MakeMaker.pm index fa833fbdcf1..ff2ceb4d4f8 100644 --- a/pkgtools/url2pkg/files/MakeMaker.pm +++ b/pkgtools/url2pkg/files/MakeMaker.pm @@ -53,6 +53,13 @@ BEGIN { @EXPORT = qw(WriteMakefile prompt); } +# From lib/perl5/5.18.0/ExtUtils/MakeMaker.pm +our $VERSION = '6.66'; + +our $Verbose = 0; # exported +our @EXPORT = qw($Verbose $version); +our @EXPORT_OK = qw(&neatvalue); + # Finds and returns the category a given package lies in. # If the package does not exist, C<undef> is returned. # If the package exists more than once, it is unspecified which @@ -107,4 +114,8 @@ sub prompt(@) { return $default || ""; } +sub neatvalue { + return; +} + 1; diff --git a/pkgtools/url2pkg/files/url2pkg.pl b/pkgtools/url2pkg/files/url2pkg.pl index 8e2c0eefe06..f9e93a23162 100644 --- a/pkgtools/url2pkg/files/url2pkg.pl +++ b/pkgtools/url2pkg/files/url2pkg.pl @@ -1,5 +1,5 @@ #! @PERL@ -# $NetBSD: url2pkg.pl,v 1.22 2013/05/14 19:42:38 wiz Exp $ +# $NetBSD: url2pkg.pl,v 1.23 2013/12/28 16:46:29 ryoon Exp $ # # Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -178,6 +178,9 @@ 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; while (defined(my $dep = <DEPS>)) { chomp($dep); |