pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc * Teach devel/p5-Module-Build to write .packlists just...
details: https://anonhg.NetBSD.org/pkgsrc/rev/f0e272597a7e
branches: trunk
changeset: 489690:f0e272597a7e
user: jlam <jlam%pkgsrc.org@localhost>
date: Thu Feb 24 22:38:41 2005 +0000
description:
* 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
diffstat:
devel/p5-Array-Compare/Makefile | 7 +-
devel/p5-Array-Compare/PLIST | 5 +-
devel/p5-Class-Container/Makefile | 9 +-
devel/p5-Exception-Class/Makefile | 6 +-
devel/p5-Log-Dispatch/Makefile | 7 +-
devel/p5-Log-Dispatch/PLIST | 33 +-----------
devel/p5-Module-Build/Makefile | 22 ++-----
devel/p5-Module-Build/PLIST | 47 +----------------
devel/p5-Module-Build/distinfo | 3 +-
devel/p5-Module-Build/patches/patch-aa | 16 +++++
lang/perl5/buildlink3.mk | 45 +--------------
lang/perl5/module.mk | 25 +++++---
lang/perl5/vars.mk | 69 ++++++++++++++++++++++++
mk/bsd.pkg.use.mk | 35 ++---------
textproc/p5-Pod-Coverage/Makefile | 7 +-
textproc/p5-Pod-Coverage/PLIST | 15 +----
www/p5-Apache-Session-Wrapper/Makefile | 9 +-
www/p5-Apache-Session-Wrapper/PLIST | 4 +-
www/p5-MasonX-Request-WithApacheSession/Makefile | 10 +--
www/p5-MasonX-Request-WithApacheSession/PLIST | 6 +-
20 files changed, 155 insertions(+), 225 deletions(-)
diffs (truncated from 629 to 300 lines):
diff -r 6e93f08ae3c4 -r f0e272597a7e devel/p5-Array-Compare/Makefile
--- a/devel/p5-Array-Compare/Makefile Thu Feb 24 20:52:53 2005 +0000
+++ b/devel/p5-Array-Compare/Makefile Thu Feb 24 22:38:41 2005 +0000
@@ -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 @@
#DEPENDS+= p5-Sub-Uplevel-[0-9]*:../../devel/p5-Sub-Uplevel
+USE_LANGUAGES= # empty
USE_BUILDLINK3= yes
-USE_LANGUAGES= # empty
-PERL5_USES_MODULE_BUILD= 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 -r 6e93f08ae3c4 -r f0e272597a7e devel/p5-Array-Compare/PLIST
--- a/devel/p5-Array-Compare/PLIST Thu Feb 24 20:52:53 2005 +0000
+++ b/devel/p5-Array-Compare/PLIST Thu Feb 24 22:38:41 2005 +0000
@@ -1,4 +1,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 -r 6e93f08ae3c4 -r f0e272597a7e devel/p5-Class-Container/Makefile
--- a/devel/p5-Class-Container/Makefile Thu Feb 24 20:52:53 2005 +0000
+++ b/devel/p5-Class-Container/Makefile Thu Feb 24 22:38:41 2005 +0000
@@ -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 @@
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 -r 6e93f08ae3c4 -r f0e272597a7e devel/p5-Exception-Class/Makefile
--- a/devel/p5-Exception-Class/Makefile Thu Feb 24 20:52:53 2005 +0000
+++ b/devel/p5-Exception-Class/Makefile Thu Feb 24 22:38:41 2005 +0000
@@ -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-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 -r 6e93f08ae3c4 -r f0e272597a7e devel/p5-Log-Dispatch/Makefile
--- a/devel/p5-Log-Dispatch/Makefile Thu Feb 24 20:52:53 2005 +0000
+++ b/devel/p5-Log-Dispatch/Makefile Thu Feb 24 22:38:41 2005 +0000
@@ -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 @@
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 -r 6e93f08ae3c4 -r f0e272597a7e devel/p5-Log-Dispatch/PLIST
--- a/devel/p5-Log-Dispatch/PLIST Thu Feb 24 20:52:53 2005 +0000
+++ b/devel/p5-Log-Dispatch/PLIST Thu Feb 24 22:38:41 2005 +0000
@@ -1,32 +1,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 -r 6e93f08ae3c4 -r f0e272597a7e devel/p5-Module-Build/Makefile
--- a/devel/p5-Module-Build/Makefile Thu Feb 24 20:52:53 2005 +0000
+++ b/devel/p5-Module-Build/Makefile Thu Feb 24 22:38:41 2005 +0000
@@ -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 @@
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
+USE_BUILDLINK3= yes
+BUILDING_MODULE_BUILD= yes
+PERL5_MODULE_TYPE= Module::Build
+PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Module/Build/.packlist
-do-test:
- @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./Build test
-
-do-install:
- @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./Build install
-
+.include "../../lang/perl5/module.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 6e93f08ae3c4 -r f0e272597a7e devel/p5-Module-Build/PLIST
--- a/devel/p5-Module-Build/PLIST Thu Feb 24 20:52:53 2005 +0000
+++ b/devel/p5-Module-Build/PLIST Thu Feb 24 22:38:41 2005 +0000
@@ -1,46 +1,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 -r 6e93f08ae3c4 -r f0e272597a7e devel/p5-Module-Build/distinfo
--- a/devel/p5-Module-Build/distinfo Thu Feb 24 20:52:53 2005 +0000
+++ b/devel/p5-Module-Build/distinfo Thu Feb 24 22:38:41 2005 +0000
@@ -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 -r 6e93f08ae3c4 -r f0e272597a7e devel/p5-Module-Build/patches/patch-aa
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/p5-Module-Build/patches/patch-aa Thu Feb 24 22:38:41 2005 +0000
@@ -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 -r 6e93f08ae3c4 -r f0e272597a7e lang/perl5/buildlink3.mk
--- a/lang/perl5/buildlink3.mk Thu Feb 24 20:52:53 2005 +0000
+++ b/lang/perl5/buildlink3.mk Thu Feb 24 22:38:41 2005 +0000
@@ -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_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_}}} | \
Home |
Main Index |
Thread Index |
Old Index