Fri Oct 10 21:58:44 2008 UTC ()
Update perl5 from version 5.8.8nb8 to 5.10.0.

A large number of packages have had their internal regression tests
run successfully with this update, including mod_perl for Apache.

Pkgsrc changes: a number of our local patches are no longer needed.

Upstream changes from version 5.8.8:

  # Core Enhancements

    * The feature pragma
    * New -E command-line switch
    * Defined-or operator
    * Switch and Smart Match operator
    * Regular expressions
    * say()
    * Lexical $_
    * The _ prototype
    * UNITCHECK blocks
    * New Pragma, mro
    * readdir() may return a "short filename" on Windows
    * readpipe() is now overridable
    * Default argument for readline()
    * state() variables
    * Stacked filetest operators
    * UNIVERSAL::DOES()
    * Formats
    * Byte-order modifiers for pack() and unpack()
    * no VERSION
    * chdir, chmod and chown on filehandles
    * OS groups
    * Recursive sort subs
    * Exceptions in constant folding
    * Source filters in @INC
    * New internal variables
    * Miscellaneous
    * UCD 5.0.0
    * MAD
    * kill() on Windows

  # Incompatible Changes

    * Packing and UTF-8 strings
    * Byte/character count feature in unpack()
    * The $* and $# variables have been removed
    * substr() lvalues are no longer fixed-length
    * Parsing of -f _
    * :unique
    * Effect of pragmas in eval
    * chdir FOO
    * Handling of .pmc files
    * $^V is now a version object instead of a v-string
    * @- and @+ in patterns
    * $AUTOLOAD can now be tainted
    * Tainting and printf
    * undef and signal handlers
    * strictures and dereferencing in defined()
    * (?p{}) has been removed
    * Pseudo-hashes have been removed
    * Removal of the bytecode compiler and of perlcc
    * Removal of the JPL
    * Recursive inheritance detected earlier

  # Modules and Pragmata

    * Upgrading individual core modules
    * Pragmata Changes
    * New modules
    * Selected Changes to Core Modules

  # Utility Changes
  # New Documentation
  # Performance Enhancements

    * In-place sorting
    * Lexical array access
    * XS-assisted SWASHGET
    * Constant subroutines
    * PERL_DONT_CREATE_GVSV
    * Weak references are cheaper
    * sort() enhancements
    * Memory optimisations
    * UTF-8 cache optimisation
    * Sloppy stat on Windows
    * Regular expressions optimisations

  # Installation and Configuration Improvements

    * Configuration improvements
    * Compilation improvements
    * Installation improvements
    * New Or Improved Platforms

  # Selected Bug Fixes
  # New or Changed Diagnostics
  # Changed Internals

    * Reordering of SVt_* constants
    * Elimination of SVt_PVBM
    * New type SVt_BIND
    * Removal of CPP symbols
    * Less space is used by ops
    * New parser
    * Use of const
    * Mathoms
    * AvFLAGS has been removed
    * av_* changes
    * $^H and %^H
    * B:: modules inheritance changed
    * Anonymous hash and array constructors

  ...

See 'perldoc perldelta' or http://perldoc.perl.org/perldelta.html
for explanation of each of these points.


(he)
diff -r1.137 -r1.138 pkgsrc/lang/perl5/Makefile
diff -r1.49 -r1.50 pkgsrc/lang/perl5/distinfo
diff -r1.30 -r1.31 pkgsrc/lang/perl5/patches/patch-aa
diff -r1.10 -r0 pkgsrc/lang/perl5/patches/patch-ac
diff -r1.11 -r0 pkgsrc/lang/perl5/patches/patch-ad
diff -r1.11 -r0 pkgsrc/lang/perl5/patches/patch-ae
diff -r1.11 -r0 pkgsrc/lang/perl5/patches/patch-ag
diff -r1.13 -r0 pkgsrc/lang/perl5/patches/patch-af
diff -r1.9 -r1.10 pkgsrc/lang/perl5/patches/patch-ah
diff -r1.5 -r0 pkgsrc/lang/perl5/patches/patch-ai
diff -r1.9 -r0 pkgsrc/lang/perl5/patches/patch-aj
diff -r1.3 -r0 pkgsrc/lang/perl5/patches/patch-ak
diff -r1.4 -r0 pkgsrc/lang/perl5/patches/patch-am
diff -r1.4 -r0 pkgsrc/lang/perl5/patches/patch-cb
diff -r1.2 -r0 pkgsrc/lang/perl5/patches/patch-an
diff -r1.2 -r0 pkgsrc/lang/perl5/patches/patch-ce
diff -r1.2 -r0 pkgsrc/lang/perl5/patches/patch-da
diff -r1.1 -r0 pkgsrc/lang/perl5/patches/patch-ap
diff -r1.1 -r0 pkgsrc/lang/perl5/patches/patch-ar
diff -r1.1 -r1.2 pkgsrc/lang/perl5/patches/patch-aq
diff -r1.1 -r1.2 pkgsrc/lang/perl5/patches/patch-cn
diff -r1.1 -r1.2 pkgsrc/lang/perl5/patches/patch-co
diff -r1.1 -r1.2 pkgsrc/lang/perl5/patches/patch-ta
diff -r1.2 -r1.3 pkgsrc/lang/perl5/patches/patch-as
diff -r1.2 -r1.3 pkgsrc/lang/perl5/patches/patch-zc
diff -r1.4 -r1.5 pkgsrc/lang/perl5/patches/patch-ba
diff -r1.5 -r1.6 pkgsrc/lang/perl5/patches/patch-ca
diff -r1.3 -r1.4 pkgsrc/lang/perl5/patches/patch-ch
diff -r1.3 -r1.4 pkgsrc/lang/perl5/patches/patch-ci
diff -r0 -r1.1 pkgsrc/lang/perl5/patches/patch-zd

cvs diff -r1.137 -r1.138 pkgsrc/lang/perl5/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/perl5/Makefile 2008/06/01 22:04:07 1.137
+++ pkgsrc/lang/perl5/Makefile 2008/10/10 21:58:43 1.138
@@ -1,20 +1,18 @@ @@ -1,20 +1,18 @@
1# $NetBSD: Makefile,v 1.137 2008/06/01 22:04:07 he Exp $ 1# $NetBSD: Makefile,v 1.138 2008/10/10 21:58:43 he Exp $
2 2
3DISTNAME= perl-5.8.8 3DISTNAME= perl-5.10.0
4PKGREVISION= 8 
5CATEGORIES= lang devel perl5 4CATEGORIES= lang devel perl5
6MASTER_SITES= ${MASTER_SITE_PERL_CPAN:S,/modules/by-module/$,/src/,} 5MASTER_SITES= ${MASTER_SITE_PERL_CPAN:S,/modules/by-module/$,/src/,}
7EXTRACT_SUFX= .tar.bz2 
8DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} 6DISTFILES+= ${DISTNAME}${EXTRACT_SUFX}
9 7
10MAINTAINER= jlam@pkgsrc.org 8MAINTAINER= jlam@pkgsrc.org
11HOMEPAGE= http://www.perl.org/ 9HOMEPAGE= http://www.perl.org/
12COMMENT= Practical Extraction and Report Language 10COMMENT= Practical Extraction and Report Language
13#LICENSE= gnu-gpl-v2 11#LICENSE= gnu-gpl-v2
14 12
15PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
16 14
17CONFLICTS= perl-base-[0-9]* perl-thread-[0-9]* \ 15CONFLICTS= perl-base-[0-9]* perl-thread-[0-9]* \
18 p5-CGI-2.66 p5-CGI-2.75 p5-CGI-2.75.[0-2] 16 p5-CGI-2.66 p5-CGI-2.75 p5-CGI-2.75.[0-2]
19 17
20.include "../../mk/bsd.prefs.mk" 18.include "../../mk/bsd.prefs.mk"
@@ -251,26 +249,45 @@ CFLAGS+= -DDEBUGGING @@ -251,26 +249,45 @@ CFLAGS+= -DDEBUGGING
251 249
252.if !empty(LIBSWANTED) 250.if !empty(LIBSWANTED)
253CONFIGURE_ARGS+= -Dlibswanted=${LIBSWANTED:Q} 251CONFIGURE_ARGS+= -Dlibswanted=${LIBSWANTED:Q}
254.endif 252.endif
255 253
256.include "../../mk/compiler.mk" 254.include "../../mk/compiler.mk"
257 255
258.if ${OPSYS} == "IRIX" 256.if ${OPSYS} == "IRIX"
259. if defined(ABI) && ${ABI} == "64" 257. if defined(ABI) && ${ABI} == "64"
260CONFIGURE_ARGS+= -Duse64bitint 258CONFIGURE_ARGS+= -Duse64bitint
261. endif 259. endif
262.endif 260.endif
263 261
 262# Remove a spurious workdir reference
 263SUBST_CLASSES+= rm
 264SUBST_STAGE.rm= pre-install
 265SUBST_FILES.rm= lib/Config_heavy.pl
 266SUBST_SED.rm= -e "s!^rm_try=\'/.*work/.tools/bin/rm -f!rm_try=\'/bin/rm -f!"
 267
 268# Replace our perl as the interpreter
 269REPLACE_PERL+= lib/Class/ISA.pm
 270REPLACE_PERL+= lib/File/DosGlob.pm
 271REPLACE_PERL+= lib/version.pm
 272
 273# And replace a perl interpreter during the pre-install stage
 274# I think this may be a bootstrap script, so can't use REPLACE_PERL
 275# because that is acted upon already in the pre-configure stage
 276SUBST_CLASSES+= miniperl
 277SUBST_STAGE.miniperl= pre-install
 278SUBST_FILES.miniperl= lib/ExtUtils/xsubpp
 279SUBST_SED.miniperl= -e "1s:\#!./miniperl:\#!${PERL5}:"
 280
264# Some platforms may want the directory mode not to be 0755. This 281# Some platforms may want the directory mode not to be 0755. This
265# is, unfortunately, hardcoded in quite a few places in Perl, so 282# is, unfortunately, hardcoded in quite a few places in Perl, so
266# let's substitute what pkgsrc says instead. 283# let's substitute what pkgsrc says instead.
267# 284#
268SUBST_CLASSES+= dirmode 285SUBST_CLASSES+= dirmode
269SUBST_STAGE.dirmode= post-patch 286SUBST_STAGE.dirmode= post-patch
270SUBST_FILES.dirmode= installhtml installman installperl \ 287SUBST_FILES.dirmode= installhtml installman installperl \
271 lib/ExtUtils/Install.pm 288 lib/ExtUtils/Install.pm
272SUBST_SED.dirmode= -e "s/755/${PKGDIRMODE}/g;/umask(/d" 289SUBST_SED.dirmode= -e "s/755/${PKGDIRMODE}/g;/umask(/d"
273 290
274# It's tough to guess which hints file will be used, so add our modifications 291# It's tough to guess which hints file will be used, so add our modifications
275# to all of them: 292# to all of them:
276# 293#

cvs diff -r1.49 -r1.50 pkgsrc/lang/perl5/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/perl5/distinfo 2008/07/30 23:07:52 1.49
+++ pkgsrc/lang/perl5/distinfo 2008/10/10 21:58:43 1.50
@@ -1,35 +1,21 @@ @@ -1,35 +1,21 @@
1$NetBSD: distinfo,v 1.49 2008/07/30 23:07:52 ahoka Exp $ 1$NetBSD: distinfo,v 1.50 2008/10/10 21:58:43 he Exp $
2 2
3SHA1 (perl-5.8.8.tar.bz2) = 4aab490040727ca4419098720eca2ba4367df539 3SHA1 (perl-5.10.0.tar.gz) = adf73606dd5248af7ccdd735bcaa0e628ea75b3c
4RMD160 (perl-5.8.8.tar.bz2) = e78f26d9b96e6db35f946ad4ff55e3a69385c71b 4RMD160 (perl-5.10.0.tar.gz) = c6614fc99a162790a703f91085b24a60af903ba2
5Size (perl-5.8.8.tar.bz2) = 10123359 bytes 5Size (perl-5.10.0.tar.gz) = 15595020 bytes
6SHA1 (patch-aa) = 9b6844635086206dc7740103747a2b54bf987941 6SHA1 (patch-aa) = 5bd44a8076cf27e2deac52240af7f3898865859c
7SHA1 (patch-ab) = e32427327192f023477b16f29bc55fdf4f057410 7SHA1 (patch-ab) = e32427327192f023477b16f29bc55fdf4f057410
8SHA1 (patch-ac) = 428e0757495b82a47ec092a71333fb3ec366f14f 8SHA1 (patch-ah) = 1d2f4049dcc8dafcd0eafad36a74531dc7f305c9
9SHA1 (patch-ad) = 914e1c74555a9b6a0256992a694b2ba609f29786 9SHA1 (patch-aq) = 3ece22678e3e6dcd3cf641e6389ff203cbe351b9
10SHA1 (patch-ae) = 287ac0d97a5372c8b45457129f3e70fe42cf69e2 10SHA1 (patch-as) = 8656cb4d9baf43dd92f4c467aaa40802d4c43239
11SHA1 (patch-af) = b11574297e46b910f206f09702effc6cc272b0fd 11SHA1 (patch-ba) = dc150656628e83e25c99f246a0fb30906d185184
12SHA1 (patch-ag) = 0122ec30b8fcd17198e068d07e95974bee0945b6 12SHA1 (patch-ca) = 47db0530a705b8086b2bfc58491f9b56de4b9e12
13SHA1 (patch-ah) = 25443063c26287b1b8130c53d5c9d92248d4c0d1 13SHA1 (patch-ch) = 5b6a89c82e158bab0a5f06add48c28e600678099
14SHA1 (patch-ai) = 4a07c6268a1e27b73f2f6fcde86f788fce77fcbd 14SHA1 (patch-ci) = 70531d44b6e2cb7a7ab9fb20ffe91d97e5c03e3a
15SHA1 (patch-aj) = a2fc32766ed8556455c60780fe242a034ce491a9 
16SHA1 (patch-ak) = 8899f8b6d1d038b950979073cb0527c8e7afca1e 
17SHA1 (patch-am) = cf1687063d0c0542e811545aaaad291bad12d75e 
18SHA1 (patch-an) = 987763c3098bf4356993dd6d8741962a1ff8190d 
19SHA1 (patch-ap) = 178d6909a8aa6544b849c2b63530fcf1893b77ea 
20SHA1 (patch-aq) = b9569d0cd74a06912e82498cd2bfba131c0b6f3b 
21SHA1 (patch-ar) = 9d257ceeca337e3d477b80215560bbc290d19dd2 
22SHA1 (patch-as) = 371827db418eac11f0b49df45e9d587106908bf0 
23SHA1 (patch-ba) = 27aefd5043c251380ac607df54fff882f689f237 
24SHA1 (patch-ca) = 5ed14e043a6d5f8dadf5711b59418f01aa5f6f21 
25SHA1 (patch-cb) = 2cbcaa476f33c270bfea50cddd0da3f476dbe689 
26SHA1 (patch-ce) = 6b1efab32c6bc28e0faf7522322e6d805eb21730 
27SHA1 (patch-ch) = a0831869e23d4a66588e6e27eecedb08527c9498 
28SHA1 (patch-ci) = fe943f07044efa457d163eb86974ea10bb356226 
29SHA1 (patch-cj) = 3f40f1b166a054d55224c3e79d74516ca608b696 15SHA1 (patch-cj) = 3f40f1b166a054d55224c3e79d74516ca608b696
30SHA1 (patch-ck) = 28207b8186c9ad194a1edc696159915bc16d1097 16SHA1 (patch-ck) = 28207b8186c9ad194a1edc696159915bc16d1097
31SHA1 (patch-cn) = b5e56787fb9ca10025e9061d7bfd2da549ee3fa3 17SHA1 (patch-cn) = 7ca2b1ff19f8371637a34ec26779b37d74c74cca
32SHA1 (patch-co) = 4f7ae271aa6a17860e60411dfa45566ee02b0f58 18SHA1 (patch-co) = 493ae6cb6cb544ce023c2a1fb067abe943bba2d4
33SHA1 (patch-da) = 24c8783fcdbead35de20bc3cecf1627a64717853 19SHA1 (patch-ta) = 60d9ef72db56b9f149f3995b3f526fc32a352bd7
34SHA1 (patch-ta) = ca0d1e4bc2dbbc4b86a087fed27cd1e7bbb2873f 20SHA1 (patch-zc) = a23002397ffaebb243f7683c95c8fb227af90f49
35SHA1 (patch-zc) = 0c61b6028813e0f80bfe0760a1e74e3037d37cdd 21SHA1 (patch-zd) = ee67148b8f44fb3826273574abb62ad9ca4ffa7f

cvs diff -r1.30 -r1.31 pkgsrc/lang/perl5/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/lang/perl5/patches/Attic/patch-aa 2006/04/09 06:34:32 1.30
+++ pkgsrc/lang/perl5/patches/Attic/patch-aa 2008/10/10 21:58:43 1.31
@@ -1,57 +1,33 @@ @@ -1,57 +1,33 @@
1$NetBSD: patch-aa,v 1.30 2006/04/09 06:34:32 jlam Exp $ 1$NetBSD: patch-aa,v 1.31 2008/10/10 21:58:43 he Exp $
2 2
3--- lib/ExtUtils/MM_Unix.pm.orig 2005-05-21 05:42:56.000000000 -0400 3--- lib/ExtUtils/MM_Unix.pm.orig 2007-12-18 11:47:07.000000000 +0100
4+++ lib/ExtUtils/MM_Unix.pm 4+++ lib/ExtUtils/MM_Unix.pm
5@@ -12,8 +12,8 @@ use DirHandle; 5@@ -11,8 +11,8 @@ use DirHandle;
6  6
7 use vars qw($VERSION @ISA 7 use vars qw($VERSION @ISA
8 $Is_OS2 $Is_VMS $Is_Win32 $Is_Dos 8 $Is_OS2 $Is_VMS $Is_Win32 $Is_Dos
9- $Is_OSF $Is_IRIX $Is_NetBSD $Is_BSD 9- $Is_OSF $Is_IRIX $Is_NetBSD $Is_BSD
10- $Is_SunOS4 $Is_Solaris $Is_SunOS $Is_Interix 10- $Is_SunOS4 $Is_Solaris $Is_SunOS $Is_Interix
11+ $Is_OSF $Is_IRIX $Is_BSD 11+ $Is_OSF $Is_IRIX $Is_BSD
12+ $Is_SunOS4 $Is_Solaris $Is_SunOS 12+ $Is_SunOS4 $Is_Solaris $Is_SunOS
13 $Verbose %pm 
14 %Config_Override 13 %Config_Override
15 ); 14 );
16@@ -32,13 +32,11 @@ BEGIN {  15
 16@@ -30,8 +30,6 @@ BEGIN {
17 $Is_VMS = $^O eq 'VMS'; 17 $Is_VMS = $^O eq 'VMS';
18 $Is_OSF = $^O eq 'dec_osf'; 18 $Is_OSF = $^O eq 'dec_osf';
19 $Is_IRIX = $^O eq 'irix'; 19 $Is_IRIX = $^O eq 'irix';
20- $Is_NetBSD = $^O eq 'netbsd'; 20- $Is_NetBSD = $^O eq 'netbsd';
21- $Is_Interix = $^O eq 'interix'; 21- $Is_Interix = $^O eq 'interix';
22 $Is_SunOS4 = $^O eq 'sunos'; 22 $Is_SunOS4 = $^O eq 'sunos';
23 $Is_Solaris = $^O eq 'solaris'; 23 $Is_Solaris = $^O eq 'solaris';
24 $Is_SunOS = $Is_SunOS4 || $Is_Solaris; 24 $Is_SunOS = $Is_SunOS4 || $Is_Solaris;
25 $Is_BSD = $^O =~ /^(?:free|net|open)bsd$/ or 25@@ -932,7 +930,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $
26- $^O eq 'bsdos' or $^O eq 'interix'; 
27+ $^O eq 'bsdos' or $^O eq 'dragonfly' or $^O eq 'interix'; 
28 } 
29  
30 BEGIN { 
31@@ -928,7 +926,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $ 
32  26
33 my $libs = '$(LDLOADLIBS)'; 27 my $libs = '$(LDLOADLIBS)';
34  28
35- if (($Is_NetBSD || $Is_Interix) && $Config{'useshrplib'}) { 29- if (($Is_NetBSD || $Is_Interix) && $Config{'useshrplib'} eq 'true') {
36+ if ($Is_BSD && $Config{'useshrplib'}) { 30+ if ($Is_BSD && $Config{'useshrplib'} eq 'true') {
37 # Use nothing on static perl platforms, and to the flags needed 31 # Use nothing on static perl platforms, and to the flags needed
38 # to link against the shared libperl library on shared perl 32 # to link against the shared libperl library on shared perl
39 # platforms. We peek at lddlflags to see if we need -Wl,-R 33 # platforms. We peek at lddlflags to see if we need -Wl,-R
40@@ -2074,7 +2072,7 @@ pure_site_install :: 
41 $(INST_LIB) $(DESTINSTALLSITELIB) \ 
42 $(INST_ARCHLIB) $(DESTINSTALLSITEARCH) \ 
43 $(INST_BIN) $(DESTINSTALLSITEBIN) \ 
44- $(INST_SCRIPT) $(DESTINSTALLSCRIPT) \ 
45+ $(INST_SCRIPT) $(DESTINSTALLSITESCRIPT) \ 
46 $(INST_MAN1DIR) $(DESTINSTALLSITEMAN1DIR) \ 
47 $(INST_MAN3DIR) $(DESTINSTALLSITEMAN3DIR) 
48 $(NOECHO) $(WARN_IF_OLD_PACKLIST) \ 
49@@ -2087,7 +2085,7 @@ pure_vendor_install :: 
50 $(INST_LIB) $(DESTINSTALLVENDORLIB) \ 
51 $(INST_ARCHLIB) $(DESTINSTALLVENDORARCH) \ 
52 $(INST_BIN) $(DESTINSTALLVENDORBIN) \ 
53- $(INST_SCRIPT) $(DESTINSTALLSCRIPT) \ 
54+ $(INST_SCRIPT) $(DESTINSTALLVENDORSCRIPT) \ 
55 $(INST_MAN1DIR) $(DESTINSTALLVENDORMAN1DIR) \ 
56 $(INST_MAN3DIR) $(DESTINSTALLVENDORMAN3DIR) 
57  

File Deleted: pkgsrc/lang/perl5/patches/Attic/patch-ac

File Deleted: pkgsrc/lang/perl5/patches/Attic/patch-ad

File Deleted: pkgsrc/lang/perl5/patches/Attic/patch-ae

File Deleted: pkgsrc/lang/perl5/patches/Attic/patch-ag

File Deleted: pkgsrc/lang/perl5/patches/Attic/patch-af

cvs diff -r1.9 -r1.10 pkgsrc/lang/perl5/patches/Attic/patch-ah (expand / switch to unified diff)

--- pkgsrc/lang/perl5/patches/Attic/patch-ah 2008/01/08 15:19:39 1.9
+++ pkgsrc/lang/perl5/patches/Attic/patch-ah 2008/10/10 21:58:43 1.10
@@ -1,103 +1,107 @@ @@ -1,103 +1,107 @@
1$NetBSD: patch-ah,v 1.9 2008/01/08 15:19:39 apb Exp $ 1$NetBSD: patch-ah,v 1.10 2008/10/10 21:58:43 he Exp $
2 2
3--- perl.c.orig 2006-01-31 12:34:47.000000000 +0000 3--- perl.c.orig 2007-12-18 11:47:08.000000000 +0100
4+++ perl.c 4+++ perl.c
5@@ -4615,8 +4615,10 @@ S_procself_val(pTHX_ SV *sv, char *arg0) 5@@ -1454,8 +1454,10 @@ S_procself_val(pTHX_ SV *sv, const char
6 to the executable (or returning an error from the readlink). Any valid 6 to the executable (or returning an error from the readlink). Any valid
7 path has a '/' in it somewhere, so use that to validate the result. 7 path has a '/' in it somewhere, so use that to validate the result.
8 See http://www.freebsd.org/cgi/query-pr.cgi?pr=35703 8 See http://www.freebsd.org/cgi/query-pr.cgi?pr=35703
9+ 9+
10+ NetBSD's implementation sometimes returns "/"; reject that too. 10+ NetBSD's implementation sometimes returns "/"; reject that too.
11 */ 11 */
12- if (len > 0 && memchr(buf, '/', len)) { 12- if (len > 0 && memchr(buf, '/', len)) {
13+ if (len > 1 && memchr(buf, '/', len)) { 13+ if (len > 1 && memchr(buf, '/', len)) {
14 sv_setpvn(sv,buf,len); 14 sv_setpvn(sv,buf,len);
15 } 15 }
16 else { 16 else {
17@@ -4770,45 +4772,12 @@ S_init_perllib(pTHX) 17@@ -4747,45 +4749,8 @@ S_init_perllib(pTHX)
18 } 18 }
19  19
20 /* Use the ~-expanded versions of APPLLIB (undocumented), 20 /* Use the ~-expanded versions of APPLLIB (undocumented),
21- ARCHLIB PRIVLIB SITEARCH SITELIB VENDORARCH and VENDORLIB 21- ARCHLIB PRIVLIB SITEARCH SITELIB VENDORARCH and VENDORLIB
22+ SITEARCH SITELIB VENDORARCH VENDORLIB ARCHLIB and PRIVLIB 22+ SITEARCH SITELIB VENDORARCH VENDORLIB ARCHLIB and PRIVLIB
23 */ 23 */
24 #ifdef APPLLIB_EXP 24-#ifdef APPLLIB_EXP
25 incpush(APPLLIB_EXP, TRUE, TRUE, TRUE); 25- incpush(APPLLIB_EXP, TRUE, TRUE, TRUE, TRUE);
26 #endif 26-#endif
27  27-
28-#ifdef ARCHLIB_EXP 28-#ifdef ARCHLIB_EXP
29- incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE); 29- incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE, TRUE);
30-#endif 30-#endif
31-#ifdef MACOS_TRADITIONAL 31-#ifdef MACOS_TRADITIONAL
32- { 32- {
33- Stat_t tmpstatbuf; 33- Stat_t tmpstatbuf;
34- SV * privdir = NEWSV(55, 0); 34- SV * privdir = newSV(0);
35- char * macperl = PerlEnv_getenv("MACPERL"); 35- char * macperl = PerlEnv_getenv("MACPERL");
36-  36-
37- if (!macperl) 37- if (!macperl)
38- macperl = ""; 38- macperl = "";
39-  39-
40- Perl_sv_setpvf(aTHX_ privdir, "%slib:", macperl); 40- Perl_sv_setpvf(aTHX_ privdir, "%slib:", macperl);
41- if (PerlLIO_stat(SvPVX(privdir), &tmpstatbuf) >= 0 && S_ISDIR(tmpstatbuf.st_mode)) 41- if (PerlLIO_stat(SvPVX(privdir), &tmpstatbuf) >= 0 && S_ISDIR(tmpstatbuf.st_mode))
42- incpush(SvPVX(privdir), TRUE, FALSE, TRUE); 42- incpush(SvPVX(privdir), TRUE, FALSE, TRUE, FALSE);
43- Perl_sv_setpvf(aTHX_ privdir, "%ssite_perl:", macperl); 43- Perl_sv_setpvf(aTHX_ privdir, "%ssite_perl:", macperl);
44- if (PerlLIO_stat(SvPVX(privdir), &tmpstatbuf) >= 0 && S_ISDIR(tmpstatbuf.st_mode)) 44- if (PerlLIO_stat(SvPVX(privdir), &tmpstatbuf) >= 0 && S_ISDIR(tmpstatbuf.st_mode))
45- incpush(SvPVX(privdir), TRUE, FALSE, TRUE); 45- incpush(SvPVX(privdir), TRUE, FALSE, TRUE, FALSE);
46-  46-
47- SvREFCNT_dec(privdir); 47- SvREFCNT_dec(privdir);
48- } 48- }
49- if (!PL_tainting) 49- if (!PL_tainting)
50- incpush(":", FALSE, FALSE, TRUE); 50- incpush(":", FALSE, FALSE, TRUE, FALSE);
51-#else 51-#else
52-#ifndef PRIVLIB_EXP 52-#ifndef PRIVLIB_EXP
53-# define PRIVLIB_EXP "/usr/local/lib/perl5:/usr/local/lib/perl" 53-# define PRIVLIB_EXP "/usr/local/lib/perl5:/usr/local/lib/perl"
54-#endif 54-#endif
55-#if defined(WIN32) 55-#if defined(WIN32)
56- incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE); 56- incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE, TRUE);
57-#else 57-#else
58- incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE); 58- incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE, TRUE);
59-#endif 59-#endif
60- 60-
61 #ifdef SITEARCH_EXP 61 #ifdef SITEARCH_EXP
62 /* sitearch is always relative to sitelib on Windows for 62 /* sitearch is always relative to sitelib on Windows for
63 * DLL-based path intuition to work correctly */ 63 * DLL-based path intuition to work correctly */
64@@ -4850,6 +4819,39 @@ S_init_perllib(pTHX) 64@@ -4828,6 +4793,43 @@ S_init_perllib(pTHX)
65 incpush(PERL_VENDORLIB_STEM, FALSE, TRUE, TRUE); 65 incpush(PERL_VENDORLIB_STEM, FALSE, TRUE, TRUE, TRUE);
66 #endif 66 #endif
67  67
 68+#ifdef APPLLIB_EXP
 69+ incpush(APPLLIB_EXP, TRUE, TRUE, TRUE, TRUE);
 70+#endif
 71+
68+#ifdef ARCHLIB_EXP 72+#ifdef ARCHLIB_EXP
69+ incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE); 73+ incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE, TRUE);
70+#endif 74+#endif
71+#ifdef MACOS_TRADITIONAL 75+#ifdef MACOS_TRADITIONAL
72+ { 76+ {
73+ Stat_t tmpstatbuf; 77+ Stat_t tmpstatbuf;
74+ SV * privdir = NEWSV(55, 0); 78+ SV * privdir = newSV(0);
75+ char * macperl = PerlEnv_getenv("MACPERL"); 79+ char * macperl = PerlEnv_getenv("MACPERL");
76+  80+
77+ if (!macperl) 81+ if (!macperl)
78+ macperl = ""; 82+ macperl = "";
79+  83+
80+ Perl_sv_setpvf(aTHX_ privdir, "%slib:", macperl); 84+ Perl_sv_setpvf(aTHX_ privdir, "%slib:", macperl);
81+ if (PerlLIO_stat(SvPVX(privdir), &tmpstatbuf) >= 0 && S_ISDIR(tmpstatbuf.st_mode)) 85+ if (PerlLIO_stat(SvPVX(privdir), &tmpstatbuf) >= 0 && S_ISDIR(tmpstatbuf.st_mode))
82+ incpush(SvPVX(privdir), TRUE, FALSE, TRUE); 86+ incpush(SvPVX(privdir), TRUE, FALSE, TRUE, FALSE);
83+ Perl_sv_setpvf(aTHX_ privdir, "%ssite_perl:", macperl); 87+ Perl_sv_setpvf(aTHX_ privdir, "%ssite_perl:", macperl);
84+ if (PerlLIO_stat(SvPVX(privdir), &tmpstatbuf) >= 0 && S_ISDIR(tmpstatbuf.st_mode)) 88+ if (PerlLIO_stat(SvPVX(privdir), &tmpstatbuf) >= 0 && S_ISDIR(tmpstatbuf.st_mode))
85+ incpush(SvPVX(privdir), TRUE, FALSE, TRUE); 89+ incpush(SvPVX(privdir), TRUE, FALSE, TRUE, FALSE);
86+  90+
87+ SvREFCNT_dec(privdir); 91+ SvREFCNT_dec(privdir);
88+ } 92+ }
89+ if (!PL_tainting) 93+ if (!PL_tainting)
90+ incpush(":", FALSE, FALSE, TRUE); 94+ incpush(":", FALSE, FALSE, TRUE, FALSE);
91+#else 95+#else
92+#ifndef PRIVLIB_EXP 96+#ifndef PRIVLIB_EXP
93+# define PRIVLIB_EXP "/usr/local/lib/perl5:/usr/local/lib/perl" 97+# define PRIVLIB_EXP "/usr/local/lib/perl5:/usr/local/lib/perl"
94+#endif 98+#endif
95+#if defined(WIN32) 99+#if defined(WIN32)
96+ incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE); 100+ incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE, TRUE);
97+#else 101+#else
98+ incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE); 102+ incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE, TRUE);
99+#endif 103+#endif
100+ 104+
101 #ifdef PERL_OTHERLIBDIRS 105 #ifdef PERL_OTHERLIBDIRS
102 incpush(PERL_OTHERLIBDIRS, TRUE, TRUE, TRUE); 106 incpush(PERL_OTHERLIBDIRS, TRUE, TRUE, TRUE, TRUE);
103 #endif 107 #endif

File Deleted: pkgsrc/lang/perl5/patches/Attic/patch-ai

File Deleted: pkgsrc/lang/perl5/patches/Attic/patch-aj

File Deleted: pkgsrc/lang/perl5/patches/Attic/patch-ak

File Deleted: pkgsrc/lang/perl5/patches/Attic/patch-am

File Deleted: pkgsrc/lang/perl5/patches/Attic/patch-cb

File Deleted: pkgsrc/lang/perl5/patches/Attic/patch-an

File Deleted: pkgsrc/lang/perl5/patches/Attic/patch-ce

File Deleted: pkgsrc/lang/perl5/patches/Attic/patch-da

File Deleted: pkgsrc/lang/perl5/patches/Attic/patch-ap

File Deleted: pkgsrc/lang/perl5/patches/Attic/patch-ar

cvs diff -r1.1 -r1.2 pkgsrc/lang/perl5/patches/Attic/patch-aq (expand / switch to unified diff)

--- pkgsrc/lang/perl5/patches/Attic/patch-aq 2006/05/06 12:32:20 1.1
+++ pkgsrc/lang/perl5/patches/Attic/patch-aq 2008/10/10 21:58:43 1.2
@@ -1,26 +1,31 @@ @@ -1,26 +1,31 @@
1$NetBSD: patch-aq,v 1.1 2006/05/06 12:32:20 jlam Exp $ 1$NetBSD: patch-aq,v 1.2 2008/10/10 21:58:43 he Exp $
2 2
3--- XSUB.h.orig 2006-01-02 09:45:29.000000000 -0500 3--- XSUB.h.orig 2007-12-18 11:47:07.000000000 +0100
4+++ XSUB.h 4+++ XSUB.h
5@@ -85,17 +85,16 @@ handled automatically by C<xsubpp>. 5@@ -93,6 +93,9 @@ is a lexical $_ in scope.
6 #ifndef PERL_UNUSED_VAR 6 #ifndef PERL_UNUSED_VAR
7 # define PERL_UNUSED_VAR(x) ((void)x) 7 # define PERL_UNUSED_VAR(x) ((void)x)
8 #endif 8 #endif
9+#ifndef PERL_UNUSED_DECL 9+#ifndef PERL_UNUSED_DECL
10+# define PERL_UNUSED_DECL 10+# define PERL_UNUSED_DECL
11+#endif 11+#endif
12  12
13 #define ST(off) PL_stack_base[ax + (off)] 13 #define ST(off) PL_stack_base[ax + (off)]
14  14
15 #if defined(__CYGWIN__) && defined(USE_DYNAMIC_LOADING) 15@@ -116,15 +119,7 @@ is a lexical $_ in scope.
16 # define XS(name) __declspec(dllexport) void name(pTHX_ CV* cv) 16 # define XS(name) EXPORT_C XSPROTO(name)
17 #else 17 #endif
18-# ifdef HASATTRIBUTE_UNUSED 18 #ifndef XS
 19-# if defined(HASATTRIBUTE_UNUSED) && !defined(__cplusplus)
19-# define XS(name) void name(pTHX_ CV* cv __attribute__unused__) 20-# define XS(name) void name(pTHX_ CV* cv __attribute__unused__)
20-# else 21-# else
21-# define XS(name) void name(pTHX_ CV* cv) 22-# ifdef __cplusplus
 23-# define XS(name) extern "C" XSPROTO(name)
 24-# else
 25-# define XS(name) XSPROTO(name)
 26-# endif
22-# endif 27-# endif
23+# define XS(name) void name(pTHX_ CV* cv PERL_UNUSED_DECL) 28+# define XS(name) void name(pTHX_ CV* cv PERL_UNUSED_DECL)
24 #endif 29 #endif
25  30
26 #define dAX const I32 ax = MARK - PL_stack_base + 1 31 #define dAX const I32 ax = (I32)(MARK - PL_stack_base + 1)

cvs diff -r1.1 -r1.2 pkgsrc/lang/perl5/patches/Attic/patch-cn (expand / switch to unified diff)

--- pkgsrc/lang/perl5/patches/Attic/patch-cn 2007/04/21 15:32:15 1.1
+++ pkgsrc/lang/perl5/patches/Attic/patch-cn 2008/10/10 21:58:43 1.2
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1$NetBSD: patch-cn,v 1.1 2007/04/21 15:32:15 tnn Exp $ 1$NetBSD: patch-cn,v 1.2 2008/10/10 21:58:43 he Exp $
2 2
3--- hints/hpux.sh.orig 2007-04-21 17:17:01.000000000 +0200 3--- hints/hpux.sh.orig 2007-12-18 11:47:07.000000000 +0100
4+++ hints/hpux.sh 4+++ hints/hpux.sh
5@@ -371,7 +371,7 @@ case "$ccisgcc" in 5@@ -376,7 +376,7 @@ case "$ccisgcc" in
6 *O[3456789]*) optimize=`echo "$optimize" | sed -e 's/O[3-9]/O2/'` ;; 6 *O[3456789]*) optimize=`echo "$optimize" | sed -e 's/O[3-9]/O2/'` ;;
7 esac 7 esac
8 #ld="$cc" 8 #ld="$cc"
9- ld=/usr/bin/ld 9- ld=/usr/bin/ld
10+ ld=ld 10+ ld=ld
11 cccdlflags='-fPIC' 11 cccdlflags='-fPIC'
12 #lddlflags='-shared' 12 #lddlflags='-shared'
13 lddlflags='-b' 13 lddlflags='-b'
14@@ -428,7 +428,7 @@ case "$ccisgcc" in 14@@ -434,7 +434,7 @@ case "$ccisgcc" in
15 toke_cflags="$toke_cflags;optimize=\"$opt\"" 15 toke_cflags="$toke_cflags;optimize=\"$opt\""
16 regexec_cflags="optimize=\"$opt\"" 16 regexec_cflags="optimize=\"$opt\""
17 fi 17 fi
18- ld=/usr/bin/ld 18- ld=/usr/bin/ld
19+ ld=ld 19+ ld=ld
20 cccdlflags='+Z' 20 cccdlflags='+Z'
21 lddlflags='-b +vnocompatwarnings' 21 lddlflags='-b +vnocompatwarnings'
22 ;; 22 ;;

cvs diff -r1.1 -r1.2 pkgsrc/lang/perl5/patches/Attic/patch-co (expand / switch to unified diff)

--- pkgsrc/lang/perl5/patches/Attic/patch-co 2008/07/30 23:07:52 1.1
+++ pkgsrc/lang/perl5/patches/Attic/patch-co 2008/10/10 21:58:43 1.2
@@ -1,26 +1,26 @@ @@ -1,26 +1,26 @@
1$NetBSD: patch-co,v 1.1 2008/07/30 23:07:52 ahoka Exp $ 1$NetBSD: patch-co,v 1.2 2008/10/10 21:58:43 he Exp $
2 2
3--- hints/freebsd.sh.orig 2004-03-24 22:47:33.000000000 +0100 3--- hints/freebsd.sh.orig 2007-12-18 11:47:07.000000000 +0100
4+++ hints/freebsd.sh 4+++ hints/freebsd.sh
5@@ -114,7 +114,7 @@ case "$osvers" in 5@@ -114,7 +114,7 @@ case "$osvers" in
6 lddlflags="-Bshareable $lddlflags" 6 lddlflags="-Bshareable $lddlflags"
7 ;; 7 ;;
8  8
9-*) 9-*)
10+3*|4*|5*|6*) 10+3*|4*|5*|6*)
11 objformat=`/usr/bin/objformat` 11 objformat=`/usr/bin/objformat`
12 if [ x$objformat = xelf ]; then 12 if [ x$objformat = xaout ]; then
13 libpth="/usr/lib /usr/local/lib" 13 if [ -e /usr/lib/aout ]; then
14@@ -130,6 +130,14 @@ case "$osvers" in 14@@ -130,6 +130,14 @@ case "$osvers" in
15 fi 15 fi
16 cccdlflags='-DPIC -fPIC' 16 cccdlflags='-DPIC -fPIC'
17 ;; 17 ;;
18+ 18+
19+*) 19+*)
20+ libpth="/usr/lib /usr/local/lib" 20+ libpth="/usr/lib /usr/local/lib"
21+ glibpth="/usr/lib /usr/local/lib" 21+ glibpth="/usr/lib /usr/local/lib"
22+ ldflags="-Wl,-E " 22+ ldflags="-Wl,-E "
23+ lddlflags="-shared " 23+ lddlflags="-shared "
24+ cccdlflags='-DPIC -fPIC' 24+ cccdlflags='-DPIC -fPIC'
25+ ;; 25+ ;;
26 esac 26 esac

cvs diff -r1.1 -r1.2 pkgsrc/lang/perl5/patches/Attic/patch-ta (expand / switch to unified diff)

--- pkgsrc/lang/perl5/patches/Attic/patch-ta 2006/07/02 20:35:53 1.1
+++ pkgsrc/lang/perl5/patches/Attic/patch-ta 2008/10/10 21:58:44 1.2
@@ -1,23 +1,25 @@ @@ -1,23 +1,25 @@
1$NetBSD: patch-ta,v 1.1 2006/07/02 20:35:53 rillig Exp $ 1$NetBSD: patch-ta,v 1.2 2008/10/10 21:58:44 he Exp $
2 2
3On NetBSD, filesystems may be mounted with the noatime option. 3On NetBSD, filesystems may be mounted with the noatime option.
4 4
5--- t/io/fs.t.orig 2006-01-08 22:46:15.000000000 +0100 5--- t/io/fs.t.orig 2007-12-18 11:47:08.000000000 +0100
6+++ t/io/fs.t 2006-07-02 22:33:01.000000000 +0200 6+++ t/io/fs.t
7@@ -255,13 +255,13 @@ SKIP: { 7@@ -275,15 +275,15 @@ sub check_utime_result {
8 is( $atime, 500000001, 'atime' ); 8 is( $atime, 500000001, 'atime' );
9 is( $mtime, 500000000 + $delta, 'mtime' ); 9 is( $mtime, 500000000 + $delta, 'mtime' );
10 } 10 }
11- elsif ($^O eq 'beos') { 11- elsif ($^O eq 'beos') {
12+ elsif ($^O eq 'beos' || $^O eq 'netbsd') { 12+ elsif ($^O eq 'beos' || $^O eq 'netbsd') {
13 SKIP: { skip "atime not updated", 1; } 13 SKIP: {
14 is($mtime, 500000001, 'mtime'); 14 skip "atime not updated", 1;
15 } 15 }
16 else { 16 is($mtime, 500000001, 'mtime');
17- fail("atime"); 17 }
18- fail("mtime"); 18 else {
19+ fail("atime: expected 500000000, got ${atime}"); 19- fail("atime");
20+ fail("mtime: expected ".(500000000+$delta).", got ${mtime}"); 20- fail("mtime");
21 } 21+ fail("atime: expected 500000000, got ${atime}");
 22+ fail("mtime: expected ".(500000000+$delta).", got ${mtime}");
 23 }
 24 }
22 } 25 }
23 } 

cvs diff -r1.2 -r1.3 pkgsrc/lang/perl5/patches/Attic/patch-as (expand / switch to unified diff)

--- pkgsrc/lang/perl5/patches/Attic/patch-as 2008/01/13 00:20:22 1.2
+++ pkgsrc/lang/perl5/patches/Attic/patch-as 2008/10/10 21:58:43 1.3
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1$NetBSD: patch-as,v 1.2 2008/01/13 00:20:22 joerg Exp $ 1$NetBSD: patch-as,v 1.3 2008/10/10 21:58:43 he Exp $
2 2
3asm/page.h is no longer installed as part of the kernel header 3asm/page.h is no longer installed as part of the kernel header
4page on Gentoo/Linux. 4page on Gentoo/Linux.
5 5
6--- ext/IPC/SysV/SysV.xs.orig 2008-01-12 15:55:22.000000000 +0100 6--- ext/IPC/SysV/SysV.xs.orig 2007-12-18 11:47:07.000000000 +0100
7+++ ext/IPC/SysV/SysV.xs 7+++ ext/IPC/SysV/SysV.xs
8@@ -3,9 +3,6 @@ 8@@ -24,8 +24,6 @@
9 #include "XSUB.h" 9 # elif defined(HAS_GETPAGESIZE)
10  10 # undef SHMLBA /* not static: determined at boot time */
11 #include <sys/types.h> 11 # define SHMLBA getpagesize()
12-#ifdef __linux__ 12-# elif defined(__linux__)
13-# include <asm/page.h> 13-# include <asm/page.h>
14-#endif 14 # endif
15 #if defined(HAS_MSG) || defined(HAS_SEM) || defined(HAS_SHM) 15 # endif
16 #ifndef HAS_SEM 16 #endif
17 # include <sys/ipc.h> 

cvs diff -r1.2 -r1.3 pkgsrc/lang/perl5/patches/Attic/patch-zc (expand / switch to unified diff)

--- pkgsrc/lang/perl5/patches/Attic/patch-zc 2006/04/09 06:34:33 1.2
+++ pkgsrc/lang/perl5/patches/Attic/patch-zc 2008/10/10 21:58:44 1.3
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: patch-zc,v 1.2 2006/04/09 06:34:33 jlam Exp $ 1$NetBSD: patch-zc,v 1.3 2008/10/10 21:58:44 he Exp $
2 2
3--- Policy_sh.SH.orig 2003-08-01 08:23:23.000000000 -0400 3--- Policy_sh.SH.orig 2007-12-18 11:47:07.000000000 +0100
4+++ Policy_sh.SH 4+++ Policy_sh.SH
5@@ -184,10 +184,10 @@ do 5@@ -184,10 +184,10 @@ do
6 ;; 6 ;;
7 sitearch) dflt="$sitelib/$archname" ;; 7 sitearch) dflt="$sitelib/$archname" ;;
8  8
9- siteman1) dflt="$siteprefix/man/man1" ;; 9- siteman1) dflt="$siteprefix/man/man1" ;;
10- siteman3) dflt="$siteprefix/man/man3" ;; 10- siteman3) dflt="$siteprefix/man/man3" ;;
11+ siteman1dir) dflt="$siteprefix/man/man1" ;; 11+ siteman1dir) dflt="$siteprefix/man/man1" ;;
12+ siteman3dir) dflt="$siteprefix/man/man3" ;; 12+ siteman3dir) dflt="$siteprefix/man/man3" ;;
13 # We don't know what to do with these yet. 13 # We don't know what to do with these yet.
14- sitehtml1) dflt='' ;; 14- sitehtml1) dflt='' ;;
15+ sitehtml1dir) dflt='' ;; 15+ sitehtml1dir) dflt='' ;;
16 sitehtm31dir) dflt='' ;; 16 sitehtm31dir) dflt='' ;;

cvs diff -r1.4 -r1.5 pkgsrc/lang/perl5/patches/Attic/patch-ba (expand / switch to unified diff)

--- pkgsrc/lang/perl5/patches/Attic/patch-ba 2006/08/08 15:36:00 1.4
+++ pkgsrc/lang/perl5/patches/Attic/patch-ba 2008/10/10 21:58:43 1.5
@@ -1,50 +1,28 @@ @@ -1,50 +1,28 @@
1$NetBSD: patch-ba,v 1.4 2006/08/08 15:36:00 tron Exp $ 1$NetBSD: patch-ba,v 1.5 2008/10/10 21:58:43 he Exp $
2 2
3--- hints/netbsd.sh.orig 2003-08-07 17:57:56.000000000 +0100 3--- hints/netbsd.sh.orig 2007-12-18 11:47:07.000000000 +0100
4+++ hints/netbsd.sh 2006-08-08 16:33:33.000000000 +0100 4+++ hints/netbsd.sh
5@@ -78,6 +78,30 @@ 5@@ -79,7 +79,7 @@ case "$osvers" in
6 d_setreuid="$undef" 
7 ;; 6 ;;
8 esac 7 esac
9+case "$osvers" in 8 case "$osvers" in
10+0.9*|1.*|2.*|3.*|4.*) 9-0.9*|1.*|2.*|3.*|4.*)
11+ d_getprotoent_r="$undef" 10+0.9*|1.*|2.*|3.*|4.*|5.*)
12+ d_getprotobyname_r="$undef" 11 d_getprotoent_r="$undef"
13+ d_getprotobynumber_r="$undef" 12 d_getprotobyname_r="$undef"
14+ d_setprotoent_r="$undef" 13 d_getprotobynumber_r="$undef"
15+ d_endprotoent_r="$undef" 14@@ -175,23 +175,6 @@ $define|true|[yY]*)
16+ d_getservent_r="$undef" 15 esac
17+ d_getservbyname_r="$undef" 
18+ d_getservbyport_r="$undef" 
19+ d_setservent_r="$undef" 
20+ d_endservent_r="$undef" 
21+ d_getprotoent_r_proto="$undef" 
22+ d_getprotobyname_r_proto="$undef" 
23+ d_getprotobynumber_r_proto="$undef" 
24+ d_setprotoent_r_proto="$undef" 
25+ d_endprotoent_r_proto="$undef" 
26+ d_getservent_r_proto="$undef" 
27+ d_getservbyname_r_proto="$undef" 
28+ d_getservbyport_r_proto="$undef" 
29+ d_setservent_r_proto="$undef" 
30+ d_endservent_r_proto="$undef" 
31+ ;; 
32+esac 
33  
34 # These are obsolete in any netbsd. 
35 d_setrgid="$undef" 
36@@ -133,23 +157,6 @@ 
37 esac  
38 EOCBU 16 EOCBU
39  17
40-# Set sensible defaults for NetBSD: look for local software in 18-# Set sensible defaults for NetBSD: look for local software in
41-# /usr/pkg (NetBSD Packages Collection) and in /usr/local. 19-# /usr/pkg (NetBSD Packages Collection) and in /usr/local.
42-# 20-#
43-loclibpth="/usr/pkg/lib /usr/local/lib" 21-loclibpth="/usr/pkg/lib /usr/local/lib"
44-locincpth="/usr/pkg/include /usr/local/include" 22-locincpth="/usr/pkg/include /usr/local/include"
45-case "$rpathflag" in 23-case "$rpathflag" in
46-'') 24-'')
47- ldflags= 25- ldflags=
48- ;; 26- ;;
49-*) 27-*)
50- ldflags= 28- ldflags=

cvs diff -r1.5 -r1.6 pkgsrc/lang/perl5/patches/Attic/patch-ca (expand / switch to unified diff)

--- pkgsrc/lang/perl5/patches/Attic/patch-ca 2006/04/09 06:34:33 1.5
+++ pkgsrc/lang/perl5/patches/Attic/patch-ca 2008/10/10 21:58:43 1.6
@@ -1,107 +1,100 @@ @@ -1,107 +1,100 @@
1$NetBSD: patch-ca,v 1.5 2006/04/09 06:34:33 jlam Exp $ 1$NetBSD: patch-ca,v 1.6 2008/10/10 21:58:43 he Exp $
2 2
3--- Configure.orig 2006-01-08 09:51:03.000000000 -0500 3--- Configure.orig 2007-12-18 11:47:07.000000000 +0100
4+++ Configure 4+++ Configure
5@@ -3130,11 +3130,13 @@ EOM 5@@ -3206,13 +3206,14 @@ EOM
6 dgux) osname=dgux  
7 osvers="$3" 6 osvers="$3"
8 ;; 7 ;;
9+ dragonfly) osname=dragonfly 8 dragonfly) osname=dragonfly
10+ osvers=`$uname -r | UU/tr '[A-Z]' '[a-z]'` ;; 9- osvers="$3"
 10+ osvers=`$uname -r | UU/tr '[A-Z]' '[a-z]'`
 11 ;;
11 dynixptx*) osname=dynixptx 12 dynixptx*) osname=dynixptx
12 osvers=`echo "$4"|sed 's/^v//'` 13 osvers=`echo "$4"|sed 's/^v//'`
13 ;; 14 ;;
14 freebsd) osname=freebsd  15 freebsd) osname=freebsd
15- osvers="$3" ;; 16- osvers="$3" ;;
16+ osvers=`$uname -r | UU/tr '[A-Z]' '[a-z]'` ;; 17+ osvers=`$uname -r | UU/tr '[A-Z]' '[a-z]'`
 18+ ;;
17 genix) osname=genix ;; 19 genix) osname=genix ;;
18 gnu) osname=gnu 20 gnu) osname=gnu
19 osvers="$3" ;; 21 osvers="$3" ;;
20@@ -3156,7 +3158,7 @@ EOM 22@@ -3234,7 +3235,7 @@ EOM
21 MiNT) osname=mint 23 MiNT) osname=mint
22 ;; 24 ;;
23 netbsd*) osname=netbsd 25 netbsd*) osname=netbsd
24- osvers="$3" 26- osvers="$3"
25+ osvers=`$uname -r | UU/tr '[A-Z]' '[a-z]'` 27+ osvers=`$uname -r | UU/tr '[A-Z]' '[a-z]'`
26 ;; 28 ;;
27 news-os) osvers="$3" 29 news-os) osvers="$3"
28 case "$3" in 30 case "$3" in
29@@ -3167,8 +3169,8 @@ EOM 31@@ -3245,8 +3246,8 @@ EOM
30 next*) osname=next ;; 32 next*) osname=next ;;
31 nonstop-ux) osname=nonstopux ;; 33 nonstop-ux) osname=nonstopux ;;
32 openbsd) osname=openbsd 34 openbsd) osname=openbsd
33- osvers="$3" 35- osvers="$3"
34- ;; 36- ;;
35+ osvers=`$uname -r | UU/tr '[A-Z]' '[a-z]'` 37+ osvers=`$uname -r | UU/tr '[A-Z]' '[a-z]'`
36+ ;; 38+ ;;
37 os2) osname=os2 39 os2) osname=os2
38 osvers="$4" 40 osvers="$4"
39 ;; 41 ;;
40@@ -4445,7 +4447,7 @@ case "$plibpth" in 42@@ -4739,7 +4740,7 @@ case "$plibpth" in
41 esac 43 esac
42 case "$libpth" in 44 case "$libpth" in
43 ' ') dlist='';; 45 ' ') dlist='';;
44-'') dlist="$loclibpth $plibpth $glibpth";; 46-'') dlist="$loclibpth $plibpth $glibpth";;
45+'') dlist="$plibpth $glibpth $loclibpth";; 47+'') dlist="$plibpth $glibpth $loclibpth";;
46 *) dlist="$libpth";; 48 *) dlist="$libpth";;
47 esac 49 esac
48  50
49@@ -6485,7 +6487,9 @@ rp='Pathname for the site-specific libra 51@@ -6425,7 +6426,9 @@ rp='Pathname for the site-specific libra
50 . ./getfile 52 . ./getfile
51 sitelib="$ans" 53 prefixvar=sitelib
52 sitelibexp="$ansexp" 54 . ./setprefixvar
53-sitelib_stem=`echo "$sitelibexp" | sed "s,/$version$,,"` 55-sitelib_stem=`echo "$sitelibexp" | sed "s,/$version$,,"`
54+if $test -z "$sitelib_stem"; then 56+if $test -z "$sitelib_stem"; then
55+ sitelib_stem=`echo "$sitelibexp" | sed "s,/$version$,,"` 57+ sitelib_stem=`echo "$sitelibexp" | sed "s,/$version$,,"`
56+fi 58+fi
57 : Change installation prefix, if necessary. 59
58 if $test X"$prefix" != X"$installprefix"; then 60 : Determine list of previous versions to include in @INC
59 installsitelib=`echo $sitelibexp | $sed "s#^$prefix#$installprefix#"` 61 $cat > getverlist <<EOPL
60@@ -6606,7 +6610,9 @@ case "$vendorprefix" in 62@@ -6925,7 +6928,9 @@ case "$vendorprefix" in
61 vendorlibexp="$ansexp" 63 vendorlibexp="$ansexp"
62 ;; 64 ;;
63 esac 65 esac
64-vendorlib_stem=`echo "$vendorlibexp" | sed "s,/$version$,,"` 66-vendorlib_stem=`echo "$vendorlibexp" | sed "s,/$version$,,"`
65+if $test -z "$vendorlib_stem"; then 67+if $test -z "$vendorlib_stem"; then
66+ vendorlib_stem=`echo "$vendorlibexp" | sed "s,/$version$,,"` 68+ vendorlib_stem=`echo "$vendorlibexp" | sed "s,/$version$,,"`
67+fi 69+fi
68 : Change installation prefix, if necessary. 70 prefixvar=vendorlib
69 if $test X"$prefix" != X"$installprefix"; then 71 . ./installprefix
70 installvendorlib=`echo $vendorlibexp | $sed "s#^$prefix#$installprefix#"` 72
71@@ -7889,7 +7895,7 @@ if "$useshrplib"; then 73@@ -9170,6 +9175,13 @@ EOCP
72 solaris) 
73 xxx="-R $shrpdir" 
74 ;; 
75- freebsd|netbsd|openbsd|interix) 
76+ freebsd|netbsd|openbsd|dragonfly|interix) 
77 xxx="-Wl,-R$shrpdir" 
78 ;; 
79 bsdos|linux|irix*|dec_osf|gnu*) 
80@@ -9010,6 +9016,13 @@ EOCP 
81 ;; 74 ;;
82 esac 75 esac
83  76
84+: Look for a hint-file generated 'call-back-unit'. We need 77+: Look for a hint-file generated 'call-back-unit'. We need
85+: to set some defaults for building perl in pkgsrc. 78+: to set some defaults for building perl in pkgsrc.
86+if $test -f pkgsrc.cbu; then 79+if $test -f pkgsrc.cbu; then
87+ echo "Setting pkgsrc-specific hints regarding compiler/linker flags..." 80+ echo "Setting pkgsrc-specific hints regarding compiler/linker flags..."
88+ . ./pkgsrc.cbu 81+ . ./pkgsrc.cbu
89+fi 82+fi
90+ 83+
91 case "$vendorprefix" in 84 case "$vendorprefix" in
92 '') d_vendorbin="$undef" 85 '') d_vendorbin="$undef"
93 vendorbin='' 86 vendorbin=''
94@@ -17776,7 +17789,15 @@ RCAT(Rei,ser) 87@@ -18347,7 +18359,15 @@ RCAT(Rei,ser)
95 ACAT(Cir,cus) 88 ACAT(Cir,cus)
96 EOCP 89 EOCP
97 $cppstdin $cppflags $cppminus <cpp_stuff.c >cpp_stuff.out 2>&1 90 $cppstdin $cppflags $cppminus <cpp_stuff.c >cpp_stuff.out 2>&1
98-if $contains 'Circus' cpp_stuff.out >/dev/null 2>&1; then 91-if $contains 'Circus' cpp_stuff.out >/dev/null 2>&1; then
99+# yuck, what a hack. 92+# yuck, what a hack.
100+# MIPSPro compiler/preprocessor behaves differently if invoked on 93+# MIPSPro compiler/preprocessor behaves differently if invoked on
101+# stdin vs file. Here we test for stdin, but lateron we use files. 94+# stdin vs file. Here we test for stdin, but lateron we use files.
102+# So force it to work the way we know it does: 95+# So force it to work the way we know it does:
103+if [ x"${OPSYS}" = x"IRIX" ]; then 96+if [ x"${OPSYS}" = x"IRIX" ]; then
104+ echo "Hacking MIPSPro on file vs. stdin..." >&4 97+ echo "Hacking MIPSPro on file vs. stdin..." >&4
105+ echo "We know we can catify or stringify, separately or together!" 98+ echo "We know we can catify or stringify, separately or together!"
106+ cpp_stuff=42 99+ cpp_stuff=42
107+elif $contains 'Circus' cpp_stuff.out >/dev/null 2>&1; then 100+elif $contains 'Circus' cpp_stuff.out >/dev/null 2>&1; then

cvs diff -r1.3 -r1.4 pkgsrc/lang/perl5/patches/Attic/patch-ch (expand / switch to unified diff)

--- pkgsrc/lang/perl5/patches/Attic/patch-ch 2006/04/09 06:34:33 1.3
+++ pkgsrc/lang/perl5/patches/Attic/patch-ch 2008/10/10 21:58:43 1.4
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-ch,v 1.3 2006/04/09 06:34:33 jlam Exp $ 1$NetBSD: patch-ch,v 1.4 2008/10/10 21:58:43 he Exp $
2 2
3--- hints/dec_osf.sh.orig 2006-01-08 04:53:29.000000000 -0500 3--- hints/dec_osf.sh.orig 2007-12-18 11:47:07.000000000 +0100
4+++ hints/dec_osf.sh 4+++ hints/dec_osf.sh
5@@ -285,7 +285,7 @@ case "`uname -r`" in 5@@ -79,7 +79,7 @@ case "$unamer" in
6 # fixed in 4.0E or better. 6 # fixed in 4.0E or better.
7 ;; 7 ;;
8 *)  8 *)
9- lddlflags="$lddlflags $optimize" 9- lddlflags="$lddlflags $optimize"
10+ lddlflags="$lddlflags" 10+ lddlflags="$lddlflags"
11 ;; 11 ;;
12 esac 12 esac
13 # -msym: If using a sufficiently recent /sbin/loader, 13 # -msym: If using a sufficiently recent /sbin/loader,

cvs diff -r1.3 -r1.4 pkgsrc/lang/perl5/patches/Attic/patch-ci (expand / switch to unified diff)

--- pkgsrc/lang/perl5/patches/Attic/patch-ci 2006/04/09 06:34:33 1.3
+++ pkgsrc/lang/perl5/patches/Attic/patch-ci 2008/10/10 21:58:43 1.4
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: patch-ci,v 1.3 2006/04/09 06:34:33 jlam Exp $ 1$NetBSD: patch-ci,v 1.4 2008/10/10 21:58:43 he Exp $
2 2
3--- pp_sys.c.orig 2006-01-13 13:15:15.000000000 -0500 3--- pp_sys.c.orig 2007-12-18 11:47:08.000000000 +0100
4+++ pp_sys.c 4+++ pp_sys.c
5@@ -4516,12 +4516,15 @@ PP(pp_gmtime) 5@@ -4452,12 +4452,15 @@ PP(pp_gmtime)
6 when = (Time_t)SvIVx(POPs); 6 when = (Time_t)SvIVx(POPs);
7 #endif 7 #endif
8  8
9- if (PL_op->op_type == OP_LOCALTIME) 9- if (PL_op->op_type == OP_LOCALTIME)
10+ if (PL_op->op_type == OP_LOCALTIME) { 10+ if (PL_op->op_type == OP_LOCALTIME) {
11 #ifdef LOCALTIME_EDGECASE_BROKEN 11 #ifdef LOCALTIME_EDGECASE_BROKEN
12 tmbuf = S_my_localtime(aTHX_ &when); 12 tmbuf = S_my_localtime(aTHX_ &when);
13 #else 13 #else
14+ /* Explicitly invoke tzset() as localtime_r may not. */ 14+ /* Explicitly invoke tzset() as localtime_r may not. */
15+ tzset(); 15+ tzset();
16 tmbuf = localtime(&when); 16 tmbuf = localtime(&when);
17 #endif 17 #endif
18+ } 18+ }

File Added: pkgsrc/lang/perl5/patches/Attic/patch-zd
$NetBSD: patch-zd,v 1.1 2008/10/10 21:58:44 he Exp $

--- lib/Module/Build/t/tilde.t.orig	2007-12-18 11:47:07.000000000 +0100
+++ lib/Module/Build/t/tilde.t
@@ -40,6 +40,9 @@ my $p = 'install_base';
 SKIP: {
     my $home = $ENV{HOME} ? $ENV{HOME} : undef;
     skip "Needs case and syntax tweaks for VMS", 14 if $^O eq 'VMS';
+    if ($home =~ /work\/.home/) {
+      skip "Skipping test in pkgsrc env to avoid FAKE_HOME trouble", 14;
+    }
     unless (defined $home) {
       my @info = eval { getpwuid $> };
       skip "No home directory for tilde-expansion tests", 14 if $@;