Import of pkgsrc-2014Q1

2014-11-05 12:41:07 +01:00
parent 785076ae39
commit 9a8c06dafb
19365 changed files with 828089 additions and 278039 deletions
@@ -1,23 +1,23 @@
-$NetBSD: patch-ab,v 1.5 2011/12/08 22:44:24 hiramatsu Exp $
+$NetBSD: patch-ab,v 1.7 2014/02/16 18:57:17 sno Exp $

 Changes:
 o More general adaptation for BSDs
 o Install scripts in DESTINSTALLSITESCRIPT instead of DESTINSTALLSCRIPT
 o Ignore installed packlist when creating new packlist.

--- lib/ExtUtils/MM_Unix.pm.orig	2011-08-05 11:13:10.000000000 +0000
+--- lib/ExtUtils/MM_Unix.pm.orig	2014-01-31 20:50:13.000000000 +0000
 +++ lib/ExtUtils/MM_Unix.pm
-@@ -932,7 +932,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $
+@@ -934,7 +934,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $
 
     my $libs = '$(LDLOADLIBS)';
 
-    if (($Is{NetBSD} || $Is{Interix}) && $Config{'useshrplib'} eq 'true') {
-+    if ($Is{BSD} && $Config{'useshrplib'} eq 'true') {
+-    if (($Is{NetBSD} || $Is{Interix} || $Is{Android}) && $Config{'useshrplib'} eq 'true') {
+    if (($Is{BSD} || $Is{Interix} || $Is{Android}) && $Config{'useshrplib'} eq 'true') {
 	# 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
-@@ -2060,7 +2060,7 @@ pure_perl_install :: all
- 		$(INST_LIB) $(DESTINSTALLPRIVLIB) \
+@@ -2087,7 +2087,7 @@ q{		read }.$self->catfile('$(PERL_ARCHLI
+ q{		$(INST_LIB) $(DESTINSTALLPRIVLIB) \
 		$(INST_ARCHLIB) $(DESTINSTALLARCHLIB) \
 		$(INST_BIN) $(DESTINSTALLBIN) \
 -		$(INST_SCRIPT) $(DESTINSTALLSCRIPT) \
@@ -25,12 +25,12 @@ Changes:
 		$(INST_MAN1DIR) $(DESTINSTALLMAN1DIR) \
 		$(INST_MAN3DIR) $(DESTINSTALLMAN3DIR)
 	$(NOECHO) $(WARN_IF_OLD_PACKLIST) \
-@@ -2082,7 +2082,7 @@ pure_site_install :: all
- 
- pure_vendor_install :: all
+@@ -2098,7 +2098,7 @@ pure_site_install :: all
 	$(NOECHO) $(MOD_INSTALL) \
-		read }.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{ \
-+		read "" \
- 		write }.$self->catfile('$(DESTINSTALLVENDORARCH)','auto','$(FULLEXT)','.packlist').q{ \
- 		$(INST_LIB) $(DESTINSTALLVENDORLIB) \
- 		$(INST_ARCHLIB) $(DESTINSTALLVENDORARCH) \
+ };
+     push @m,
+-q{		read }.$self->catfile('$(SITEARCHEXP)','auto','$(FULLEXT)','.packlist').q{ \
+q{		read "" \
+ 		write }.$self->catfile('$(DESTINSTALLSITEARCH)','auto','$(FULLEXT)','.packlist').q{ \
+ } unless $self->{NO_PACKLIST};
+