pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/pkgsrc-2006Q1]: pkgsrc/devel/p5-ExtUtils-MakeMaker Pullup ticket 1354...
details: https://anonhg.NetBSD.org/pkgsrc/rev/8a684d7bf6bd
branches: pkgsrc-2006Q1
changeset: 510200:8a684d7bf6bd
user: salo <salo%pkgsrc.org@localhost>
date: Thu Apr 13 15:52:19 2006 +0000
description:
Pullup ticket 1354 - requested by jlam
vendor path related fixes for p5-ExtUtils-MakeMaker
Revisions pulled up:
- pkgsrc/devel/p5-ExtUtils-MakeMaker/Makefile 1.3
- pkgsrc/devel/p5-ExtUtils-MakeMaker/distinfo 1.2
- pkgsrc/devel/p5-ExtUtils-MakeMaker/patches/patch-aa 1.1
- pkgsrc/devel/p5-ExtUtils-MakeMaker/patches/patch-ab 1.1
- pkgsrc/devel/p5-ExtUtils-MakeMaker/patches/patch-ac 1.1
Module Name: pkgsrc
Committed By: jlam
Date: Mon Apr 10 18:24:34 UTC 2006
Modified Files:
pkgsrc/devel/p5-ExtUtils-MakeMaker: Makefile distinfo
Added Files:
pkgsrc/devel/p5-ExtUtils-MakeMaker/patches: patch-aa patch-ab patch-ac
Log Message:
Honor INSTALLSITESCRIPT and INSTALLVENDORSCRIPT for site- and
vendor-specific locations for scripts installed by Perl modules. By
default, site scripts go into lib/perl5/site_perl/bin and vendor scripts
go into lib/perl5/vendor_perl/bin. This matches the behavior of the
ExtUtils::MakeMaker that is in pkgsrc perl (which has been similarly
patched). This package now doesn't overwrite the "instmodsh" script
installed by the perl package.
Bump the PKGREVISION to 1.
diffstat:
devel/p5-ExtUtils-MakeMaker/Makefile | 3 +-
devel/p5-ExtUtils-MakeMaker/distinfo | 5 +-
devel/p5-ExtUtils-MakeMaker/patches/patch-aa | 50 ++++++++++++++++++++++++
devel/p5-ExtUtils-MakeMaker/patches/patch-ab | 57 ++++++++++++++++++++++++++++
devel/p5-ExtUtils-MakeMaker/patches/patch-ac | 46 ++++++++++++++++++++++
5 files changed, 159 insertions(+), 2 deletions(-)
diffs (192 lines):
diff -r a3b326b77f95 -r 8a684d7bf6bd devel/p5-ExtUtils-MakeMaker/Makefile
--- a/devel/p5-ExtUtils-MakeMaker/Makefile Sun Apr 09 19:53:29 2006 +0000
+++ b/devel/p5-ExtUtils-MakeMaker/Makefile Thu Apr 13 15:52:19 2006 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2006/03/04 21:29:21 jlam Exp $
+# $NetBSD: Makefile,v 1.2.2.1 2006/04/13 15:52:19 salo Exp $
#
DISTNAME= ExtUtils-MakeMaker-6.30
PKGNAME= p5-${DISTNAME}
+PKGREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=../by-authors/id/M/MS/MSCHWERN/}
diff -r a3b326b77f95 -r 8a684d7bf6bd devel/p5-ExtUtils-MakeMaker/distinfo
--- a/devel/p5-ExtUtils-MakeMaker/distinfo Sun Apr 09 19:53:29 2006 +0000
+++ b/devel/p5-ExtUtils-MakeMaker/distinfo Thu Apr 13 15:52:19 2006 +0000
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/02/15 23:17:46 abs Exp $
+$NetBSD: distinfo,v 1.1.1.1.2.1 2006/04/13 15:52:19 salo Exp $
SHA1 (ExtUtils-MakeMaker-6.30.tar.gz) = 6845b52970a35ef7cfddce8b2a9fc23b0a2b3812
RMD160 (ExtUtils-MakeMaker-6.30.tar.gz) = 3cf6d412e1fb10bd7a432216a860df4e5d1d862d
Size (ExtUtils-MakeMaker-6.30.tar.gz) = 219796 bytes
+SHA1 (patch-aa) = 0fc10ce8e19cb0e8e717cbd23d756c42c77ed1b7
+SHA1 (patch-ab) = 44ece83764cdbb06a8d3e1f4725ebf2a51050f67
+SHA1 (patch-ac) = a53b5fb16fb196b8d2b0bcbcc7bb177ae68b0f72
diff -r a3b326b77f95 -r 8a684d7bf6bd devel/p5-ExtUtils-MakeMaker/patches/patch-aa
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/p5-ExtUtils-MakeMaker/patches/patch-aa Thu Apr 13 15:52:19 2006 +0000
@@ -0,0 +1,50 @@
+$NetBSD: patch-aa,v 1.1.2.2 2006/04/13 15:52:19 salo Exp $
+
+--- lib/ExtUtils/MM_Any.pm.orig 2005-04-27 16:09:47.000000000 -0400
++++ lib/ExtUtils/MM_Any.pm
+@@ -1052,6 +1052,15 @@ sub init_INSTALL_from_PREFIX {
+ : '';
+ }
+
++ $self->{INSTALLSITESCRIPT} ||= '$(INSTALLSCRIPT)'
++ unless $Config{installsitescript};
++
++ unless( $Config{installvendorscript} ) {
++ $self->{INSTALLVENDORSCRIPT} ||= $Config{usevendorprefix}
++ ? $Config{installscript}
++ : '';
++ }
++
+
+ my $iprefix = $Config{installprefixexp} || $Config{installprefix} ||
+ $Config{prefixexp} || $Config{prefix} || '';
+@@ -1111,6 +1120,12 @@ sub init_INSTALL_from_PREFIX {
+ script => { s => $iprefix,
+ t => 'perl',
+ d => 'bin' },
++ vendorscript => { s => $vprefix,
++ t => 'vendor',
++ d => 'bin' },
++ sitescript => { s => $sprefix,
++ t => 'site',
++ d => 'bin' },
+ );
+
+ my %man_layouts =
+@@ -1253,7 +1268,6 @@ sub init_INSTALL_from_INSTALLBASE {
+ # Adjust for variable quirks.
+ $install{INSTALLARCHLIB} ||= delete $install{INSTALLARCH};
+ $install{INSTALLPRIVLIB} ||= delete $install{INSTALLLIB};
+- delete @install{qw(INSTALLVENDORSCRIPT INSTALLSITESCRIPT)};
+
+ foreach my $key (keys %install) {
+ $self->{$key} ||= $install{$key};
+@@ -1627,7 +1641,7 @@ sub installvars {
+ return qw(PRIVLIB SITELIB VENDORLIB
+ ARCHLIB SITEARCH VENDORARCH
+ BIN SITEBIN VENDORBIN
+- SCRIPT
++ SCRIPT SITESCRIPT VENDORSCRIPT
+ MAN1DIR SITEMAN1DIR VENDORMAN1DIR
+ MAN3DIR SITEMAN3DIR VENDORMAN3DIR
+ );
diff -r a3b326b77f95 -r 8a684d7bf6bd devel/p5-ExtUtils-MakeMaker/patches/patch-ab
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/p5-ExtUtils-MakeMaker/patches/patch-ab Thu Apr 13 15:52:19 2006 +0000
@@ -0,0 +1,57 @@
+$NetBSD: patch-ab,v 1.1.2.2 2006/04/13 15:52:19 salo Exp $
+
+--- lib/ExtUtils/MM_Unix.pm.orig 2005-05-20 19:05:33.000000000 -0400
++++ lib/ExtUtils/MM_Unix.pm
+@@ -12,8 +12,8 @@ use DirHandle;
+
+ use vars qw($VERSION @ISA
+ $Is_OS2 $Is_VMS $Is_Win32 $Is_Dos
+- $Is_OSF $Is_IRIX $Is_NetBSD $Is_BSD
+- $Is_SunOS4 $Is_Solaris $Is_SunOS $Is_Interix
++ $Is_OSF $Is_IRIX $Is_BSD
++ $Is_SunOS4 $Is_Solaris $Is_SunOS
+ $Verbose %pm
+ %Config_Override
+ );
+@@ -32,13 +32,11 @@ BEGIN {
+ $Is_VMS = $^O eq 'VMS';
+ $Is_OSF = $^O eq 'dec_osf';
+ $Is_IRIX = $^O eq 'irix';
+- $Is_NetBSD = $^O eq 'netbsd';
+- $Is_Interix = $^O eq 'interix';
+ $Is_SunOS4 = $^O eq 'sunos';
+ $Is_Solaris = $^O eq 'solaris';
+ $Is_SunOS = $Is_SunOS4 || $Is_Solaris;
+ $Is_BSD = $^O =~ /^(?:free|net|open)bsd$/ or
+- $^O eq 'bsdos' or $^O eq 'interix';
++ $^O eq 'bsdos' or $^O eq 'dragonfly' or $^O eq 'interix';
+ }
+
+ BEGIN {
+@@ -928,7 +926,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $
+
+ my $libs = '$(LDLOADLIBS)';
+
+- if (($Is_NetBSD || $Is_Interix) && $Config{'useshrplib'}) {
++ if ($Is_BSD && $Config{'useshrplib'}) {
+ # Use nothing on static perl platforms, and to the flags needed
+ # to link against the shared libperl library on shared perl
+ # platforms. We peek at lddlflags to see if we need -Wl,-R
+@@ -2074,7 +2072,7 @@ pure_site_install ::
+ $(INST_LIB) $(DESTINSTALLSITELIB) \
+ $(INST_ARCHLIB) $(DESTINSTALLSITEARCH) \
+ $(INST_BIN) $(DESTINSTALLSITEBIN) \
+- $(INST_SCRIPT) $(DESTINSTALLSCRIPT) \
++ $(INST_SCRIPT) $(DESTINSTALLSITESCRIPT) \
+ $(INST_MAN1DIR) $(DESTINSTALLSITEMAN1DIR) \
+ $(INST_MAN3DIR) $(DESTINSTALLSITEMAN3DIR)
+ $(NOECHO) $(WARN_IF_OLD_PACKLIST) \
+@@ -2087,7 +2085,7 @@ pure_vendor_install ::
+ $(INST_LIB) $(DESTINSTALLVENDORLIB) \
+ $(INST_ARCHLIB) $(DESTINSTALLVENDORARCH) \
+ $(INST_BIN) $(DESTINSTALLVENDORBIN) \
+- $(INST_SCRIPT) $(DESTINSTALLSCRIPT) \
++ $(INST_SCRIPT) $(DESTINSTALLVENDORSCRIPT) \
+ $(INST_MAN1DIR) $(DESTINSTALLVENDORMAN1DIR) \
+ $(INST_MAN3DIR) $(DESTINSTALLVENDORMAN3DIR)
+
diff -r a3b326b77f95 -r 8a684d7bf6bd devel/p5-ExtUtils-MakeMaker/patches/patch-ac
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/p5-ExtUtils-MakeMaker/patches/patch-ac Thu Apr 13 15:52:19 2006 +0000
@@ -0,0 +1,46 @@
+$NetBSD: patch-ac,v 1.1.2.2 2006/04/13 15:52:19 salo Exp $
+
+--- lib/ExtUtils/MakeMaker.pm.orig 2005-05-20 19:08:36.000000000 -0400
++++ lib/ExtUtils/MakeMaker.pm
+@@ -222,7 +222,7 @@ sub full_setup {
+ INSTALLMAN1DIR INSTALLMAN3DIR
+ INSTALLSITEMAN1DIR INSTALLSITEMAN3DIR
+ INSTALLVENDORMAN1DIR INSTALLVENDORMAN3DIR
+- INSTALLSCRIPT
++ INSTALLSCRIPT INSTALLSITESCRIPT INSTALLVENDORSCRIPT
+ PERL_LIB PERL_ARCHLIB
+ SITELIBEXP SITEARCHEXP
+
+@@ -1545,7 +1545,7 @@ Defaults to $Config{installprivlib}.
+ =item INSTALLSCRIPT
+
+ Used by 'make install' which copies files from INST_SCRIPT to this
+-directory.
++directory if INSTALLDIRS is set to perl.
+
+ =item INSTALLSITEARCH
+
+@@ -1572,6 +1572,11 @@ $(SITEPREFIX)/man/man$(MAN*EXT).
+
+ If set to 'none', no man pages will be installed.
+
++=item INSTALLSITESCRIPT
++
++Used by 'make install' which copies files from INST_SCRIPT to this
++directory if INSTALLDIRS is set to site (default).
++
+ =item INSTALLVENDORARCH
+
+ Used by 'make install', which copies files from INST_ARCHLIB to this
+@@ -1596,6 +1601,11 @@ INSTALLDIRS=vendor. Defaults to $(VENDO
+
+ If set to 'none', no man pages will be installed.
+
++=item INSTALLVENDORSCRIPT
++
++Used by 'make install' which copies files from INST_SCRIPT to this
++directory if INSTALLDIRS is set to vendor.
++
+ =item INST_ARCHLIB
+
+ Same as INST_LIB for architecture dependent files.
Home |
Main Index |
Thread Index |
Old Index