* Teach devel/p5-Module-Build to write .packlists just like MakeMaker.pm

  does.  This allows us to use dynamic PLISTs for Perl modules that are
  built using Module::Build.  Bump the PKGREVISION of p5-Module-Build
  to 1.

* Drop the use of PERL5_USES_MODULE_BUILD and introduce a new variable
  PERL5_MODULE_TYPE that is either "MakeMaker" or "Module::Build" that
  names the framework used to build/install the module.

* Split out the variables set in perl5/buildlink3.mk that are also used
  by perl5/module.mk into a new file perl5/vars.mk.  Move some PERL5_*
  variable definitions from pkgsrc/mk/bsd.pkg.use.mk into perl5/vars.mk.
  This just centralizes the common PERL5_* definitions into a single
  file location.

* Convert the known packages that use Module::Build to set
  PERL5_MODULE_TYPE and PERL5_PACKLIST:

	devel/p5-Class-Container
	devel/p5-Exception-Class
	devel/p5-Log-Dispatch
	devel/p5-Array-Compare
	textproc/p5-Pod-Coverage
	www/p5-Apache-Session-Wrapper
	www/p5-MasonX-Request-WithApacheSession

20 files changed, 155 insertions, 225 deletions

diff --git a/devel/p5-Array-Compare/Makefile b/devel/p5-Array-Compare/Makefile
index c5c2f42d3be..866a1ab6f51 100644
--- a/devel/p5-Array-Compare/Makefile
+++ b/devel/p5-Array-Compare/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/02/22 00:33:36 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2005/02/24 22:38:42 jlam Exp $
 #
 
 DISTNAME=		Array-Compare-1.11
@@ -12,9 +12,10 @@ COMMENT=		Perl extension for comparing arrays
 
 #DEPENDS+=		p5-Sub-Uplevel-[0-9]*:../../devel/p5-Sub-Uplevel
 
-USE_BUILDLINK3=		yes
 USE_LANGUAGES=		# empty
-PERL5_USES_MODULE_BUILD=	YES
+USE_BUILDLINK3=		yes
+PERL5_MODULE_TYPE=	Module::Build
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Array/Compare/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Array-Compare/PLIST b/devel/p5-Array-Compare/PLIST
index a95472f8972..b0fbd3ac777 100644
--- a/devel/p5-Array-Compare/PLIST
+++ b/devel/p5-Array-Compare/PLIST
@@ -1,4 +1 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/02/22 00:33:36 wiz Exp $
-${PERL5_SITELIB}/Array/Compare.pm
-lib/perl5/site_perl/man/man3/Array::Compare.3
-@unexec ${RMDIR} %D/${PERL5_SITELIB}/Array 2>/dev/null || ${TRUE}
+@comment $NetBSD: PLIST,v 1.2 2005/02/24 22:38:42 jlam Exp $
diff --git a/devel/p5-Class-Container/Makefile b/devel/p5-Class-Container/Makefile
index eb32feabc82..da8c887b226 100644
--- a/devel/p5-Class-Container/Makefile
+++ b/devel/p5-Class-Container/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/02/23 16:58:18 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2005/02/24 22:38:41 jlam Exp $
 
 DISTNAME=	Class-Container-0.12
 PKGNAME=	p5-${DISTNAME}
@@ -15,10 +15,9 @@ DEPENDS+=	p5-Scalar-List-Utils-[0-9]*:../../devel/p5-Scalar-List-Utils
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_BUILDLINK3=	YES
-PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Class/Container/.packlist
-# doesn't give us a packlist yet, so disabled for now
-#PERL5_USES_MODULE_BUILD=	YES
+USE_BUILDLINK3=		yes
+PERL5_MODULE_TYPE=	Module::Build
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Class/Container/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Exception-Class/Makefile b/devel/p5-Exception-Class/Makefile
index 2e3c35344a3..576af8c2a3f 100644
--- a/devel/p5-Exception-Class/Makefile
+++ b/devel/p5-Exception-Class/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/02/23 16:30:50 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2005/02/24 22:38:41 jlam Exp $
 
 DISTNAME=	Exception-Class-1.20
 PKGNAME=	p5-${DISTNAME}
@@ -14,9 +14,9 @@ DEPENDS+=	p5-Class-Data-Inheritable>=0.02:../../devel/p5-Class-Data-Inheritable
 DEPENDS+=	p5-Devel-StackTrace>=1.10:../../devel/p5-Devel-StackTrace
 DEPENDS+=	p5-Test-Simple>=0.46:../../devel/p5-Test-Simple
 
-USE_BUILDLINK3=		YES
+USE_BUILDLINK3=		yes
+PERL5_MODULE_TYPE=	Module::Build
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Exception/Class/.packlist
-PERL5_USES_MODULE_BUILD=	YES
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Log-Dispatch/Makefile b/devel/p5-Log-Dispatch/Makefile
index 6e779274c56..26663e334c3 100644
--- a/devel/p5-Log-Dispatch/Makefile
+++ b/devel/p5-Log-Dispatch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/02/21 12:17:08 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2005/02/24 22:38:41 jlam Exp $
 
 DISTNAME=	Log-Dispatch-2.10
 PKGNAME=	p5-${DISTNAME}
@@ -13,8 +13,9 @@ COMMENT=	Perl module for logging messages to multiple outputs
 DEPENDS+=	p5-Params-Validate>=0.15:../../devel/p5-Params-Validate
 DEPENDS+=	p5-Test-Simple>=0.17:../../devel/p5-Test-Simple
 
-USE_BUILDLINK3=			YES
-PERL5_USES_MODULE_BUILD=	YES
+USE_BUILDLINK3=		yes
+PERL5_MODULE_TYPE=	Module::Build
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Log/Dispatch/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Log-Dispatch/PLIST b/devel/p5-Log-Dispatch/PLIST
index 35a6203a3fc..7e8fc2d8120 100644
--- a/devel/p5-Log-Dispatch/PLIST
+++ b/devel/p5-Log-Dispatch/PLIST
@@ -1,32 +1 @@
-@comment $NetBSD: PLIST,v 1.2 2003/12/29 12:20:48 grant Exp $
-${PERL5_SITELIB}/Log/Dispatch.pm
-${PERL5_SITELIB}/Log/Dispatch/ApacheLog.pm
-${PERL5_SITELIB}/Log/Dispatch/Base.pm
-${PERL5_SITELIB}/Log/Dispatch/Email.pm
-${PERL5_SITELIB}/Log/Dispatch/Email/MIMELite.pm
-${PERL5_SITELIB}/Log/Dispatch/Email/MailSend.pm
-${PERL5_SITELIB}/Log/Dispatch/Email/MailSender.pm
-${PERL5_SITELIB}/Log/Dispatch/Email/MailSendmail.pm
-${PERL5_SITELIB}/Log/Dispatch/File.pm
-${PERL5_SITELIB}/Log/Dispatch/File/Locked.pm
-${PERL5_SITELIB}/Log/Dispatch/Handle.pm
-${PERL5_SITELIB}/Log/Dispatch/Output.pm
-${PERL5_SITELIB}/Log/Dispatch/Screen.pm
-${PERL5_SITELIB}/Log/Dispatch/Syslog.pm
-lib/perl5/site_perl/man/man3/Log::Dispatch.3
-lib/perl5/site_perl/man/man3/Log::Dispatch::ApacheLog.3
-lib/perl5/site_perl/man/man3/Log::Dispatch::Base.3
-lib/perl5/site_perl/man/man3/Log::Dispatch::Email.3
-lib/perl5/site_perl/man/man3/Log::Dispatch::Email::MIMELite.3
-lib/perl5/site_perl/man/man3/Log::Dispatch::Email::MailSend.3
-lib/perl5/site_perl/man/man3/Log::Dispatch::Email::MailSender.3
-lib/perl5/site_perl/man/man3/Log::Dispatch::Email::MailSendmail.3
-lib/perl5/site_perl/man/man3/Log::Dispatch::File.3
-lib/perl5/site_perl/man/man3/Log::Dispatch::File::Locked.3
-lib/perl5/site_perl/man/man3/Log::Dispatch::Handle.3
-lib/perl5/site_perl/man/man3/Log::Dispatch::Output.3
-lib/perl5/site_perl/man/man3/Log::Dispatch::Screen.3
-lib/perl5/site_perl/man/man3/Log::Dispatch::Syslog.3
-@dirrm ${PERL5_SITELIB}/Log/Dispatch/File
-@dirrm ${PERL5_SITELIB}/Log/Dispatch/Email
-@dirrm ${PERL5_SITELIB}/Log/Dispatch
+@comment $NetBSD: PLIST,v 1.3 2005/02/24 22:38:41 jlam Exp $
diff --git a/devel/p5-Module-Build/Makefile b/devel/p5-Module-Build/Makefile
index f1279d5af14..af8206ae256 100644
--- a/devel/p5-Module-Build/Makefile
+++ b/devel/p5-Module-Build/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2005/02/19 12:40:47 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.6 2005/02/24 22:38:42 jlam Exp $
 
 DISTNAME=	Module-Build-0.2608
 PKGNAME=	p5-${DISTNAME}
 SVR4_PKGNAME=	p5mob
+PKGREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Module/}
 
@@ -13,18 +13,10 @@ COMMENT=	Build and install Perl modules
 
 DEPENDS+=	p5-YAML-[0-9]*:../../textproc/p5-YAML
 
-USE_PERL5=	YES
-
-do-configure:
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PERL5} Build.PL
-
-do-build:
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./Build
-
-do-test:
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./Build test
-
-do-install:
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./Build install
+USE_BUILDLINK3=		yes
+BUILDING_MODULE_BUILD=	yes
+PERL5_MODULE_TYPE=	Module::Build
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Module/Build/.packlist
 
+.include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Module-Build/PLIST b/devel/p5-Module-Build/PLIST
index 11b13de37d1..74f0df3f0ef 100644
--- a/devel/p5-Module-Build/PLIST
+++ b/devel/p5-Module-Build/PLIST
@@ -1,46 +1 @@
-@comment $NetBSD: PLIST,v 1.5 2005/02/19 12:40:47 wiz Exp $
-bin/config_data
-${PERL5_SITELIB}/Module/Build.pm
-${PERL5_SITELIB}/Module/Build/Base.pm
-${PERL5_SITELIB}/Module/Build/Compat.pm
-${PERL5_SITELIB}/Module/Build/ConfigData.pm
-${PERL5_SITELIB}/Module/Build/Cookbook.pm
-${PERL5_SITELIB}/Module/Build/PPMMaker.pm
-${PERL5_SITELIB}/Module/Build/Platform/Amiga.pm
-${PERL5_SITELIB}/Module/Build/Platform/Default.pm
-${PERL5_SITELIB}/Module/Build/Platform/EBCDIC.pm
-${PERL5_SITELIB}/Module/Build/Platform/MPEiX.pm
-${PERL5_SITELIB}/Module/Build/Platform/MacOS.pm
-${PERL5_SITELIB}/Module/Build/Platform/RiscOS.pm
-${PERL5_SITELIB}/Module/Build/Platform/Unix.pm
-${PERL5_SITELIB}/Module/Build/Platform/VMS.pm
-${PERL5_SITELIB}/Module/Build/Platform/VOS.pm
-${PERL5_SITELIB}/Module/Build/Platform/Windows.pm
-${PERL5_SITELIB}/Module/Build/Platform/aix.pm
-${PERL5_SITELIB}/Module/Build/Platform/cygwin.pm
-${PERL5_SITELIB}/Module/Build/Platform/darwin.pm
-${PERL5_SITELIB}/Module/Build/Platform/os2.pm
-${PERL5_SITELIB}/Module/Build/PodParser.pm
-lib/perl5/site_perl/man/man3/Module::Build.3.gz
-lib/perl5/site_perl/man/man3/Module::Build::Base.3.gz
-lib/perl5/site_perl/man/man3/Module::Build::Compat.3.gz
-lib/perl5/site_perl/man/man3/Module::Build::ConfigData.3
-lib/perl5/site_perl/man/man3/Module::Build::Cookbook.3.gz
-lib/perl5/site_perl/man/man3/Module::Build::PPMMaker.3.gz
-lib/perl5/site_perl/man/man3/Module::Build::Platform::Amiga.3.gz
-lib/perl5/site_perl/man/man3/Module::Build::Platform::Default.3.gz
-lib/perl5/site_perl/man/man3/Module::Build::Platform::EBCDIC.3.gz
-lib/perl5/site_perl/man/man3/Module::Build::Platform::MPEiX.3.gz
-lib/perl5/site_perl/man/man3/Module::Build::Platform::MacOS.3.gz
-lib/perl5/site_perl/man/man3/Module::Build::Platform::RiscOS.3.gz
-lib/perl5/site_perl/man/man3/Module::Build::Platform::Unix.3.gz
-lib/perl5/site_perl/man/man3/Module::Build::Platform::VMS.3.gz
-lib/perl5/site_perl/man/man3/Module::Build::Platform::VOS.3.gz
-lib/perl5/site_perl/man/man3/Module::Build::Platform::Windows.3.gz
-lib/perl5/site_perl/man/man3/Module::Build::Platform::aix.3
-lib/perl5/site_perl/man/man3/Module::Build::Platform::cygwin.3.gz
-lib/perl5/site_perl/man/man3/Module::Build::Platform::darwin.3.gz
-lib/perl5/site_perl/man/man3/Module::Build::Platform::os2.3
-man/man1/config_data.1
-@dirrm ${PERL5_SITELIB}/Module/Build/Platform
-@dirrm ${PERL5_SITELIB}/Module/Build
+@comment $NetBSD: PLIST,v 1.6 2005/02/24 22:38:42 jlam Exp $
diff --git a/devel/p5-Module-Build/distinfo b/devel/p5-Module-Build/distinfo
index 4cb6a9e4d9a..d51edd6f86d 100644
--- a/devel/p5-Module-Build/distinfo
+++ b/devel/p5-Module-Build/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 22:24:27 agc Exp $
+$NetBSD: distinfo,v 1.5 2005/02/24 22:38:42 jlam Exp $
 
 SHA1 (Module-Build-0.2608.tar.gz) = 49cb2093e478247689c3745b9beb72e88d8d9d72
 RMD160 (Module-Build-0.2608.tar.gz) = 456e34e36ae4d4cb996f00013bf570faf6bd50cf
 Size (Module-Build-0.2608.tar.gz) = 126273 bytes
+SHA1 (patch-aa) = da2ddb73bccbb3be77ff8141adf07a324851a3a4
diff --git a/devel/p5-Module-Build/patches/patch-aa b/devel/p5-Module-Build/patches/patch-aa
new file mode 100644
index 00000000000..abe78628a94
--- /dev/null
+++ b/devel/p5-Module-Build/patches/patch-aa
@@ -0,0 +1,16 @@
+$NetBSD: patch-aa,v 1.3 2005/02/24 22:38:42 jlam Exp $
+
+--- lib/Module/Build/Base.pm.orig	2005-01-26 20:48:56.000000000 -0500
++++ lib/Module/Build/Base.pm
+@@ -2386,6 +2386,11 @@ sub install_map {
+   }
+   
+   $map{read} = '';  # To keep ExtUtils::Install quiet
++
++  # Write the packlist into the same place as ExtUtils::MakeMaker.
++  my $archdir = $self->install_destination('arch');
++  my $ext = File::Spec->catdir(split /::/, $self->{properties}{module_name});
++  $map{write} = File::Spec->catdir($archdir, 'auto', $ext, '.packlist');
+   
+   return \%map;
+ }
diff --git a/lang/perl5/buildlink3.mk b/lang/perl5/buildlink3.mk
index 663edf800e2..389a590f9d8 100644
--- a/lang/perl5/buildlink3.mk
+++ b/lang/perl5/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2004/12/20 13:25:09 grant Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2005/02/24 22:38:42 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PERL5_BUILDLINK3_MK:=	${PERL5_BUILDLINK3_MK}+
@@ -24,53 +24,16 @@ BUILDLINK_PKGSRCDIR.perl?=	${PERL5_PKGSRCDIR}
 BUILDLINK_DEPMETHOD.perl?=	build
 .endif
 
-_PERL5_SITEVARS=							\
-	INSTALLSITEBIN INSTALLSITELIB INSTALLSITEARCH			\
-	INSTALLSITEMAN1DIR INSTALLSITEMAN3DIR				\
-	SITELIBEXP SITEARCHEXP
-
-_PERL5_SITEVAR.INSTALLSITEBIN=		installsitebin
-_PERL5_SITEVAR.INSTALLSITELIB=		installsitelib
-_PERL5_SITEVAR.INSTALLSITEARCH=		installsitearch
-_PERL5_SITEVAR.INSTALLSITEMAN1DIR=	installsiteman1dir
-_PERL5_SITEVAR.INSTALLSITEMAN3DIR=	installsiteman3dir
-_PERL5_SITEVAR.SITELIBEXP=		sitelibexp
-_PERL5_SITEVAR.SITEARCHEXP=		sitearchexp
-
 PERL5_OPTIONS?=	# empty
 .if !empty(PERL5_OPTIONS:Mthreads)
 USE_PKGINSTALL=		yes
 INSTALL_EXTRA_TMPL+=	${.CURDIR}/../../lang/perl5/files/install.tmpl
 .endif
 
-.if exists(${PERL5})
-.  if !defined(_PERL5_SITEPREFIX)
-_PERL5_PREFIX!=		\
-	eval `${PERL5} -V:prefix 2>/dev/null`; ${ECHO} $$prefix
-_PERL5_SITEPREFIX!=	\
-	eval `${PERL5} -V:siteprefix 2>/dev/null`; ${ECHO} $$siteprefix
-MAKEFLAGS+=	_PERL5_PREFIX=${_PERL5_PREFIX:Q}
-MAKEFLAGS+=	_PERL5_SITEPREFIX=${_PERL5_SITEPREFIX:Q}
+.include "../../lang/perl5/vars.mk"
 
-.    for _var_ in ${_PERL5_SITEVARS}
-PERL5_SUB_${_var_}!=	\
-	eval `${PERL5} -V:${_PERL5_SITEVAR.${_var_}} 2>/dev/null`;	\
-	${ECHO} $${${_PERL5_SITEVAR.${_var_}}} |			\
-	${SED} -e "s,^${_PERL5_SITEPREFIX}/,,"
-MAKEFLAGS+=	PERL5_SUB_${_var_}=${PERL5_SUB_${_var_}:Q}
-.    endfor
-PERL5_SUB_INSTALLARCHLIB!=	\
-	eval `${PERL5} -V:installarchlib 2>/dev/null`;			\
-	${ECHO} $$installarchlib |					\
-	${SED} -e "s,^${_PERL5_PREFIX}/,,"
-MAKEFLAGS+=	PERL5_SUB_INSTALLARCHLIB=${PERL5_SUB_INSTALLARCHLIB:Q}
-PERL5_SUB_INSTALLSCRIPT!=	\
-	eval `${PERL5} -V:installscript 2>/dev/null`;			\
-	${ECHO} $$installscript |					\
-	${SED} -e "s,^${_PERL5_PREFIX}/,,"
-MAKEFLAGS+=	PERL5_SUB_INSTALLSCRIPT=${PERL5_SUB_INSTALLSCRIPT:Q}
-.  endif
-.  if ${PKG_INSTALLATION_TYPE} == "overwrite"
+.if ${PKG_INSTALLATION_TYPE} == "overwrite"
+.  if defined(PERL5_SUB_INSTALLARCHLIB)
 #
 # Perl keeps headers and odd libraries in an odd path not caught by the
 # default BUILDLINK_FILES_CMD, so name them to be symlinked into
diff --git a/lang/perl5/module.mk b/lang/perl5/module.mk
index 997b3b1c015..1becc241bf8 100644
--- a/lang/perl5/module.mk
+++ b/lang/perl5/module.mk
@@ -1,4 +1,4 @@
-# $NetBSD: module.mk,v 1.39 2005/02/23 10:42:07 wiz Exp $
+# $NetBSD: module.mk,v 1.40 2005/02/24 22:38:42 jlam Exp $
 #
 # This Makefile fragment is intended to be included by packages that build
 # and install perl5 modules.
@@ -26,8 +26,8 @@
 # PERL5_LDFLAGS		extra linker flags to pass on to the build
 #			process.
 #
-# PERL5_USES_MODULE_BUILD	the package uses Module::Build instead
-#				of ExtUtils::MakeMaker
+# PERL5_MODULE_TYPE	"MakeMaker" or "Module::Build" depending on which
+#			framework is used to build/install the module.
 
 .if !defined(_PERL5_MODULE_MK)
 _PERL5_MODULE_MK=	# defined
@@ -36,7 +36,11 @@ _PERL5_MODULE_MK=	# defined
 
 BUILDLINK_DEPMETHOD.perl+=	full
 
-.if !defined(BUILDING_PERL5)
+BUILDING_PERL5?=		no
+BUILDING_MODULE_BUILD?=		no
+PERL5_MODULE_TYPE?=		MakeMaker
+
+.if empty(BUILDING_PERL5:M[yY][eE][sS])
 .  if !defined(NO_BUILDLINK)
 .    if empty(USE_BUILDLINK3:M[nN][oO])
 .      include "../../lang/perl5/buildlink3.mk"
@@ -44,10 +48,13 @@ BUILDLINK_DEPMETHOD.perl+=	full
 .  endif
 .endif
 
-.if defined(PERL5_USES_MODULE_BUILD)
+.if empty(BUILDING_MODULE_BUILD:M[yY][eE][sS]) && \
+    (${PERL5_MODULE_TYPE} == "Module::Build")
 BUILD_DEPENDS+=		p5-Module-Build-[0-9]*:../../devel/p5-Module-Build
 .endif
 
+.include "../../lang/perl5/vars.mk"
+
 PERL5_CONFIGURE?=	YES
 PERL5_CONFIGURE_DIRS?=	${CONFIGURE_DIRS}
 
@@ -65,9 +72,9 @@ BROKEN=		Perl does not like building with gcc on AIX, please use a different com
 .endif
 
 MAKE_ENV+=	LC_ALL=C
-.if defined(PERL5_USES_MODULE_BUILD)
+.if ${PERL5_MODULE_TYPE} == "Module::Build"
 _CONF_ARG=	Build.PL
-.else
+.elif ${PERL5_MODULE_TYPE} == "MakeMaker"
 _CONF_ARG=	Makefile.PL ${MAKE_PARAMS}
 .endif
 
@@ -98,7 +105,7 @@ PERL5_${_var_}=		${PREFIX}/${PERL5_SUB_${_var_}}
 PERL5_MAKE_FLAGS+=	${_var_}="${PERL5_${_var_}}"
 .endfor
 
-.if !defined(PERL5_USES_MODULE_BUILD)
+.if ${PERL5_MODULE_TYPE} == "MakeMaker"
 #
 # The PREFIX in the generated Makefile will point to ${_PERL5_PREFIX},
 # so override its value to the module's ${PREFIX}.
@@ -106,7 +113,7 @@ PERL5_MAKE_FLAGS+=	${_var_}="${PERL5_${_var_}}"
 PERL5_MAKE_FLAGS+=	PREFIX="${PREFIX}"
 .endif
 
-.if defined(PERL5_USES_MODULE_BUILD)
+.if ${PERL5_MODULE_TYPE} == "Module::Build"
 do-build:
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./Build
 
diff --git a/lang/perl5/vars.mk b/lang/perl5/vars.mk
new file mode 100644
index 00000000000..35cf9d50353
--- /dev/null
+++ b/lang/perl5/vars.mk
@@ -0,0 +1,69 @@
+# $NetBSD: vars.mk,v 1.1 2005/02/24 22:38:42 jlam Exp $
+#
+# This Makefile fragment exposes several Perl configuration variables
+# to the package Makefiles.  The variables are only defined if the
+# ${PERL5} executable exists.
+
+.if !defined(_PERL5_VARS_MK)
+_PERL5_VARS_MK=	yes
+
+.include "../../mk/bsd.prefs.mk"
+
+_PERL5_SITEVARS=							\
+	INSTALLSITEBIN INSTALLSITELIB INSTALLSITEARCH			\
+	INSTALLSITEMAN1DIR INSTALLSITEMAN3DIR				\
+	SITELIBEXP SITEARCHEXP
+
+_PERL5_SITEVAR.INSTALLSITEBIN=		installsitebin
+_PERL5_SITEVAR.INSTALLSITELIB=		installsitelib
+_PERL5_SITEVAR.INSTALLSITEARCH=		installsitearch
+_PERL5_SITEVAR.INSTALLSITEMAN1DIR=	installsiteman1dir
+_PERL5_SITEVAR.INSTALLSITEMAN3DIR=	installsiteman3dir
+_PERL5_SITEVAR.SITELIBEXP=		sitelibexp
+_PERL5_SITEVAR.SITEARCHEXP=		sitearchexp
+
+.if exists(${PERL5})
+.  if !defined(_PERL5_SITEPREFIX)
+_PERL5_PREFIX!=		\
+	eval `${PERL5} -V:prefix 2>/dev/null`; ${ECHO} $$prefix
+_PERL5_SITEPREFIX!=	\
+	eval `${PERL5} -V:siteprefix 2>/dev/null`; ${ECHO} $$siteprefix
+MAKEFLAGS+=	_PERL5_PREFIX=${_PERL5_PREFIX:Q}
+MAKEFLAGS+=	_PERL5_SITEPREFIX=${_PERL5_SITEPREFIX:Q}
+
+.    for _var_ in ${_PERL5_SITEVARS}
+.      if !defined(PERL5_SUB_${_var_})
+PERL5_SUB_${_var_}!=	\
+	eval `${PERL5} -V:${_PERL5_SITEVAR.${_var_}} 2>/dev/null`;	\
+	${ECHO} $${${_PERL5_SITEVAR.${_var_}}} |			\
+	${SED} -e "s,^${_PERL5_SITEPREFIX}/,,"
+MAKEFLAGS+=	PERL5_SUB_${_var_}=${PERL5_SUB_${_var_}:Q}
+.      endif
+.    endfor
+.    if !defined(PERL5_SUB_INSTALLARCHLIB)
+PERL5_SUB_INSTALLARCHLIB!=	\
+	eval `${PERL5} -V:installarchlib 2>/dev/null`;			\
+	${ECHO} $$installarchlib |					\
+	${SED} -e "s,^${_PERL5_PREFIX}/,,"
+MAKEFLAGS+=	PERL5_SUB_INSTALLARCHLIB=${PERL5_SUB_INSTALLARCHLIB:Q}
+.    endif
+.    if !defined(PERL5_SUB_INSTALLSCRIPT)
+PERL5_SUB_INSTALLSCRIPT!=	\
+	eval `${PERL5} -V:installscript 2>/dev/null`;			\
+	${ECHO} $$installscript |					\
+	${SED} -e "s,^${_PERL5_PREFIX}/,,"
+MAKEFLAGS+=	PERL5_SUB_INSTALLSCRIPT=${PERL5_SUB_INSTALLSCRIPT:Q}
+.    endif
+.  endif
+.endif
+
+.if ${PKG_INSTALLATION_TYPE} == "overwrite"
+.  for _var_ in SITELIB SITEARCH ARCHLIB
+.    if defined(PERL5_SUB_INSTALL${_var_})
+PERL5_${_var_}?=	${LOCALBASE}/${PERL5_SUB_INSTALL${_var_}}
+MAKEFLAGS+=		PERL5_${_var_}=${PERL5_${_var_}:Q}
+.    endif
+.  endfor
+.endif
+
+.endif	# _PERL5_VARS_MK
diff --git a/mk/bsd.pkg.use.mk b/mk/bsd.pkg.use.mk
index 2b4e15e4fe0..202b340fdce 100644
--- a/mk/bsd.pkg.use.mk
+++ b/mk/bsd.pkg.use.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.use.mk,v 1.4 2005/02/11 16:15:53 tv Exp $
+#	$NetBSD: bsd.pkg.use.mk,v 1.5 2005/02/24 22:38:42 jlam Exp $
 #
 # Turn USE_* macros into proper depedency logic.  Included near the top of
 # bsd.pkg.mk, after bsd.prefs.mk.
@@ -162,36 +162,17 @@ ${_PERL5_DEPMETHOD}+=	${_PERL5_DEPENDS}:${PERL5_PKGSRCDIR}
 
 .if defined(USE_PERL5) && (${USE_PERL5} == "run")
 CONFIGURE_ENV+=		PERL=${PERL5:Q}
-.  if !defined(PERL5_SITELIB) || !defined(PERL5_SITEARCH) || !defined(PERL5_ARCHLIB)
-.    if exists(${PERL5})
-PERL5_SITELIB!=		eval `${PERL5} -V:installsitelib 2>/dev/null`; \
-			${ECHO} $${installsitelib}
-PERL5_SITEARCH!=	eval `${PERL5} -V:installsitearch 2>/dev/null`; \
-			${ECHO} $${installsitearch}
-PERL5_ARCHLIB!=		eval `${PERL5} -V:installarchlib 2>/dev/null`; \
-			${ECHO} $${installarchlib}
-.      if ${PKG_INSTALLATION_TYPE} == "overwrite"
-_PERL5_PREFIX!=		eval `${PERL5} -V:prefix 2>/dev/null`; \
-			${ECHO} $${prefix}
-PERL5_SITELIB:=		${PERL5_SITELIB:S/^${_PERL5_PREFIX}/${LOCALBASE}/}
-PERL5_SITEARCH:=	${PERL5_SITEARCH:S/^${_PERL5_PREFIX}/${LOCALBASE}/}
-PERL5_ARCHLIB:=		${PERL5_ARCHLIB:S/^${_PERL5_PREFIX}/${LOCALBASE}/}
-MAKEFLAGS+=		PERL5_SITELIB=${PERL5_SITELIB:Q}
-MAKEFLAGS+=		PERL5_SITEARCH=${PERL5_SITEARCH:Q}
-MAKEFLAGS+=		PERL5_ARCHLIB=${PERL5_ARCHLIB:Q}
-.      endif # PKG_INSTALLATION_TYPE == "overwrite"
-.    endif   # exists($PERL5)
-.  endif     # !defined(PERL5_*)
+.  include "../../lang/perl5/vars.mk"
 .endif       # USE_PERL5 == run
 
-.if defined(PERL5_SITELIB)
-PLIST_SUBST+=	PERL5_SITELIB=${PERL5_SITELIB:S/^${LOCALBASE}\///}
+.if defined(PERL5_SUB_INSTALLSITELIB)
+PLIST_SUBST+=	PERL5_SITELIB=${PERL5_SUB_INSTALLSITELIB}
 .endif
-.if defined(PERL5_SITEARCH)
-PLIST_SUBST+=	PERL5_SITEARCH=${PERL5_SITEARCH:S/^${LOCALBASE}\///}
+.if defined(PERL5_SUB_INSTALLSITEARCH)
+PLIST_SUBST+=	PERL5_SITEARCH=${PERL5_SUB_INSTALLSITEARCH}
 .endif
-.if defined(PERL5_ARCHLIB)
-PLIST_SUBST+=	PERL5_ARCHLIB=${PERL5_ARCHLIB:S/^${LOCALBASE}\///}
+.if defined(PERL5_SUB_INSTALLARCHLIB)
+PLIST_SUBST+=	PERL5_ARCHLIB=${PERL5_SUB_INSTALLARCHLIB}
 .endif
 
 ### USE_RMAN
diff --git a/textproc/p5-Pod-Coverage/Makefile b/textproc/p5-Pod-Coverage/Makefile
index 3571e8ecc40..724fe4bb579 100644
--- a/textproc/p5-Pod-Coverage/Makefile
+++ b/textproc/p5-Pod-Coverage/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/02/22 00:30:10 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2005/02/24 22:38:42 jlam Exp $
 
 DISTNAME=	Pod-Coverage-0.17
 PKGNAME=	p5-${DISTNAME}
@@ -13,8 +13,9 @@ DEPENDS+=	p5-Devel-Symdump-[0-9]*:../../devel/p5-Devel-Symdump
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_BUILDLINK3=		YES
-PERL5_USES_MODULE_BUILD=	YES
+USE_BUILDLINK3=		yes
+PERL5_MODULE_TYPE=	Module::Build
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Pod/Coverage/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/p5-Pod-Coverage/PLIST b/textproc/p5-Pod-Coverage/PLIST
index 620e3dae24b..b0fbd3ac777 100644
--- a/textproc/p5-Pod-Coverage/PLIST
+++ b/textproc/p5-Pod-Coverage/PLIST
@@ -1,14 +1 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/02/22 00:30:10 wiz Exp $
-bin/pod_cover
-${PERL5_SITEARCH}/Pod/Coverage.pm
-${PERL5_SITEARCH}/Pod/Coverage/CountParents.pm
-${PERL5_SITEARCH}/Pod/Coverage/ExportOnly.pm
-${PERL5_SITEARCH}/Pod/Coverage/Overloader.pm
-${PERL5_SITEARCH}/auto/Pod/Coverage/Coverage.bs
-${PERL5_SITEARCH}/auto/Pod/Coverage/Coverage.so
-lib/perl5/site_perl/man/man3/Pod::Coverage.3
-lib/perl5/site_perl/man/man3/Pod::Coverage::CountParents.3
-lib/perl5/site_perl/man/man3/Pod::Coverage::ExportOnly.3
-lib/perl5/site_perl/man/man3/Pod::Coverage::Overloader.3
-@dirrm ${PERL5_SITEARCH}/auto/Pod/Coverage
-@dirrm ${PERL5_SITEARCH}/Pod/Coverage
+@comment $NetBSD: PLIST,v 1.2 2005/02/24 22:38:42 jlam Exp $
diff --git a/www/p5-Apache-Session-Wrapper/Makefile b/www/p5-Apache-Session-Wrapper/Makefile
index bbaadba3260..2a01f43100a 100644
--- a/www/p5-Apache-Session-Wrapper/Makefile
+++ b/www/p5-Apache-Session-Wrapper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/02/23 18:01:13 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2005/02/24 22:38:42 jlam Exp $
 
 DISTNAME=		Apache-Session-Wrapper-0.17
 PKGNAME=		p5-${DISTNAME}
@@ -14,10 +14,9 @@ DEPENDS+=               p5-Class-Container-[0-9]*:../../devel/p5-Class-Container
 DEPENDS+=               p5-Exception-Class-[0-9]*:../../devel/p5-Exception-Class
 DEPENDS+=               p5-Apache-Session>=1.6:../../www/p5-Apache-Session
 
-USE_BUILDLINK3=		YES
-#PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Apache/Session/Wrapper/.packlist
-PERL5_USES_MODULE_BUILD=	YES
-PLIST_SUBST+=		PERL5_SITEPERL=${PERL5_SITEPERL}
+USE_BUILDLINK3=		yse
+PERL5_MODULE_TYPE=	Module::Build
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Apache/Session/Wrapper/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/p5-Apache-Session-Wrapper/PLIST b/www/p5-Apache-Session-Wrapper/PLIST
index 6d9c61266be..aceb2c38025 100644
--- a/www/p5-Apache-Session-Wrapper/PLIST
+++ b/www/p5-Apache-Session-Wrapper/PLIST
@@ -1,3 +1 @@
-@comment $NetBSD: PLIST,v 1.2 2005/02/23 18:01:13 wiz Exp $
-${PERL5_SITELIB}/Apache/Session/Wrapper.pm
-lib/perl5/site_perl/man/man3/Apache::Session::Wrapper.3
+@comment $NetBSD: PLIST,v 1.3 2005/02/24 22:38:42 jlam Exp $
diff --git a/www/p5-MasonX-Request-WithApacheSession/Makefile b/www/p5-MasonX-Request-WithApacheSession/Makefile
index 7afa5b040d3..189d7bb48fb 100644
--- a/www/p5-MasonX-Request-WithApacheSession/Makefile
+++ b/www/p5-MasonX-Request-WithApacheSession/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/02/23 19:12:43 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2005/02/24 22:38:42 jlam Exp $
 
 DISTNAME=	MasonX-Request-WithApacheSession-0.30
 PKGNAME=	p5-${DISTNAME}
@@ -14,11 +14,9 @@ COMMENT=	Perl5 module adding a session to the Mason Request obj
 DEPENDS+=	p5-Apache-Session-Wrapper>=0.13:../../www/p5-Apache-Session-Wrapper
 DEPENDS+=	p5-HTML-Mason>=1.16:../../www/p5-HTML-Mason
 
-USE_BUILDLINK3=	YES
-
-PLIST_SUBST+=	INSTALLSITELIB=${PERL5_INSTALLSITELIB:S^${LOCALBASE}/^^}
-PLIST_SUBST+=	INSTALLSITEMAN3DIR=${PERL5_INSTALLSITEMAN3DIR:S^${LOCALBASE}/^^}
-PERL5_USES_MODULE_BUILD=	YES
+USE_BUILDLINK3=		yes
+PERL5_MODULE_TYPE=	Module::Build
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/MasonX/Request/WithApacheSession/.packlist
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/p5-MasonX-Request-WithApacheSession/PLIST b/www/p5-MasonX-Request-WithApacheSession/PLIST
index 36ecb7e75ae..b0fbd3ac777 100644
--- a/www/p5-MasonX-Request-WithApacheSession/PLIST
+++ b/www/p5-MasonX-Request-WithApacheSession/PLIST
@@ -1,5 +1 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/11/05 23:35:30 he Exp $
-${INSTALLSITELIB}/MasonX/Request/WithApacheSession.pm
-${INSTALLSITELIB}/MasonX/Request/WithMultiSession.pm
-${INSTALLSITEMAN3DIR}/MasonX::Request::WithApacheSession.3
-${INSTALLSITEMAN3DIR}/MasonX::Request::WithMultiSession.3
+@comment $NetBSD: PLIST,v 1.2 2005/02/24 22:38:42 jlam Exp $