 @@ -1,364 +1,381 @@
-# $NetBSD: Makefile,v 1.137 2008/06/01 22:04:07 he Exp $
+# $NetBSD: Makefile,v 1.138 2008/10/10 21:58:43 he Exp $
-DISTNAME=	perl-5.8.8
+DISTNAME=	perl-5.10.0
 PKGREVISION=	8
 CATEGORIES=	lang devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:S,/modules/by-module/$,/src/,}
 EXTRACT_SUFX=	.tar.bz2
 DISTFILES+=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	jlam@pkgsrc.org
 HOMEPAGE=	http://www.perl.org/
 COMMENT=	Practical Extraction and Report Language
 #LICENSE=	gnu-gpl-v2
 PKG_DESTDIR_SUPPORT=	user-destdir
 CONFLICTS=	perl-base-[0-9]* perl-thread-[0-9]*			\
 		p5-CGI-2.66 p5-CGI-2.75 p5-CGI-2.75.[0-2]
 .include "../../mk/bsd.prefs.mk"
 # Determine the Perl API version from the patchlevel.h file from the
 # source distribution.
+#
 PERL5_API_VERS=		${PERL5_API_VERS_cmd:sh}
 PERL5_API_VERS_cmd=	\
 	if ${TEST} -f ${WRKSRC}/patchlevel.h; then			\
 		${AWK} '/\#define[ 	]*PERL_API_REVISION/ { R = $$3 }\
 			/\#define[ 	]*PERL_API_VERSION/ { r = "."$$3 } \
 			/\#define[ 	]*PERL_API_SUBVERSION/ { s = "."$$3 } \
 			END { printf "%s%s%s\n", R, r, s }'		\
 			${WRKSRC}/patchlevel.h;				\
 	else								\
 		${ECHO} "unknown";					\
 	fi
 PERL5_PREFIX=		${PREFIX}
 PERL5_VENDORPREFIX=	${PERL5_PREFIX}
 PERL5_SITEPREFIX?=	${PERL5_PREFIX}
 BUILD_DEFS+=		PERL5_SITEPREFIX
 PERL5=			${PERL5_PREFIX}/bin/perl
 PERL5_PERLBASE=		${PERL5_PREFIX}/lib/perl5
 PERL5_VENDORBASE=	${PERL5_VENDORPREFIX}/lib/perl5/vendor_perl
+#
 # The unusual check for empty(PERL5_SITEPREFIX) is because ${PREFIX} isn't
 # defined until bsd.pkg.mk is included, so when we inspect its value at
 # this point, it's empty.
+#
 .if empty(PERL5_SITEPREFIX) || \
     !empty(PERL5_SITEPREFIX:M${LOCALBASE}) || \
     !empty(PERL5_SITEPREFIX:M${LOCALBASE}/*)
 PERL5_SITEBASE=		${PERL5_SITEPREFIX}/lib/perl5/site_perl
 .else
 PERL5_SITEBASE=		${PERL5_SITEPREFIX}
 .endif
 PERL5_PRIVLIB=		${PERL5_PERLBASE}/${PERL5_API_VERS}
 PERL5_VENDORLIB=	${PERL5_VENDORBASE}/${PERL5_API_VERS}
 .if !empty(PERL5_SITEBASE:M*lib/perl5/site_perl)
 PERL5_SITELIB=		${PERL5_SITEBASE}/${PERL5_API_VERS}
 .else
 PERL5_SITELIB=		${PERL5_SITEBASE}/lib/perl5/site_perl/${PERL5_API_VERS}
 .endif
 .include "../../mk/compiler.mk"
 HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	./Configure
 CONFIGURE_ARGS+=	-sde
 CONFIGURE_ARGS+=	-Darchname="${MACHINE_ARCH}-${LOWER_OPSYS}"
 CONFIGURE_ARGS+=	-Dcc=${CC:Q}
 CONFIGURE_ARGS+=	-Doptimize=${CFLAGS:M*:Q}
 CONFIGURE_ARGS+=	-Ui_malloc
 CONFIGURE_ARGS+=	-Uusemymalloc
 CONFIGURE_ARGS+=	-Uinstallusrbinperl
 MAKE_ENV+=		LC_ALL="C"
 MAKE_JOBS_SAFE=		no
 TEST_TARGET=		test
 ###
 ### Installation directories for "perl", "vendor" and "site" bits.
 ###
 CONFIGURE_ARGS+=	-Dinstallstyle="lib/perl5"
 CONFIGURE_ARGS+=	-Dprefix=${PERL5_PREFIX:Q}
 CONFIGURE_ARGS+=	-Dsiteprefix=${PERL5_SITEPREFIX:Q}
 CONFIGURE_ARGS+=	-Dvendorprefix=${PERL5_VENDORPREFIX:Q}
 # The Perl Configure script will install scripts into "*/script"
 # directories if they exist, so override with explicit settings.
+#
 PERL5_SCRIPTDIR=	${PERL5_PERLBASE}/bin
 CONFIGURE_ARGS+=	-Dscriptdir=${PERL5_SCRIPTDIR:Q}
 CONFIGURE_ARGS+=	-Dsitescript=${PERL5_SITEBASE:Q}/bin
 CONFIGURE_ARGS+=	-Dvendorscript=${PERL5_VENDORBASE:Q}/bin
 # Put any compiled binaries into vendor- and site-specific locations to
 # avoid conflicts with each other.  The perllink script will handle all
 # the appropriate symlinking.
+#
 CONFIGURE_ARGS+=	-Dsitebin=${PERL5_SITEBASE:Q}/bin
 CONFIGURE_ARGS+=	-Dvendorbin=${PERL5_VENDORBASE:Q}/bin
 # Put the API-specific files into API-specific directories instead
 # of the default version-specific directories.
+#
 CONFIGURE_ARGS+=	-Dprivlib=${PERL5_PRIVLIB:Q}
 CONFIGURE_ARGS+=	-Dsitelib=${PERL5_SITELIB:Q}
 CONFIGURE_ARGS+=	-Dvendorlib=${PERL5_VENDORLIB:Q}
 # Search for version-specific directories under these directories.
 CONFIGURE_ARGS+=	-Dsitelib_stem=${PERL5_SITEBASE:Q}
 CONFIGURE_ARGS+=	-Dvendorlib_stem=${PERL5_VENDORBASE:Q}
 # Avoid manpage conflicts between the standard Perl library, 3rd-party
 # modules, and other packages.
+#
 PERL5_MAN1DIR=		${PERL5_PERLBASE}/${PKGMANDIR}/man1
 CONFIGURE_ARGS+=	-Dman1ext="1"
 CONFIGURE_ARGS+=	-Dman1dir=${PERL5_MAN1DIR:Q}
 CONFIGURE_ARGS+=	-Dsiteman1dir=${PERL5_SITEBASE:Q}/${PKGMANDIR:Q}/man1
 CONFIGURE_ARGS+=	-Dvendorman1dir=${PERL5_VENDORBASE:Q}/${PKGMANDIR:Q}/man1
 CONFIGURE_ARGS+=	-Dman3ext="3"
 CONFIGURE_ARGS+=	-Dman3dir=${PERL5_PERLBASE:Q}/${PKGMANDIR:Q}/man3
 CONFIGURE_ARGS+=	-Dsiteman3dir=${PERL5_SITEBASE:Q}/${PKGMANDIR:Q}/man3
 CONFIGURE_ARGS+=	-Dvendorman3dir=${PERL5_VENDORBASE:Q}/${PKGMANDIR:Q}/man3
 .if ${OPSYS} == "Darwin"
+#
 # The Perl build attempts to work around case-insensitivity problems on
 # HFS filesystems by using GNUmakefiles, so we need to use GNU make.
+#
 USE_TOOLS+=	gmake
 .endif
+#
 # For the moment disable the building of a shared libperl.dylib on Darwin
 # => 9.0 as it breaks the build.  This should just be considered a temporary
 # work around until the actual problem can be fixed as this worked for
 # Darwin < 9.0.
+#
 .if empty(MACHINE_PLATFORM:MDarwin-9.*-*)
 CONFIGURE_ARGS+=	-Duseshrplib
 .endif
 # Perl embeds the full paths to the following tools in several installed
 # files, so make sure the paths to the ones in ${TOOLS_DIR} aren't used.
+#
 USE_TOOLS+=		hostname ln sed test
 CONFIGURE_ARGS+=	-Daphostname=${TOOLS_HOSTNAME_CMD:Q}
 CONFIGURE_ARGS+=	-Dln=${TOOLS_LN:Q}
 CONFIGURE_ARGS+=	-Dsed=${TOOLS_SED:Q}
 TOOLS_ALIASES.sed+=	${TOOLS_SED:T}
 CONFIGURE_ARGS+=	-Dsh=${TOOLS_SH:Q}
 CONFIGURE_ARGS+=	-Dissymlink="${TOOLS_TEST} -h"
 CONFIGURE_ARGS+=	-Dperl5=${FALSE}
 # Nail down the needed libraries for each platform here to avoid hidden
 # dependencies.  If this isn't defined, then use the perl defaults for the
 # particular operating system.
+#
 LIBSWANTED.Darwin=	m c
 LIBSWANTED.DragonFly=	m crypt
 LIBSWANTED.FreeBSD=	m crypt
 LIBSWANTED.IRIX=	m crypt
 LIBSWANTED.Interix=	m dl
 LIBSWANTED.Linux=	m crypt dl nsl
 LIBSWANTED.NetBSD=	m crypt
 LIBSWANTED.OpenBSD=	m crypt
 LIBSWANTED.SunOS=	m crypt dl socket nsl
 LIBSWANTED=		${LIBSWANTED.${OPSYS}}
 # Nail down the directories in which the system libraries may be found.
 # If this isn't defined, then use the perl defaults for the particular
 # operating system.
+#
 SYSLIBPATH.Darwin=	/usr/lib
 SYSLIBPATH.DragonFly=	/usr/lib
 SYSLIBPATH.FreeBSD=	/usr/lib
 SYSLIBPATH.Interix=	/usr/lib
 SYSLIBPATH.NetBSD=	/usr/lib
 SYSLIBPATH.OpenBSD=	/usr/lib
 SYSLIBPATH.SunOS=	/usr/lib
 SYSLIBPATH=		${SYSLIBPATH.${OPSYS}}
 # Nail down the directories in which headers and libraries of
 # locally-installed software may be found.
+#
 LOCLIBPATH=		${LOCALBASE}/lib
 LOCINCPATH=		${LOCALBASE}/include
 # On a.out platforms, we link with "ld" and on ELF platforms, we link with
 # "cc", so we need to use different options to pass the run-time search path
 # flags to the link command in the right way.
+#
 .if ${OBJECT_FMT} == "a.out"
 LOCLIBRPATHFLAGS=	${LOCLIBPATH:S/^/${LINKER_RPATH_FLAG} /g}
 .elif ${OBJECT_FMT} == "ELF"
 LOCLIBRPATHFLAGS=	${LOCLIBPATH:S/^/${COMPILER_RPATH_FLAG}/g}
 .else
 LOCLIBRPATHFLAGS=	# empty
 .endif
 .include "../../mk/dlopen.buildlink3.mk"
 CHECK_BUILTIN.pthread:=	yes
 .include "../../mk/pthread.builtin.mk"
 CHECK_BUILTIN.pthread:=	no
 # By default, build with threads only if the threads are native.
 .if !empty(USE_BUILTIN.pthread:M[yY][eE][sS])
 PERL5_BUILD_THREADS_SUPPORT=	yes
 .else
 PERL5_BUILD_THREADS_SUPPORT=	${DLOPEN_REQUIRE_PTHREADS}
 .endif
 ### [Sat Dec 18 17:29:44 EST 2004 : jlam]
 ### Native threading on VAX isn't ready for primetime in NetBSD>=2.0.
 ### Build Perl without threads-support until VAX native threads are
 ### known to work.
 ###
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-vax) && \
     !empty(USE_BUILTIN.pthread:M[yY][eE][sS])
 PKG_HACKS+=			broken-vax-pthreads
 PERL5_BUILD_THREADS_SUPPORT=	no
 .endif
 PKG_OPTIONS_VAR=		PKG_OPTIONS.perl
 PKG_SUPPORTED_OPTIONS=		debug threads
 .if !empty(PERL5_BUILD_THREADS_SUPPORT:M[yY][eE][sS])
 PKG_SUGGESTED_OPTIONS=		threads
 .endif
 .include "../../mk/bsd.options.mk"
 .if !empty(PKG_OPTIONS:Mthreads)
 .  include "../../mk/pthread.buildlink3.mk"
 CONFIGURE_ARGS+=	-Duseithreads
 CFLAGS+=		${PTHREAD_CFLAGS}
 LIBSWANTED+=		${PTHREAD_LIBS:M-l*:S/^-l//}
 .else
 CONFIGURE_ARGS+=	-Uuseithreads
 .endif
 .if !empty(PKG_OPTIONS:Mdebug)
 CFLAGS+=		-DDEBUGGING
 .endif
 .if !empty(LIBSWANTED)
 CONFIGURE_ARGS+=	-Dlibswanted=${LIBSWANTED:Q}
 .endif
 .include "../../mk/compiler.mk"
 .if ${OPSYS} == "IRIX"
 .  if defined(ABI) && ${ABI} == "64"
 CONFIGURE_ARGS+=	-Duse64bitint
 .  endif
 .endif
 # Remove a spurious workdir reference
 SUBST_CLASSES+=		rm
 SUBST_STAGE.rm=		pre-install
 SUBST_FILES.rm=		lib/Config_heavy.pl
 SUBST_SED.rm=	-e "s!^rm_try=\'/.*work/.tools/bin/rm -f!rm_try=\'/bin/rm -f!"
 # Replace our perl as the interpreter
 REPLACE_PERL+=		lib/Class/ISA.pm
 REPLACE_PERL+=		lib/File/DosGlob.pm
 REPLACE_PERL+=		lib/version.pm
 # And replace a perl interpreter during the pre-install stage
 # I think this may be a bootstrap script, so can't use REPLACE_PERL
 # because that is acted upon already in the pre-configure stage
 SUBST_CLASSES+=		miniperl
 SUBST_STAGE.miniperl=	pre-install
 SUBST_FILES.miniperl=	lib/ExtUtils/xsubpp
 SUBST_SED.miniperl=	-e "1s:\#!./miniperl:\#!${PERL5}:"
 # Some platforms may want the directory mode not to be 0755.  This
 # is, unfortunately, hardcoded in quite a few places in Perl, so
 # let's substitute what pkgsrc says instead.
+#
 SUBST_CLASSES+=		dirmode
 SUBST_STAGE.dirmode=	post-patch
 SUBST_FILES.dirmode=	installhtml installman installperl		\
 			lib/ExtUtils/Install.pm
 SUBST_SED.dirmode=	-e "s/755/${PKGDIRMODE}/g;/umask(/d"
 # It's tough to guess which hints file will be used, so add our modifications
 # to all of them:
+#
 # - Add the pkgsrc-derived LDFLAGS for linking against pthreads to the
 #   usethreads.cbu call-back script.
+#
 # - Generate a pkgsrc.cbu call-back script that sets the correct LDFLAGS
 #   for linking against pkgsrc-installed libraries.
+#
 # - Explicitly set the local compiler search paths to contain only the
 #   pkgsrc-controlled directories.
+#
 pre-configure:
 .if defined(PTHREAD_LDFLAGS) && !empty(PTHREAD_LDFLAGS)
 	hintdir="${WRKSRC}/hints";					\
 	for hints in $${hintdir}/*.sh; do				\
 		${CHMOD} +w $${hints};					\
 		{ ${ECHO} "";						\
 		  ${ECHO} "cat >> UU/usethreads.cbu <<'EOCBU'";		\
 		  ${ECHO} "";						\
 		  ${ECHO} "# Add pkgsrc-derived ldflags to link with thread support."; \
 		  ${ECHO} 'ldflags="'${PTHREAD_LDFLAGS:Q}' $$ldflags"';	\
 		  ${ECHO} 'lddlflags="'${PTHREAD_LDFLAGS:Q}' $$lddlflags"'; \
 		  ${ECHO} "EOCBU";					\
 		} >> $${hints};						\
 	done
 .endif
 	hintdir="${WRKSRC}/hints";					\
 	for hints in $${hintdir}/*.sh; do				\
 		${CHMOD} +w $${hints};					\
 		{ ${ECHO} "";						\
 		  ${ECHO} "cat > UU/pkgsrc.cbu <<'EOCBU'";		\
 		  ${ECHO} "# This script UU/pkgsrc.cbu will get 'called-back' by Configure to set"; \
 		  ${ECHO} '# linker options after all other call-back scripts have been invoked.'; \
 		  ${ECHO} 'ldflags="'${LOCLIBRPATHFLAGS:Q}' $$ldflags"'; \
 		  ${ECHO} 'lddlflags="'${LOCLIBRPATHFLAGS:Q}' $$lddlflags"'; \
 		  ${ECHO} "EOCBU";					\
 		} >> $${hints};						\
 	done
 	hintdir="${WRKSRC}/hints";					\
 	for hints in $${hintdir}/*.sh; do				\
 		${CHMOD} +w $${hints};					\
 		{ ${ECHO} "";						\
 		  ${ECHO} "# Set pkgsrc defaults for library and header search paths."; \
 		  ${ECHO} 'locincpth="'${LOCINCPATH:Q}'"';		\
 		  ${ECHO} 'loclibpth="'${LOCLIBPATH:Q}'"';		\
 		} >> $${hints};						\
 	done
 .if !empty(SYSLIBPATH)
 	hintdir="${WRKSRC}/hints";					\
 	for hints in $${hintdir}/*.sh; do				\
 		${CHMOD} +w $${hints};					\
 		${ECHO} 'glibpth="'${SYSLIBPATH:Q}'"' >> $${hints};	\
 	done
 .endif
 post-build:
 	${SED}	-e "s,@PERL5@,"${PERL5:Q}",g"				\
 		-e "s,@SH@,"${SH:Q}",g"					\
 		-e "s,@PKGMANDIR@,"${PKGMANDIR:Q}",g"			\
 		${FILESDIR}/perllink.in > ${WRKDIR}/perllink.sh
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 PERL5_PACKLIST_DIR_cmd=	. ${WRKSRC}/config.sh;	echo $$installarchlib
 PERL5_PACKLIST_DIR=	${PERL5_PACKLIST_DIR_cmd:sh}
 PERL5_PACKLIST=		.packlist
 PERL5_PACKLIST_DESTDIR=	no
 FILES_SUBST+=		PERL5_COMMENT=\#
 FILES_SUBST+=		PERL5_PACKLIST=
 PLIST_SRC=		${WRKDIR}/.PLIST_SRC
 post-install: perl5-post-install
 perl5-post-install:
 	if ${TEST} -x ${DESTDIR}${PREFIX}/bin/a2p; then			\
 		strip ${DESTDIR}${PREFIX}/bin/a2p;			\
 	fi
 	${INSTALL_SCRIPT} ${WRKDIR}/perllink.sh ${DESTDIR}${PERL5_SCRIPTDIR}/perllink;	\
 	${INSTALL_MAN} ${FILESDIR}/perllink.1 ${DESTDIR}${PERL5_MAN1DIR}/perllink.1;	\
 	${RM} -f ${DESTDIR}${PREFIX}/bin/perllink				\
 		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/perllink.1;		\
 	${LN} -s ${PERL5_SCRIPTDIR}/perllink ${DESTDIR}${PREFIX}/bin/perllink;	\
 	${LN} -s ${PERL5_MAN1DIR}/perllink.1					\
 		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/perllink.1;	\
 	{ ${CAT} ${PKGDIR}/PLIST;					\
 	  ${ECHO} "${PERL5_SCRIPTDIR}/perllink";			\
 	  ${ECHO} "${PERL5_MAN1DIR}/perllink.1";			\
 	} | ${SED} -e "s,^"${PREFIX:Q}"/,," > ${PLIST_SRC}
 .include "packlist.mk"
 .include "../../mk/bsd.pkg.mk"

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

 @@ -1,57 +1,33 @@
-$NetBSD: patch-aa,v 1.30 2006/04/09 06:34:32 jlam Exp $
+$NetBSD: patch-aa,v 1.31 2008/10/10 21:58:43 he Exp $
---- lib/ExtUtils/MM_Unix.pm.orig	2005-05-21 05:42:56.000000000 -0400
+--- lib/ExtUtils/MM_Unix.pm.orig	2007-12-18 11:47:07.000000000 +0100
 +++ lib/ExtUtils/MM_Unix.pm
-@@ -12,8 +12,8 @@ use DirHandle;
+@@ -11,8 +11,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_OSF $Is_IRIX  $Is_BSD
 +            $Is_SunOS4 $Is_Solaris $Is_SunOS
              $Verbose %pm
              %Config_Override
             );
@@ -32,13 +32,11 @@ BEGIN {
@@ -30,8 +30,6 @@ 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
+@@ -932,7 +930,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $
 -                  $^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_NetBSD || $Is_Interix) && $Config{'useshrplib'} eq 'true') {
-+    if ($Is_BSD && $Config{'useshrplib'}) {
++    if ($Is_BSD && $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
@@ -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)

 @@ -1,103 +1,107 @@
-$NetBSD: patch-ah,v 1.9 2008/01/08 15:19:39 apb Exp $
+$NetBSD: patch-ah,v 1.10 2008/10/10 21:58:43 he Exp $
---- perl.c.orig	2006-01-31 12:34:47.000000000 +0000
+--- perl.c.orig	2007-12-18 11:47:08.000000000 +0100
 +++ perl.c
-@@ -4615,8 +4615,10 @@ S_procself_val(pTHX_ SV *sv, char *arg0)
+@@ -1454,8 +1454,10 @@ S_procself_val(pTHX_ SV *sv, const char
         to the executable (or returning an error from the readlink).  Any valid
         path has a '/' in it somewhere, so use that to validate the result.
         See http://www.freebsd.org/cgi/query-pr.cgi?pr=35703
++
 +       NetBSD's implementation sometimes returns "/"; reject that too.
      */
 -    if (len > 0 && memchr(buf, '/', len)) {
 +    if (len > 1 && memchr(buf, '/', len)) {
  	sv_setpvn(sv,buf,len);
+     }
      else {
-@@ -4770,45 +4772,12 @@ S_init_perllib(pTHX)
+@@ -4747,45 +4749,8 @@ S_init_perllib(pTHX)
+     }
  /* Use the ~-expanded versions of APPLLIB (undocumented),
 -    ARCHLIB PRIVLIB SITEARCH SITELIB VENDORARCH and VENDORLIB
 +    SITEARCH SITELIB VENDORARCH VENDORLIB ARCHLIB and PRIVLIB
  */
- #ifdef APPLLIB_EXP
+-#ifdef APPLLIB_EXP
-     incpush(APPLLIB_EXP, TRUE, TRUE, TRUE);
+-    incpush(APPLLIB_EXP, TRUE, TRUE, TRUE, TRUE);
- #endif
+-#endif
+-
 -#ifdef ARCHLIB_EXP
--    incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE);
+-    incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE, TRUE);
 -#endif
 -#ifdef MACOS_TRADITIONAL
 -    {
 -	Stat_t tmpstatbuf;
--    	SV * privdir = NEWSV(55, 0);
+-    	SV * privdir = newSV(0);
 -	char * macperl = PerlEnv_getenv("MACPERL");
+-
 -	if (!macperl)
 -	    macperl = "";
+-
 -	Perl_sv_setpvf(aTHX_ privdir, "%slib:", macperl);
 -	if (PerlLIO_stat(SvPVX(privdir), &tmpstatbuf) >= 0 && S_ISDIR(tmpstatbuf.st_mode))
--	    incpush(SvPVX(privdir), TRUE, FALSE, TRUE);
+-	    incpush(SvPVX(privdir), TRUE, FALSE, TRUE, FALSE);
 -	Perl_sv_setpvf(aTHX_ privdir, "%ssite_perl:", macperl);
 -	if (PerlLIO_stat(SvPVX(privdir), &tmpstatbuf) >= 0 && S_ISDIR(tmpstatbuf.st_mode))
--	    incpush(SvPVX(privdir), TRUE, FALSE, TRUE);
+-	    incpush(SvPVX(privdir), TRUE, FALSE, TRUE, FALSE);
+-
 -   	SvREFCNT_dec(privdir);
 -    }
 -    if (!PL_tainting)
--	incpush(":", FALSE, FALSE, TRUE);
+-	incpush(":", FALSE, FALSE, TRUE, FALSE);
 -#else
 -#ifndef PRIVLIB_EXP
 -#  define PRIVLIB_EXP "/usr/local/lib/perl5:/usr/local/lib/perl"
 -#endif
 -#if defined(WIN32)
--    incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE);
+-    incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE, TRUE);
 -#else
--    incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE);
+-    incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE, TRUE);
 -#endif
+-
  #ifdef SITEARCH_EXP
      /* sitearch is always relative to sitelib on Windows for
       * DLL-based path intuition to work correctly */
-@@ -4850,6 +4819,39 @@ S_init_perllib(pTHX)
+@@ -4828,6 +4793,43 @@ S_init_perllib(pTHX)
-     incpush(PERL_VENDORLIB_STEM, FALSE, TRUE, TRUE);
+     incpush(PERL_VENDORLIB_STEM, FALSE, TRUE, TRUE, TRUE);
  #endif
 +#ifdef APPLLIB_EXP
 +    incpush(APPLLIB_EXP, TRUE, TRUE, TRUE, TRUE);
 +#endif
++
 +#ifdef ARCHLIB_EXP
-+    incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE);
++    incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE, TRUE);
 +#endif
 +#ifdef MACOS_TRADITIONAL
 +    {
 +	Stat_t tmpstatbuf;
-+    	SV * privdir = NEWSV(55, 0);
++    	SV * privdir = newSV(0);
 +	char * macperl = PerlEnv_getenv("MACPERL");
++
 +	if (!macperl)
 +	    macperl = "";
++
 +	Perl_sv_setpvf(aTHX_ privdir, "%slib:", macperl);
 +	if (PerlLIO_stat(SvPVX(privdir), &tmpstatbuf) >= 0 && S_ISDIR(tmpstatbuf.st_mode))
-+	    incpush(SvPVX(privdir), TRUE, FALSE, TRUE);
++	    incpush(SvPVX(privdir), TRUE, FALSE, TRUE, FALSE);
 +	Perl_sv_setpvf(aTHX_ privdir, "%ssite_perl:", macperl);
 +	if (PerlLIO_stat(SvPVX(privdir), &tmpstatbuf) >= 0 && S_ISDIR(tmpstatbuf.st_mode))
-+	    incpush(SvPVX(privdir), TRUE, FALSE, TRUE);
++	    incpush(SvPVX(privdir), TRUE, FALSE, TRUE, FALSE);
++
 +   	SvREFCNT_dec(privdir);
 +    }
 +    if (!PL_tainting)
-+	incpush(":", FALSE, FALSE, TRUE);
++	incpush(":", FALSE, FALSE, TRUE, FALSE);
 +#else
 +#ifndef PRIVLIB_EXP
 +#  define PRIVLIB_EXP "/usr/local/lib/perl5:/usr/local/lib/perl"
 +#endif
 +#if defined(WIN32)
-+    incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE);
++    incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE, TRUE);
 +#else
-+    incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE);
++    incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE, TRUE);
 +#endif
++
  #ifdef PERL_OTHERLIBDIRS
-     incpush(PERL_OTHERLIBDIRS, TRUE, TRUE, TRUE);
+     incpush(PERL_OTHERLIBDIRS, TRUE, TRUE, TRUE, TRUE);
  #endif

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

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

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

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

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

 @@ -1,34 +1,34 @@
-$NetBSD: patch-zc,v 1.2 2006/04/09 06:34:33 jlam Exp $
+$NetBSD: patch-zc,v 1.3 2008/10/10 21:58:44 he Exp $
---- Policy_sh.SH.orig	2003-08-01 08:23:23.000000000 -0400
+--- Policy_sh.SH.orig	2007-12-18 11:47:07.000000000 +0100
 +++ Policy_sh.SH
 @@ -184,10 +184,10 @@ do
  	;;
      sitearch)	dflt="$sitelib/$archname" ;;
 -    siteman1)	dflt="$siteprefix/man/man1" ;;
 -    siteman3)	dflt="$siteprefix/man/man3" ;;
 +    siteman1dir)	dflt="$siteprefix/man/man1" ;;
 +    siteman3dir)	dflt="$siteprefix/man/man3" ;;
      # We don't know what to do with these yet.
 -    sitehtml1)	dflt='' ;;
 +    sitehtml1dir)	dflt='' ;;
      sitehtm31dir)	dflt='' ;;
      # Directories for vendor-supplied add-on files
 @@ -213,11 +213,11 @@ do
  		;;
  	    vendorarch)	dflt="$vendorlib/$archname" ;;
 -	    vendorman1)	dflt="$vendorprefix/man/man1" ;;
 -	    vendorman3)	dflt="$vendorprefix/man/man3" ;;
 +	    vendorman1dir)	dflt="$vendorprefix/man/man1" ;;
 +	    vendorman3dir)	dflt="$vendorprefix/man/man3" ;;
  	    # We don't know what to do with these yet.
 -	    vendorhtml1)	dflt='' ;;
 -	    vendorhtm3)	dflt='' ;;
 +	    vendorhtml1dir)	dflt='' ;;
 +	    vendorhtml3dir)	dflt='' ;;
  	    esac  # End of vendorprefix != ''
  	fi

 @@ -1,59 +1,37 @@
-$NetBSD: patch-ba,v 1.4 2006/08/08 15:36:00 tron Exp $
+$NetBSD: patch-ba,v 1.5 2008/10/10 21:58:43 he Exp $
---- hints/netbsd.sh.orig	2003-08-07 17:57:56.000000000 +0100
+--- hints/netbsd.sh.orig	2007-12-18 11:47:07.000000000 +0100
-+++ hints/netbsd.sh	2006-08-08 16:33:33.000000000 +0100
++++ hints/netbsd.sh
-@@ -78,6 +78,30 @@
+@@ -79,7 +79,7 @@ case "$osvers" in
  	d_setreuid="$undef"
  	;;
  esac
-+case "$osvers" in
+ case "$osvers" in
-+0.9*|1.*|2.*|3.*|4.*)
+-0.9*|1.*|2.*|3.*|4.*)
-+	d_getprotoent_r="$undef"
++0.9*|1.*|2.*|3.*|4.*|5.*)
-+	d_getprotobyname_r="$undef"
+ 	d_getprotoent_r="$undef"
-+	d_getprotobynumber_r="$undef"
+ 	d_getprotobyname_r="$undef"
-+	d_setprotoent_r="$undef"
+ 	d_getprotobynumber_r="$undef"
-+	d_endprotoent_r="$undef"
+@@ -175,23 +175,6 @@ $define|true|[yY]*)
-+	d_getservent_r="$undef"
+ esac
 +	d_getservbyname_r="$undef"
 +	d_getservbyport_r="$undef"
 +	d_setservent_r="$undef"
 +	d_endservent_r="$undef"
 +	d_getprotoent_r_proto="$undef"
 +	d_getprotobyname_r_proto="$undef"
 +	d_getprotobynumber_r_proto="$undef"
 +	d_setprotoent_r_proto="$undef"
 +	d_endprotoent_r_proto="$undef"
 +	d_getservent_r_proto="$undef"
 +	d_getservbyname_r_proto="$undef"
 +	d_getservbyport_r_proto="$undef"
 +	d_setservent_r_proto="$undef"
 +	d_endservent_r_proto="$undef"
 +	;;
 +esac
  # These are obsolete in any netbsd.
  d_setrgid="$undef"
@@ -133,23 +157,6 @@
  esac
  EOCBU
 -# Set sensible defaults for NetBSD: look for local software in
 -# /usr/pkg (NetBSD Packages Collection) and in /usr/local.
 -#
 -loclibpth="/usr/pkg/lib /usr/local/lib"
 -locincpth="/usr/pkg/include /usr/local/include"
 -case "$rpathflag" in
 -'')
 -	ldflags=
 -	;;
 -*)
 -	ldflags=
 -	for yyy in $loclibpth; do
 -		ldflags="$ldflags $rpathflag$yyy"
 -	done
 -	;;
 -esac
+-
  case `uname -m` in
  alpha)
      echo 'int main() {}' > try.c

 @@ -1,110 +1,103 @@
-$NetBSD: patch-ca,v 1.5 2006/04/09 06:34:33 jlam Exp $
+$NetBSD: patch-ca,v 1.6 2008/10/10 21:58:43 he Exp $
---- Configure.orig	2006-01-08 09:51:03.000000000 -0500
+--- Configure.orig	2007-12-18 11:47:07.000000000 +0100
 +++ Configure
-@@ -3130,11 +3130,13 @@ EOM
+@@ -3206,13 +3206,14 @@ EOM
  		dgux)	osname=dgux
  			osvers="$3"
  			;;
-+		dragonfly) osname=dragonfly
+ 		dragonfly) osname=dragonfly
-+			osvers=`$uname -r | UU/tr '[A-Z]' '[a-z]'` ;;
+-			osvers="$3"
 +			osvers=`$uname -r | UU/tr '[A-Z]' '[a-z]'`
  			;;
  		dynixptx*) osname=dynixptx
  			osvers=`echo "$4"|sed 's/^v//'`
  			;;
  		freebsd) osname=freebsd
 -			osvers="$3" ;;
-+			osvers=`$uname -r | UU/tr '[A-Z]' '[a-z]'` ;;
++			osvers=`$uname -r | UU/tr '[A-Z]' '[a-z]'`
 +			;;
  		genix)	osname=genix ;;
  		gnu)	osname=gnu
  			osvers="$3" ;;
-@@ -3156,7 +3158,7 @@ EOM
+@@ -3234,7 +3235,7 @@ EOM
  		MiNT)	osname=mint
  			;;
  		netbsd*) osname=netbsd
 -			osvers="$3"
 +			osvers=`$uname -r | UU/tr '[A-Z]' '[a-z]'`
  			;;
  		news-os) osvers="$3"
  			case "$3" in
-@@ -3167,8 +3169,8 @@ EOM
+@@ -3245,8 +3246,8 @@ EOM
  		next*) osname=next ;;
  		nonstop-ux) osname=nonstopux ;;
  		openbsd) osname=openbsd
 -                	osvers="$3"
 -                	;;
 +			osvers=`$uname -r | UU/tr '[A-Z]' '[a-z]'`
 +			;;
  		os2)	osname=os2
  			osvers="$4"
  			;;
-@@ -4445,7 +4447,7 @@ case "$plibpth" in
+@@ -4739,7 +4740,7 @@ case "$plibpth" in
  esac
  case "$libpth" in
  ' ') dlist='';;
 -'') dlist="$loclibpth $plibpth $glibpth";;
 +'') dlist="$plibpth $glibpth $loclibpth";;
  *) dlist="$libpth";;
  esac
-@@ -6485,7 +6487,9 @@ rp='Pathname for the site-specific libra
+@@ -6425,7 +6426,9 @@ rp='Pathname for the site-specific libra
  . ./getfile
- sitelib="$ans"
+ prefixvar=sitelib
- sitelibexp="$ansexp"
+ . ./setprefixvar
 -sitelib_stem=`echo "$sitelibexp" | sed "s,/$version$,,"`
 +if $test -z "$sitelib_stem"; then
 +	sitelib_stem=`echo "$sitelibexp" | sed "s,/$version$,,"`
 +fi
  : Change installation prefix, if necessary.
- if $test X"$prefix" != X"$installprefix"; then
+ : Determine list of previous versions to include in @INC
- 	installsitelib=`echo $sitelibexp | $sed "s#^$prefix#$installprefix#"`
+ $cat > getverlist <<EOPL
-@@ -6606,7 +6610,9 @@ case "$vendorprefix" in
+@@ -6925,7 +6928,9 @@ case "$vendorprefix" in
  	vendorlibexp="$ansexp"
  	;;
  esac
 -vendorlib_stem=`echo "$vendorlibexp" | sed "s,/$version$,,"`
 +if $test -z "$vendorlib_stem"; then
 +	vendorlib_stem=`echo "$vendorlibexp" | sed "s,/$version$,,"`
 +fi
- : Change installation prefix, if necessary.
+ prefixvar=vendorlib
- if $test X"$prefix" != X"$installprefix"; then
+ . ./installprefix
  	installvendorlib=`echo $vendorlibexp | $sed "s#^$prefix#$installprefix#"`
-@@ -7889,7 +7895,7 @@ if "$useshrplib"; then
+@@ -9170,6 +9175,13 @@ EOCP
  	solaris)
  		xxx="-R $shrpdir"
  		;;
 -	freebsd|netbsd|openbsd|interix)
 +	freebsd|netbsd|openbsd|dragonfly|interix)
  		xxx="-Wl,-R$shrpdir"
  		;;
  	bsdos|linux|irix*|dec_osf|gnu*)
@@ -9010,6 +9016,13 @@ EOCP
  	;;
  esac
 +: Look for a hint-file generated 'call-back-unit'.  We need
 +: to set some defaults for building perl in pkgsrc.
 +if $test -f pkgsrc.cbu; then
 +    echo "Setting pkgsrc-specific hints regarding compiler/linker flags..."
 +    . ./pkgsrc.cbu
 +fi
++
  case "$vendorprefix" in
  '')	d_vendorbin="$undef"
  	vendorbin=''
-@@ -17776,7 +17789,15 @@ RCAT(Rei,ser)
+@@ -18347,7 +18359,15 @@ RCAT(Rei,ser)
  ACAT(Cir,cus)
  EOCP
  $cppstdin $cppflags $cppminus <cpp_stuff.c >cpp_stuff.out 2>&1
 -if $contains 'Circus' cpp_stuff.out >/dev/null 2>&1; then
 +# yuck, what a hack.
 +# MIPSPro compiler/preprocessor behaves differently if invoked on
 +# stdin vs file.  Here we test for stdin, but lateron we use files.
 +# So force it to work the way we know it does:
 +if [ x"${OPSYS}" = x"IRIX" ]; then
 +	echo "Hacking MIPSPro on file vs. stdin..." >&4
 +	echo "We know we can catify or stringify, separately or together!"
 +	cpp_stuff=42
 +elif $contains 'Circus' cpp_stuff.out >/dev/null 2>&1; then
  	echo "Oh!  Smells like ANSI's been here." >&4
  	echo "We can catify or stringify, separately or together!"
  	cpp_stuff=42

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

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