Updating lang/perl5 from 5.12.1 to 5.12.1nb1

pkgsrc changes:
- preparing for databases/p5-gdbm (using Makefile.common)
- supporting external access to perl install dirs (dirs.mk)
- fixing some errors/warnings from pkglint
- adding conflict to packages of CPAN modules which are in Perl5 code
  on the one hand and are broken with perl-5.10+

Bumping PKGREVISION (dependencies changed, rebuild highly recommended).
Recursive rebuild is not required.

8 files changed, 99 insertions, 70 deletions

diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile
index 0d463f319a3..001ed0fc812 100644
--- a/lang/perl5/Makefile
+++ b/lang/perl5/Makefile
@@ -1,22 +1,20 @@
-# $NetBSD: Makefile,v 1.161 2010/08/21 03:12:46 obache Exp $
+# $NetBSD: Makefile,v 1.162 2010/08/27 05:27:37 sno Exp $
 
 .include "license.mk"
+.include "Makefile.common"
 
-DISTNAME=	perl-5.12.1
-CATEGORIES=	lang devel perl5
-#PKGREVISION=	1
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN:S,/modules/by-module/$,/src/5.0/,}
-DISTFILES+=	${DISTNAME}${EXTRACT_SUFX}
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.perl.org/
+PKGREVISION=	1
 COMMENT=	Practical Extraction and Report Language
-LICENSE=	${PERL5_LICENSE}
 
 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]
+		p5-CGI-2.66{,nb*} p5-CGI-2.75{,nb*} p5-CGI-2.75.[0-2]	\
+		p5-Tie-File-0.96{,nb*}					\
+		p5-Memoize-1.01{,nb*}
+
+SUPERSEDES+=	p5-Tie-File<0.97
+SUPERSEDES+=	p5-Memoize<1.02
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -35,34 +33,7 @@ PERL5_API_VERS_cmd=	\
 		${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 "dirs.mk"
 
 .include "../../mk/compiler.mk"
 
@@ -282,7 +253,7 @@ SUBST_VARS.policysh+=	LOCLIBRPATHFLAGS
 SUBST_CLASSES+=		rm
 SUBST_STAGE.rm=		pre-install
 SUBST_FILES.rm=		lib/Config_heavy.pl
-SUBST_SED.rm=	-e "s!^rm_try='/.*/\.tools/bin/rm -f!rm_try='/bin/rm -f!"
+SUBST_SED.rm=	-e "s!^rm_try='/.*/\\.tools/bin/rm -f!rm_try='/bin/rm -f!"
 
 # Replace our perl as the interpreter
 REPLACE_PERL+=		lib/File/DosGlob.pm
diff --git a/lang/perl5/Makefile.common b/lang/perl5/Makefile.common
new file mode 100644
index 00000000000..6065d5d2f58
--- /dev/null
+++ b/lang/perl5/Makefile.common
@@ -0,0 +1,13 @@
+# $NetBSD: Makefile.common,v 1.8 2010/08/27 05:27:37 sno Exp $
+#
+# used by lang/perl5/Makefile
+# used by databases/p5-gdbm/Makefile
+
+DISTNAME=	perl-5.12.1
+CATEGORIES=	lang devel perl5
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN:S,/modules/by-module/$,/src/5.0/,}
+DISTFILES+=	${DISTNAME}${EXTRACT_SUFX}
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://www.perl.org/
+LICENSE=	${PERL5_LICENSE}
diff --git a/lang/perl5/buildlink3.mk b/lang/perl5/buildlink3.mk
index ed8bfc009b0..0d6b1aefedd 100644
--- a/lang/perl5/buildlink3.mk
+++ b/lang/perl5/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.46 2010/08/19 20:47:09 seb Exp $
+# $NetBSD: buildlink3.mk,v 1.47 2010/08/27 05:27:37 sno Exp $
 
 BUILDLINK_TREE+=	perl
 
-.if !defined(PERL5_BUILDLINK3_MK)
-PERL5_BUILDLINK3_MK:=
+.if !defined(PERL_BUILDLINK3_MK)
+PERL_BUILDLINK3_MK:=
 
 .include "../../mk/bsd.fast.prefs.mk"
 PERL5_REQD+=			5.12.0
@@ -37,6 +37,6 @@ INSTALL_TEMPLATES+=	${.CURDIR}/../../lang/perl5/files/install_threads.tmpl
 .include "../../lang/perl5/vars.mk"
 BUILDLINK_FILES.perl=	${PERL5_SUB_INSTALLARCHLIB}/CORE/*
 .endif
-.endif # PERL5_BUILDLINK3_MK
+.endif # PERL_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-perl
diff --git a/lang/perl5/dirs.mk b/lang/perl5/dirs.mk
new file mode 100644
index 00000000000..9f480855cc8
--- /dev/null
+++ b/lang/perl5/dirs.mk
@@ -0,0 +1,39 @@
+# $NetBSD: dirs.mk,v 1.1 2010/08/27 05:27:37 sno Exp $
+#
+# Provide typical required Perl directories
+
+.if !defined(_PERL5_DIRS_MK)
+_PERL5_DIRS_MK=	# defined
+
+.include "../../mk/bsd.prefs.mk"
+
+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
+
+.endif
diff --git a/lang/perl5/distinfo b/lang/perl5/distinfo
index 02f6ec6e2bb..2064ec78ece 100644
--- a/lang/perl5/distinfo
+++ b/lang/perl5/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.67 2010/08/21 03:12:46 obache Exp $
+$NetBSD: distinfo,v 1.68 2010/08/27 05:27:37 sno Exp $
 
 SHA1 (perl-5.12.1.tar.gz) = 83b99f08379782dc06594a85eeb279edc5b0ca44
 RMD160 (perl-5.12.1.tar.gz) = 2e2d08821bdf3ed87360af828e3b31f5861b4fdd
 Size (perl-5.12.1.tar.gz) = 15122057 bytes
 SHA1 (patch-aa) = 4c8197cdc0595a17ba377a28c7457f923c2d9bf9
 SHA1 (patch-ab) = e3aa6bf9695addb9b754297120caf8683a625d1a
-SHA1 (patch-ah) = 7f4c84249cb804af69db389078f7b7cbfc97896c
+SHA1 (patch-ah) = aca6b4bf08809789058f3ec259c6df86df2aaf83
 SHA1 (patch-ai) = 5abdbbddcba79088996056ab88a34db5fcd16b01
 SHA1 (patch-aq) = 3ece22678e3e6dcd3cf641e6389ff203cbe351b9
 SHA1 (patch-ca) = f0f54398e7766b78be3dc8afe0fec6aac5797f58
diff --git a/lang/perl5/module.mk b/lang/perl5/module.mk
index 709b33fb876..77502e577c4 100644
--- a/lang/perl5/module.mk
+++ b/lang/perl5/module.mk
@@ -1,4 +1,4 @@
-# $NetBSD: module.mk,v 1.62 2010/05/09 18:46:34 morr Exp $
+# $NetBSD: module.mk,v 1.63 2010/08/27 05:27:37 sno Exp $
 #
 # This Makefile fragment is intended to be included by packages that build
 # and install perl5 modules.
@@ -32,8 +32,8 @@
 
 .include "../../lang/perl5/license.mk"
 
-.if !defined(_PERL5_MODULE_MK)
-_PERL5_MODULE_MK=	# defined
+.if !defined(PERL5_MODULE_MK)
+PERL5_MODULE_MK=	# defined
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -52,18 +52,18 @@ TEST_TARGET?=		test
 .include "../../mk/compiler.mk"
 
 .if ${PERL5_MODULE_TYPE} == "Module::Build"
-_PERL5_MODTYPE=		modbuild
+PERL5_MODTYPE=		modbuild
 .  if ${_USE_DESTDIR} != "no"
-_PERL5_MODBUILD_DESTDIR_OPTION=--destdir ${DESTDIR:Q}
+PERL5_MODBUILD_DESTDIR_OPTION=--destdir ${DESTDIR:Q}
 .  else
-_PERL5_MODBUILD_DESTDIR_OPTION=
+PERL5_MODBUILD_DESTDIR_OPTION=
 .  endif
 .elif ${PERL5_MODULE_TYPE} == "Module::Install"
-_PERL5_MODTYPE=		modinst
+PERL5_MODTYPE=		modinst
 .elif ${PERL5_MODULE_TYPE} == "Module::Install::Bundled"
-_PERL5_MODTYPE=		modinst
+PERL5_MODTYPE=		modinst
 .elif ${PERL5_MODULE_TYPE} == "MakeMaker"
-_PERL5_MODTYPE=		makemaker
+PERL5_MODTYPE=		makemaker
 .endif
 
 
@@ -96,6 +96,7 @@ PERL5_CONFIGURE?=	yes
 PERL5_CONFIGURE_DIRS?=	${CONFIGURE_DIRS}
 
 MAKE_ENV+=	LC_ALL=C
+MAKE_ENV+=	PERL_MM_USE_DEFAULT=1
 
 # All pkgsrc-installed Perl modules are installed into the "vendor"
 # directories.
@@ -104,7 +105,7 @@ MAKE_PARAMS.makemaker+=	INSTALLDIRS=vendor
 MAKE_PARAMS.modbuild+=	installdirs=vendor
 MAKE_PARAMS.modinst+=	installdirs=vendor
 
-MAKE_PARAMS+=	${MAKE_PARAMS.${_PERL5_MODTYPE}}
+MAKE_PARAMS+=	${MAKE_PARAMS.${PERL5_MODTYPE}}
 
 .PHONY: do-makemaker-configure
 do-makemaker-configure:
@@ -158,7 +159,7 @@ do-modinst-configure:
 .endif
 
 .PHONY: perl5-configure
-perl5-configure: do-${_PERL5_MODTYPE}-configure
+perl5-configure: do-${PERL5_MODTYPE}-configure
 
 .if !empty(PERL5_CONFIGURE:M[yY][eE][sS])
 do-configure: perl5-configure
@@ -166,22 +167,22 @@ do-configure: perl5-configure
 
 .PHONY: do-modbuild-build
 do-modbuild-build:
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./Build
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./Build
 
 .PHONY: do-modbuild-test
 do-modbuild-test:
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./Build test
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./Build test
 
 .PHONY: do-modbuild-install
 do-modbuild-install:
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./Build install ${_PERL5_MODBUILD_DESTDIR_OPTION}
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./Build install ${PERL5_MODBUILD_DESTDIR_OPTION}
 
-.if target(do-${_PERL5_MODTYPE}-build) && !defined(NO_BUILD)
-do-build: do-${_PERL5_MODTYPE}-build
-do-test: do-${_PERL5_MODTYPE}-test
+.if target(do-${PERL5_MODTYPE}-build) && !defined(NO_BUILD)
+do-build: do-${PERL5_MODTYPE}-build
+do-test: do-${PERL5_MODTYPE}-test
 .endif
-.if target(do-${_PERL5_MODTYPE}-install)
-do-install: do-${_PERL5_MODTYPE}-install
+.if target(do-${PERL5_MODTYPE}-install)
+do-install: do-${PERL5_MODTYPE}-install
 .endif
 
 
@@ -209,17 +210,17 @@ PERL5_MAKE_FLAGS.makemaker+=	OTHERLDFLAGS=${LDFLAGS:Q}
 PERL5_MAKE_FLAGS.makemaker+=	${_var_}=${PERL5_${_var_}:Q}
 .endfor
 #
-# The PREFIX in the generated Makefile will point to ${_PERL5_PREFIX},
+# The PREFIX in the generated Makefile will point to ${PERL5_PREFIX},
 # so override its value to the module's ${PREFIX}.
 # Also, set VENDORARCHEXP, so existing .packlist won't be read.
 #
 PERL5_MAKE_FLAGS.makemaker+=   PREFIX=${PREFIX:Q} VENDORARCHEXP=${DESTDIR}${PERL5_INSTALLVENDORARCH}
 
-PERL5_MAKE_FLAGS+=	${PERL5_MAKE_FLAGS.${_PERL5_MODTYPE}}
+PERL5_MAKE_FLAGS+=	${PERL5_MAKE_FLAGS.${PERL5_MODTYPE}}
 MAKE_FLAGS+=		${PERL5_MAKE_FLAGS}
 
 .if defined(PERL5_LDFLAGS) && !empty(PERL5_LDFLAGS)
-FIX_RPATH+=	PERL5_LDFLAGS
+#FIX_RPATH+=	PERL5_LDFLAGS
 LDFLAGS+=	${PERL5_LDFLAGS}
 .endif
 
@@ -227,4 +228,4 @@ LDFLAGS+=	${PERL5_LDFLAGS}
 
 .include "../../mk/pthread.buildlink3.mk"
 
-.endif	# _PERL5_MODULE_MK
+.endif	# PERL5_MODULE_MK
diff --git a/lang/perl5/packlist.mk b/lang/perl5/packlist.mk
index e1fb5960e59..2fc62d30554 100644
--- a/lang/perl5/packlist.mk
+++ b/lang/perl5/packlist.mk
@@ -1,4 +1,4 @@
-# $NetBSD: packlist.mk,v 1.15 2010/01/31 12:14:24 sno Exp $
+# $NetBSD: packlist.mk,v 1.16 2010/08/27 05:27:37 sno Exp $
 #
 # This Makefile fragment is intended to be included by packages that
 # create packlist files.  This file is automatically included by
@@ -37,6 +37,7 @@ _PERL5_REAL_PACKLIST=	${PERL5_PACKLIST:S/^/${PERL5_PACKLIST_DIR}\//}
 _PERL5_PACKLIST=	${_PERL5_REAL_PACKLIST:S/^/${DESTDIR}/}
 .endif
 
+USE_TOOLS+=	gawk
 
 ###########################################################################
 ###
diff --git a/lang/perl5/patches/patch-ah b/lang/perl5/patches/patch-ah
index fee5640feeb..70a249e10bd 100644
--- a/lang/perl5/patches/patch-ah
+++ b/lang/perl5/patches/patch-ah
@@ -1,3 +1,7 @@
+$NetBSD: patch-ah,v 1.12 2010/08/27 05:27:37 sno Exp $
+
+NetBSD's implementation sometimes returns "/"; reject that too.
+
 --- perl.c.orig	2010-05-21 14:41:18.000000000 +0000
 +++ perl.c	2010-05-21 14:44:01.000000000 +0000
 @@ -1414,8 +1414,10 @@