* 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

1 files changed, 4 insertions, 41 deletions

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