diff options
-rw-r--r-- | devel/p5-local-lib/Makefile | 8 | ||||
-rw-r--r-- | devel/p5-local-lib/distinfo | 9 | ||||
-rw-r--r-- | devel/p5-local-lib/patches/patch-aa | 73 |
3 files changed, 83 insertions, 7 deletions
diff --git a/devel/p5-local-lib/Makefile b/devel/p5-local-lib/Makefile index 4717c7860cb..4c3944ceccf 100644 --- a/devel/p5-local-lib/Makefile +++ b/devel/p5-local-lib/Makefile @@ -1,10 +1,11 @@ -# $NetBSD: Makefile,v 1.2 2009/02/26 22:48:43 seb Exp $ +# $NetBSD: Makefile,v 1.3 2009/08/23 13:47:03 seb Exp $ # -DISTNAME= local-lib-1.003002 -PKGNAME= p5-local-lib-1.3.2 +DISTNAME= local-lib-1.004004 +PKGNAME= p5-local-lib-1.4.4 CATEGORIES= devel perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=../../authors/id/A/AP/APEIRON/} +LICENSE= ${PERL5_LICENSE} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://search.cpan.org/dist/local-lib/ @@ -14,6 +15,7 @@ PKG_DESTDIR_SUPPORT= user-destdir USE_LANGUAGES= # empty PERL5_PACKLIST= auto/local/lib/.packlist +PERL5_MODULE_TYPE= Module::Install .include "../../lang/perl5/module.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/p5-local-lib/distinfo b/devel/p5-local-lib/distinfo index 6b246220523..f305415667d 100644 --- a/devel/p5-local-lib/distinfo +++ b/devel/p5-local-lib/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.2 2009/02/26 22:48:43 seb Exp $ +$NetBSD: distinfo,v 1.3 2009/08/23 13:47:03 seb Exp $ -SHA1 (local-lib-1.003002.tar.gz) = b2ac54ea63951e90bbfe7cdcab590ec1626883ab -RMD160 (local-lib-1.003002.tar.gz) = 145097769bf8e398a1142de49c8c50097dc2497a -Size (local-lib-1.003002.tar.gz) = 24962 bytes +SHA1 (local-lib-1.004004.tar.gz) = f85a14619e596c8b7c13dfbdf6c403328c26d319 +RMD160 (local-lib-1.004004.tar.gz) = 006a5d96118a1b89cd16e294b8afec7eb3f7186e +Size (local-lib-1.004004.tar.gz) = 31988 bytes +SHA1 (patch-aa) = 35f4d35c67f3dce9313a4f3e36f3c53196ad1e54 diff --git a/devel/p5-local-lib/patches/patch-aa b/devel/p5-local-lib/patches/patch-aa new file mode 100644 index 00000000000..ca8e4773134 --- /dev/null +++ b/devel/p5-local-lib/patches/patch-aa @@ -0,0 +1,73 @@ +$NetBSD: patch-aa,v 1.1 2009/08/23 13:47:04 seb Exp $ + +Prevent CPAN's interactive configuration process to take place! + +--- Makefile.PL.orig 2009-08-06 02:45:48.000000000 +0000 ++++ Makefile.PL +@@ -123,36 +123,36 @@ delete $ENV{PERL5_CPAN_IS_RUNNING} if $n + + # and make sure that the user doesn't have any existing CPAN config that'll + # cause us problems for the next few steps. +-{ +- local $@; +- eval { require CPAN::HandleConfig; }; +- # Need newish CPAN.pm for this, ergo skip it if that version of CPAN isn't +- # installed yet. +- # It will already be installed by the time we reach here if bootstrapping, +- # otherwise, if we're running from CPAN then it will be installed soon +- # enough, and we'll come back here.. +- if (!$@) { +- CPAN::HandleConfig->load; +- for my $eumm_setting ( qw/makepl_arg make_install_arg/ ) { +- if ($CPAN::Config->{$eumm_setting} =~ /(?:PREFIX|INSTALL_BASE)/) { +- die "Possibly invalid config detected in $eumm_setting: " . $CPAN::Config->{$eumm_setting}; +- } +- } +- +- for my $mb_setting (qw/mbuild_arg mbuild_install_arg mbuildpl_arg/) { +- if ($CPAN::Config->{$mb_setting} =~ /(?:--prefix|--install_base)/) { +- die "Possibly invalid config detected in $mb_setting: " . $CPAN::Config->{$mb_setting}; +- } +- } +- } +- else { +- my $error = $@; +- require CPAN; +- # Explode if it looks like requiring CPAN::HandleConfig should +- # have worked, but didn't. +- die($error) if $CPAN::VERSION >= $required_CPAN; +- } +-} ++#{ ++# local $@; ++# eval { require CPAN::HandleConfig; }; ++# # Need newish CPAN.pm for this, ergo skip it if that version of CPAN isn't ++# # installed yet. ++# # It will already be installed by the time we reach here if bootstrapping, ++# # otherwise, if we're running from CPAN then it will be installed soon ++# # enough, and we'll come back here.. ++# if (!$@) { ++# CPAN::HandleConfig->load; ++# for my $eumm_setting ( qw/makepl_arg make_install_arg/ ) { ++# if ($CPAN::Config->{$eumm_setting} =~ /(?:PREFIX|INSTALL_BASE)/) { ++# die "Possibly invalid config detected in $eumm_setting: " . $CPAN::Config->{$eumm_setting}; ++# } ++# } ++# ++# for my $mb_setting (qw/mbuild_arg mbuild_install_arg mbuildpl_arg/) { ++# if ($CPAN::Config->{$mb_setting} =~ /(?:--prefix|--install_base)/) { ++# die "Possibly invalid config detected in $mb_setting: " . $CPAN::Config->{$mb_setting}; ++# } ++# } ++# } ++# else { ++# my $error = $@; ++# require CPAN; ++# # Explode if it looks like requiring CPAN::HandleConfig should ++# # have worked, but didn't. ++# die($error) if $CPAN::VERSION >= $required_CPAN; ++# } ++#} + + if ($bootstrapping) { + auto_install_now; |