Sun May 9 18:46:34 2010 UTC ()
Fix issue with PLIST generation by not reading existing .packlist.


(morr)
diff -r1.61 -r1.62 pkgsrc/lang/perl5/module.mk
cvs diff -r1.61 -r1.62 pkgsrc/lang/perl5/module.mk (expand / switch to unified diff)

--- pkgsrc/lang/perl5/module.mk 2010/01/16 15:02:14 1.61
+++ pkgsrc/lang/perl5/module.mk 2010/05/09 18:46:34 1.62
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: module.mk,v 1.61 2010/01/16 15:02:14 sno Exp $ 1# $NetBSD: module.mk,v 1.62 2010/05/09 18:46:34 morr 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.
@@ -201,28 +201,29 @@ PERL5_MAKE_FLAGS.makemaker+= OTHERLDFLAG @@ -201,28 +201,29 @@ PERL5_MAKE_FLAGS.makemaker+= OTHERLDFLAG
201PERL5_MAKE_FLAGS.makemaker+= OTHERLDFLAGS=${LDFLAGS:Q} 201PERL5_MAKE_FLAGS.makemaker+= OTHERLDFLAGS=${LDFLAGS:Q}
202.endif 202.endif
203 203
204# Repoint all of the vendor-specific variables to be under the perl5 204# Repoint all of the vendor-specific variables to be under the perl5
205# module's ${PREFIX}. 205# module's ${PREFIX}.
206# 206#
207.include "../../lang/perl5/vars.mk" 207.include "../../lang/perl5/vars.mk"
208.for _var_ in ${_PERL5_VARS} 208.for _var_ in ${_PERL5_VARS}
209PERL5_MAKE_FLAGS.makemaker+= ${_var_}=${PERL5_${_var_}:Q} 209PERL5_MAKE_FLAGS.makemaker+= ${_var_}=${PERL5_${_var_}:Q}
210.endfor 210.endfor
211# 211#
212# The PREFIX in the generated Makefile will point to ${_PERL5_PREFIX}, 212# The PREFIX in the generated Makefile will point to ${_PERL5_PREFIX},
213# so override its value to the module's ${PREFIX}. 213# so override its value to the module's ${PREFIX}.
 214# Also, set VENDORARCHEXP, so existing .packlist won't be read.
214# 215#
215PERL5_MAKE_FLAGS.makemaker+= PREFIX=${PREFIX:Q} 216PERL5_MAKE_FLAGS.makemaker+= PREFIX=${PREFIX:Q} VENDORARCHEXP=${DESTDIR}${PERL5_INSTALLVENDORARCH}
216 217
217PERL5_MAKE_FLAGS+= ${PERL5_MAKE_FLAGS.${_PERL5_MODTYPE}} 218PERL5_MAKE_FLAGS+= ${PERL5_MAKE_FLAGS.${_PERL5_MODTYPE}}
218MAKE_FLAGS+= ${PERL5_MAKE_FLAGS} 219MAKE_FLAGS+= ${PERL5_MAKE_FLAGS}
219 220
220.if defined(PERL5_LDFLAGS) && !empty(PERL5_LDFLAGS) 221.if defined(PERL5_LDFLAGS) && !empty(PERL5_LDFLAGS)
221FIX_RPATH+= PERL5_LDFLAGS 222FIX_RPATH+= PERL5_LDFLAGS
222LDFLAGS+= ${PERL5_LDFLAGS} 223LDFLAGS+= ${PERL5_LDFLAGS}
223.endif 224.endif
224 225
225.include "../../lang/perl5/packlist.mk" 226.include "../../lang/perl5/packlist.mk"
226 227
227.include "../../mk/pthread.buildlink3.mk" 228.include "../../mk/pthread.buildlink3.mk"
228 229