Import of pkgsrc-2015Q2

This commit is contained in:
2016-01-21 23:41:46 +01:00
committed by sambuc
parent 4af1cdf7a9
commit f641581404
15409 changed files with 267784 additions and 121624 deletions
+4 -3
View File
@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.233 2014/11/22 03:04:31 wiz Exp $
# $NetBSD: Makefile,v 1.235 2015/06/24 11:43:42 he Exp $
.include "license.mk"
.include "Makefile.common"
@@ -193,6 +193,7 @@ SUBST_VARS.policysh+= FALSE
# dependencies. If this isn't defined, then use the perl defaults for the
# particular operating system.
#
LIBSWANTED.Bitrig= m crypt
LIBSWANTED.Cygwin= m crypt dl
LIBSWANTED.Darwin= m c
LIBSWANTED.DragonFly= m crypt
@@ -216,6 +217,7 @@ SUBST_VARS.policysh+= LIBSWANTED
# If this isn't defined, then use the perl defaults for the particular
# operating system.
#
SYSLIBPATH.Bitrig= /usr/lib
SYSLIBPATH.Cygwin= /usr/lib
SYSLIBPATH.Darwin= /usr/lib
SYSLIBPATH.DragonFly= /usr/lib
@@ -277,8 +279,7 @@ SUBST_SED.cpprun= -e "s/cpprun=''/cpprun='cc -E'/"
#
SUBST_CLASSES+= dirmode
SUBST_STAGE.dirmode= post-patch
SUBST_FILES.dirmode= installhtml install_lib.pl \
dist/ExtUtils-Install/lib/ExtUtils/Install.pm
SUBST_FILES.dirmode= installhtml install_lib.pl
SUBST_SED.dirmode= -e "s/755/${PKGDIRMODE}/g;/umask(/d"
post-extract:
+2 -2
View File
@@ -1,9 +1,9 @@
# $NetBSD: Makefile.common,v 1.23 2015/02/25 14:56:45 wiz Exp $
# $NetBSD: Makefile.common,v 1.24 2015/06/11 13:44:23 adam Exp $
#
# used by lang/perl5/Makefile
# used by databases/p5-gdbm/Makefile
DISTNAME= perl-5.20.2
DISTNAME= perl-5.22.0
CATEGORIES= lang devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:S,/modules/by-module/$,/src/5.0/,}
DISTFILES+= ${DISTNAME}${EXTRACT_SUFX}
+4 -4
View File
@@ -1,4 +1,4 @@
# $NetBSD: buildlink3.mk,v 1.55 2014/12/30 15:13:19 wiz Exp $
# $NetBSD: buildlink3.mk,v 1.56 2015/06/11 13:44:23 adam Exp $
BUILDLINK_TREE+= perl
@@ -6,13 +6,13 @@ BUILDLINK_TREE+= perl
PERL_BUILDLINK3_MK:=
.include "../../mk/bsd.fast.prefs.mk"
PERL5_REQD+= 5.20.0
PERL5_REQD+= 5.22.0
.for _perl5_ver_ in ${PERL5_REQD}
BUILDLINK_API_DEPENDS.perl+= perl>=${_perl5_ver_}
.endfor
# Prevent p5-* etc. packages built for 5.20.0 to be used
# Prevent p5-* etc. packages built for 5.22.0 to be used
# with the next incompatible version of perl:
BUILDLINK_API_DEPENDS.perl+= perl<5.22.0
BUILDLINK_API_DEPENDS.perl+= perl<5.24.0
BUILDLINK_PKGSRCDIR.perl?= ../../lang/perl5
+8 -9
View File
@@ -1,25 +1,24 @@
$NetBSD: distinfo,v 1.126 2015/02/25 14:56:45 wiz Exp $
$NetBSD: distinfo,v 1.129 2015/06/24 11:43:42 he Exp $
SHA1 (perl-5.20.2.tar.bz2) = 63126c683b4c79c35008a47d56f7beae876c569f
RMD160 (perl-5.20.2.tar.bz2) = a24d4c70846ae4332d01d8d56696a55bf492f44b
Size (perl-5.20.2.tar.bz2) = 13717128 bytes
SHA1 (perl-5.22.0.tar.bz2) = 400338c91c56420d98142cbfcb84d418cae2c98c
RMD160 (perl-5.22.0.tar.bz2) = 16f3ac6c5d4d72e599222bcbf2591c3b2aa2f857
Size (perl-5.22.0.tar.bz2) = 13811518 bytes
SHA1 (patch-Makefile.SH) = 92c623fe1ea024b05f47bcfee7002e02647d5062
SHA1 (patch-aa) = 441ad4f0d27d9be0fcdce31c9d35d35d98958518
SHA1 (patch-aa) = 9bbcc9395080b11934528a32808e0a509f1d831c
SHA1 (patch-ab) = c899b7221a78e74cc9b1480834baba047dd19f38
SHA1 (patch-ac) = 4baa8f80695687abb53d4f4e1830cf86db5b2bf7
SHA1 (patch-ah) = c1cb4ddb6db49dcfe12bb1d47911668b2318b953
SHA1 (patch-aq) = 4bf5a76f0277b0939b2ca7720f4bb045a788b5cc
SHA1 (patch-ca) = d4a924b4e78d210d143f4e40f63082b6d42fc0e8
SHA1 (patch-ca) = 5d9085d12042e4745cc0d56457b02169824fd85d
SHA1 (patch-ch) = 5b6a89c82e158bab0a5f06add48c28e600678099
SHA1 (patch-ck) = 5c381db130cdf4c315678e2d65380eaaa3065fee
SHA1 (patch-cn) = d1877383e213a414562b5bb4c1e8aa785926fab7
SHA1 (patch-cpan_Socket_Socket.xs) = 9390c42ad456b0ea114c2e57e4d829d630fb698e
SHA1 (patch-ext_Errno_Errno__pm.PL) = 4f135e267da17de38f8f1e7e03d5209bfd09a323
SHA1 (patch-hints_cygwin.sh) = 1b21d927d6b7379754c4cd64a2b05d3632c35470
SHA1 (patch-hints_darwin.sh) = 15596f109f317ffb14c695b4196bb37699d2f34b
SHA1 (patch-hints_darwin.sh) = bb4ea9e16a1d441388b8e9cdd37a7d757f3f1687
SHA1 (patch-hints_netbsd.sh) = 0d549a48800372d75fe34b783529a78cba90f646
SHA1 (patch-hints_sco.sh) = 8d43cdc0632799e1cdb5dc6fdb968052a9ae4216
SHA1 (patch-install__lib.pl) = 31e9e0fc34386542dd6a60bf6ca0a607babbd4b6
SHA1 (patch-hints_solaris__2.sh) = f054d36917c74df8219c0fc84e9b20fa312a56a3
SHA1 (patch-ta) = a9d13eeec22733e4087942f217a0d47a19498a6f
SHA1 (patch-zd) = 469602bc04b217f2d9929f5caeab43f77a74076f
SHA1 (patch-ze) = d6fb718a1417e37a7d6bee1ae89fe2beec51c81b
@@ -0,0 +1,6 @@
# $NetBSD: cpan-DB_File-hints-bitrig.pl,v 1.1 2015/06/05 12:25:30 sevan Exp $
# cpan/DB_File:
# Bitrig does not provide -ldb, so avoid linking to it
$self->{LIBS} = [''];
+10 -11
View File
@@ -1,4 +1,4 @@
# $NetBSD: hacks.mk,v 1.14 2014/12/15 11:46:35 jperkin Exp $
# $NetBSD: hacks.mk,v 1.16 2015/05/17 12:57:16 bsiegert Exp $
.if !defined(PERL5_HACKS_MK)
PERL5_HACKS_MK= defined
@@ -28,16 +28,6 @@ CFLAGS+= -DDEBUGGING -g -msoft-quad-float -O2
. endif
.endif
### [Sun Nov 14 02:35:50 EST 2004 : jlam]
### On PowerPC, building with optimisation with GCC causes an "attempt
### to free unreference scalar". Remove optimisation flags as a
### workaround until GCC is fixed.
###
.if !empty(CC_VERSION:Mgcc*) && !empty(MACHINE_PLATFORM:MNetBSD-*-powerpc)
PKG_HACKS+= powerpc-codegen
BUILDLINK_TRANSFORM+= rm:-O[0-9]*
.endif
### [Mon May 9 15:35:44 UTC 2005 : jlam]
### On NetBSD/arm, skipping one part of the optimization pass empirically
### "fixes" the build of perl using gcc-3.x.
@@ -75,4 +65,13 @@ PKG_HACKS+= alpha-optimisation
CFLAGS+=-fno-tree-ter
.endif
### [Thu May 14 23:17:20 JST 2015 : ryoon]
### Force to use /usr/sfw/lib/amd64/libgcc_s.co.1 instead.
.if !empty(MACHINE_PLATFORM:MSunOS-5.10-x86_64)
. if !empty(CC_VERSION:Mgcc-3.4.3)
BUILDLINK_PASSTHRU_RPATHDIRS+= /usr/sfw/lib/amd64
LDFLAGS+= ${COMPILER_RPATH_FLAG}/usr/sfw/lib/amd64
. endif
.endif
.endif # PERL5_HACKS_MK
+6 -6
View File
@@ -1,9 +1,9 @@
$NetBSD: patch-aa,v 1.36 2014/05/29 07:57:07 adam Exp $
$NetBSD: patch-aa,v 1.37 2015/06/11 13:44:23 adam Exp $
* $Is{NetBSD} and $Is{Interix} are unified into $Is{BSD}.
* Ignore installed packlist when creating new packlist.
--- cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm.orig 2014-05-26 13:34:19.000000000 +0000
--- cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm.orig 2015-05-16 12:23:24.000000000 +0000
+++ cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
@@ -29,8 +29,6 @@ BEGIN {
$Is{VMS} = $^O eq 'VMS';
@@ -14,7 +14,7 @@ $NetBSD: patch-aa,v 1.36 2014/05/29 07:57:07 adam Exp $
$Is{SunOS4} = $^O eq 'sunos';
$Is{Solaris} = $^O eq 'solaris';
$Is{SunOS} = $Is{SunOS4} || $Is{Solaris};
@@ -934,7 +932,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $
@@ -955,7 +953,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $
my $libs = '$(LDLOADLIBS)';
@@ -23,12 +23,12 @@ $NetBSD: patch-aa,v 1.36 2014/05/29 07:57:07 adam Exp $
# 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
@@ -2116,7 +2114,7 @@ pure_vendor_install :: all
@@ -2159,7 +2157,7 @@ pure_vendor_install :: all
$(NOECHO) $(MOD_INSTALL) \
};
push @m,
-q{ read }.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{ \
-q{ read "}.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{" \
+q{ read "" \
write }.$self->catfile('$(DESTINSTALLVENDORARCH)','auto','$(FULLEXT)','.packlist').q{ \
write "}.$self->catfile('$(DESTINSTALLVENDORARCH)','auto','$(FULLEXT)','.packlist').q{" \
} unless $self->{NO_PACKLIST};
+60 -37
View File
@@ -1,12 +1,13 @@
$NetBSD: patch-ca,v 1.22 2015/02/25 14:56:45 wiz Exp $
$NetBSD: patch-ca,v 1.24 2015/06/24 11:43:42 he Exp $
* Use "uname -r" to get OS version for *BSD.
* Move $loclibpth to the end of $dlist, instead of the beginning.
* Detect systems which have <fenv.h> but where using it fails.
* Several other changes.
--- Configure.orig 2015-01-10 12:06:37.000000000 +0000
--- Configure.orig 2015-05-13 20:19:28.000000000 +0000
+++ Configure
@@ -3372,13 +3372,14 @@ EOM
@@ -3439,13 +3439,14 @@ EOM
osvers="$3"
;;
dragonfly) osname=dragonfly
@@ -23,7 +24,7 @@ $NetBSD: patch-ca,v 1.22 2015/02/25 14:56:45 wiz Exp $
genix) osname=genix ;;
gnu) osname=gnu
osvers="$3" ;;
@@ -3401,7 +3402,7 @@ EOM
@@ -3468,7 +3469,7 @@ EOM
MiNT) osname=mint
;;
netbsd*) osname=netbsd
@@ -32,8 +33,8 @@ $NetBSD: patch-ca,v 1.22 2015/02/25 14:56:45 wiz Exp $
;;
news-os) osvers="$3"
case "$3" in
@@ -3412,7 +3413,7 @@ EOM
next*) osname=next ;;
@@ -3478,7 +3479,7 @@ EOM
;;
nonstop-ux) osname=nonstopux ;;
openbsd) osname=openbsd
- osvers="$3"
@@ -41,7 +42,7 @@ $NetBSD: patch-ca,v 1.22 2015/02/25 14:56:45 wiz Exp $
;;
os2) osname=os2
osvers="$4"
@@ -3427,6 +3428,9 @@ EOM
@@ -3493,6 +3494,9 @@ EOM
qnx) osname=qnx
osvers="$4"
;;
@@ -51,7 +52,7 @@ $NetBSD: patch-ca,v 1.22 2015/02/25 14:56:45 wiz Exp $
solaris) osname=solaris
case "$3" in
5*) osvers=`echo $3 | $sed 's/^5/2/g'` ;;
@@ -4865,7 +4869,7 @@ esac
@@ -4931,7 +4935,7 @@ esac
# If using gcc or clang, we can get better values for libpth, incpth
# and usrinc directly from the compiler.
# Note that ccname for clang is also gcc.
@@ -60,7 +61,7 @@ $NetBSD: patch-ca,v 1.22 2015/02/25 14:56:45 wiz Exp $
gcc)
$echo 'extern int foo;' > try.c
set X `$cppstdin -v try.c 2>&1 | $awk '/^#include </,/^End of search /'|$cppfilter $grep '/include'`
@@ -4941,14 +4945,14 @@ case "$plibpth" in
@@ -5007,14 +5011,14 @@ case "$plibpth" in
esac
case "$libpth" in
' ') dlist='';;
@@ -77,7 +78,7 @@ $NetBSD: patch-ca,v 1.22 2015/02/25 14:56:45 wiz Exp $
case " $libpth " in
*" $xxx "*) ;;
*) libpth="$libpth $xxx";;
@@ -5064,7 +5068,7 @@ lib_ext=$_a
@@ -5130,7 +5134,7 @@ lib_ext=$_a
obj_ext=$_o
path_sep=$p_
@@ -86,7 +87,23 @@ $NetBSD: patch-ca,v 1.22 2015/02/25 14:56:45 wiz Exp $
: Which makefile gets called first. This is used by make depend.
case "$firstmakefile" in
@@ -6767,7 +6771,9 @@ rp='Pathname for the site-specific libra
@@ -6416,6 +6420,15 @@ case "$nm_so_opt" in
;;
esac
+: Mac OS X 10.7 is different
+case "$osname" in
+ darwin)
+ case "$osvers" in
+ 11.*)
+ libnames="$libnames /usr/lib/system/libsystem_*.dylib"
+ esac
+esac
+
: Figure out where the libc is located
case "$runnm" in
true)
@@ -7490,7 +7503,9 @@ rp='Pathname for the site-specific libra
. ./getfile
prefixvar=sitelib
. ./setprefixvar
@@ -97,7 +114,7 @@ $NetBSD: patch-ca,v 1.22 2015/02/25 14:56:45 wiz Exp $
: Determine list of previous versions to include in @INC
$cat > getverlist <<EOPL
@@ -7179,7 +7185,9 @@ case "$vendorprefix" in
@@ -7902,7 +7917,9 @@ case "$vendorprefix" in
vendorlibexp="$ansexp"
;;
esac
@@ -108,33 +125,17 @@ $NetBSD: patch-ca,v 1.22 2015/02/25 14:56:45 wiz Exp $
prefixvar=vendorlib
. ./installprefix
@@ -7656,6 +7664,15 @@ case "$nm_so_opt" in
;;
esac
+: Mac OS X 10.7 is different
+case "$osname" in
+ darwin)
+ case "$osvers" in
+ 11.*)
+ libnames="$libnames /usr/lib/system/libsystem_*.dylib"
+ esac
+esac
+
: Figure out where the libc is located
case "$runnm" in
true)
@@ -8240,6 +8257,7 @@ EOM
@@ -8443,6 +8460,7 @@ EOM
esac
;;
*linux*|irix*|gnu*) dflt="-shared $optimize" ;;
next) dflt='none' ;;
+ sco_sv) dflt='-shared' ;;
+ sco_sv) dflt='-shared' ;;
solaris) # See [perl #66604].
# On Solaris 11, gcc -m64 on amd64
# appears not to understand -G. gcc versions at
@@ -8548,6 +8566,10 @@ if "$useshrplib"; then
next)
# next doesn't like the default...
@@ -8741,6 +8759,10 @@ if "$useshrplib"; then
bsdos|linux|irix*|dec_osf|gnu*|haiku)
xxx="-Wl,-rpath,$shrpdir"
;;
+ haiku)
+ # Haiku doesn't like the default, either.
@@ -143,7 +144,7 @@ $NetBSD: patch-ca,v 1.22 2015/02/25 14:56:45 wiz Exp $
hpux*)
# hpux doesn't like the default, either.
tmp_shrpenv="env LDOPTS=\"+s +b${shrpdir}\""
@@ -8555,6 +8577,9 @@ if "$useshrplib"; then
@@ -8748,6 +8770,9 @@ if "$useshrplib"; then
cygwin)
# cygwin needs only ldlibpth
;;
@@ -153,7 +154,7 @@ $NetBSD: patch-ca,v 1.22 2015/02/25 14:56:45 wiz Exp $
*)
tmp_shrpenv="env LD_RUN_PATH=$shrpdir"
;;
@@ -9630,6 +9655,13 @@ esac
@@ -9826,6 +9851,13 @@ esac
: Check if we want perlio
useperlio="$define"
@@ -167,7 +168,7 @@ $NetBSD: patch-ca,v 1.22 2015/02/25 14:56:45 wiz Exp $
: Set the vendorbin variables
case "$vendorprefix" in
'') d_vendorbin="$undef"
@@ -19363,7 +19395,15 @@ RCAT(Rei,ser)
@@ -20129,7 +20161,15 @@ RCAT(Rei,ser)
ACAT(Cir,cus)
EOCP
$cppstdin $cppflags $cppminus <cpp_stuff.c >cpp_stuff.out 2>&1
@@ -184,3 +185,25 @@ $NetBSD: patch-ca,v 1.22 2015/02/25 14:56:45 wiz Exp $
echo "Oh! Smells like ANSI's been here." >&4
echo "We can catify or stringify, separately or together!"
cpp_stuff=42
@@ -22645,6 +22685,21 @@ eval $inhdr
set fenv.h i_fenv
eval $inhdr
+: And really validate that it is OK to include it
+: On NetBSD 6.x non-amd64 non-i386 and non-sparc this fails
+cat > try.c <<EOCP
+#include <fenv.h>
+int main() {
+ printf("runs ok too\n");
+ exit(0);
+}
+EOCP
+set try
+if ! eval $compile_ok; then
+ echo "<fenv.h> found to be unusable, disabling" >&4
+ i_fenv=$undef
+fi
+
: see if this is a fp.h system
set fp.h i_fp
eval $inhdr
+7 -6
View File
@@ -1,19 +1,20 @@
$NetBSD: patch-hints_darwin.sh,v 1.5 2014/11/22 15:45:41 bsiegert Exp $
$NetBSD: patch-hints_darwin.sh,v 1.6 2015/06/11 13:44:23 adam Exp $
MACOSX_DEVELOPMENT_TARGET is required on version of OS X pre 10.6
See Perl bug #117433
--- hints/darwin.sh.orig 2014-09-14 11:31:02.000000000 +0000
--- hints/darwin.sh.orig 2015-05-13 20:19:29.000000000 +0000
+++ hints/darwin.sh
@@ -185,13 +185,16 @@ case "$osvers" in
@@ -200,7 +200,7 @@ case "$osvers" in
ldflags="${ldflags} -flat_namespace"
lddlflags="${ldflags} -bundle -undefined suppress"
;;
-*)
+[7-9].*)
+[7-9].*)
# MACOSX_DEPLOYMENT_TARGET selects the minimum OS level we want to support
# https://developer.apple.com/library/mac/documentation/DeveloperTools/Conceptual/cross_development/Configuring/configuring.html
lddlflags="${ldflags} -bundle -undefined dynamic_lookup"
case "$ld" in
*MACOSX_DEVELOPMENT_TARGET*) ;;
@@ -209,6 +209,9 @@ case "$osvers" in
*) ld="env MACOSX_DEPLOYMENT_TARGET=10.3 ${ld}" ;;
esac
;;
@@ -0,0 +1,15 @@
$NetBSD: patch-hints_solaris__2.sh,v 1.1 2015/05/15 14:32:27 ryoon Exp $
Redo PR pkg/44999.
--- hints/solaris_2.sh.orig 2014-12-27 11:48:52.000000000 +0000
+++ hints/solaris_2.sh
@@ -622,7 +622,7 @@ EOM
# use that with Solaris 11 and later, but keep
# the old behavior for older Solaris versions.
case "$osvers" in
- 2.?|2.10) lddlflags="$lddlflags -G -m64" ;;
+ 2.?|2.10) lddlflags="$lddlflags -shared -m64" ;;
*) lddlflags="$lddlflags -shared -m64" ;;
esac
;;
-14
View File
@@ -1,14 +0,0 @@
$NetBSD: patch-install__lib.pl,v 1.1 2014/06/07 11:58:39 obache Exp $
* File::Copy is used for the case link() is not usable.
--- install_lib.pl.orig 2014-06-07 09:51:07.000000000 +0000
+++ install_lib.pl
@@ -8,6 +8,7 @@ use vars qw($Is_VMS $Is_W32 $Is_OS2 $Is_
%opts $packlist);
use subs qw(unlink link chmod);
require File::Path;
+require File::Copy;
BEGIN {
require Config;
-14
View File
@@ -1,14 +0,0 @@
$NetBSD: patch-zd,v 1.4 2012/10/03 19:59:47 adam Exp $
--- cpan/Module-Build/t/tilde.t.orig 2012-04-25 00:18:31.000000000 +0000
+++ cpan/Module-Build/t/tilde.t
@@ -44,6 +44,9 @@ SKIP: {
$home =~ s#/$##;
}
+ if ($home =~ /work\/.home/) {
+ skip "Skipping test in pkgsrc env to avoid FAKE_HOME trouble", 15;
+ }
unless (defined $home) {
my @info = eval { getpwuid $> };
skip "No home directory for tilde-expansion tests", 15 if $@