* 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

10 files changed, 43 insertions, 112 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;
+ }