Fri May 18 21:04:46 2012 UTC ()
Fix PR pkg/46439

Fix comment, PERL5_MODULE_TYPE also accepts "Module::Install::Bundled".


(ryoon)
diff -r1.65 -r1.66 pkgsrc/lang/perl5/module.mk
cvs diff -r1.65 -r1.66 pkgsrc/lang/perl5/module.mk (expand / switch to unified diff)

--- pkgsrc/lang/perl5/module.mk 2011/08/15 04:48:36 1.65
+++ pkgsrc/lang/perl5/module.mk 2012/05/18 21:04:46 1.66
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: module.mk,v 1.65 2011/08/15 04:48:36 obache Exp $ 1# $NetBSD: module.mk,v 1.66 2012/05/18 21:04:46 ryoon Exp $
2# 2#
3# This Makefile fragment is intended to be included by packages that build 3# This Makefile fragment is intended to be included by packages that build
4# and install perl5 modules. 4# and install perl5 modules.
5# 5#
6# The following targets are provided by this file: 6# The following targets are provided by this file:
7# 7#
8# perl5-configure runs the standard perl configuration in 8# perl5-configure runs the standard perl configuration in
9# each of the directories specified in 9# each of the directories specified in
10# ${PERL5_CONFIGURE_DIRS}. 10# ${PERL5_CONFIGURE_DIRS}.
11# 11#
12# do-configure runs the perl5-configure target; if PERL5_CONFIGURE 12# do-configure runs the perl5-configure target; if PERL5_CONFIGURE
13# is set to "YES", then this target overrides the 13# is set to "YES", then this target overrides the
14# default do-configure provided by bsd.pkg.mk. 14# default do-configure provided by bsd.pkg.mk.
@@ -16,29 +16,29 @@ @@ -16,29 +16,29 @@
16# The following variables may be set prior to including this file: 16# The following variables may be set prior to including this file:
17# 17#
18# PERL5_CONFIGURE if "YES", then for do-configure, run the standard 18# PERL5_CONFIGURE if "YES", then for do-configure, run the standard
19# perl configuration assuming Makefile.PL exists; 19# perl configuration assuming Makefile.PL exists;
20# defaults to "YES". 20# defaults to "YES".
21# 21#
22# PERL5_CONFIGURE_DIRS list of directories in which to run the 22# PERL5_CONFIGURE_DIRS list of directories in which to run the
23# standard perl configuration; defaults to 23# standard perl configuration; defaults to
24# ${CONFIGURE_DIRS}. 24# ${CONFIGURE_DIRS}.
25# 25#
26# PERL5_LDFLAGS extra linker flags to pass on to the build 26# PERL5_LDFLAGS extra linker flags to pass on to the build
27# process. 27# process.
28# 28#
29# PERL5_MODULE_TYPE "MakeMaker", "Module::Build" or "Module::Install" 29# PERL5_MODULE_TYPE "MakeMaker", "Module::Build", "Module::Install"
30# depending on which framework is used to build/install 30# or "Module::Install::Bundled" depending on which
31# the module. 31# framework is used to build/install the module.
32 32
33.include "../../lang/perl5/license.mk" 33.include "../../lang/perl5/license.mk"
34 34
35.if !defined(PERL5_MODULE_MK) 35.if !defined(PERL5_MODULE_MK)
36PERL5_MODULE_MK= # defined 36PERL5_MODULE_MK= # defined
37 37
38.include "../../mk/bsd.prefs.mk" 38.include "../../mk/bsd.prefs.mk"
39 39
40PERL5_MODULE_TYPE?= MakeMaker 40PERL5_MODULE_TYPE?= MakeMaker
41 41
42.if (${PERL5_MODULE_TYPE} != "MakeMaker") && \ 42.if (${PERL5_MODULE_TYPE} != "MakeMaker") && \
43 (${PERL5_MODULE_TYPE} != "Module::Build") && \ 43 (${PERL5_MODULE_TYPE} != "Module::Build") && \
44 (${PERL5_MODULE_TYPE} != "Module::Install") && \ 44 (${PERL5_MODULE_TYPE} != "Module::Install") && \