diff options
| author | jlam <jlam@pkgsrc.org> | 2004-01-08 18:03:04 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-01-08 18:03:04 +0000 |
| commit | 662f2b7e7a1c3e147a5c2cb11893eec23e8a81a4 (patch) | |
| tree | b74955f0716141c3bab8b89545f616b75cf694cc /lang | |
| parent | d7311b04d24783bb2dc9dd1775c09e7691935376 (diff) | |
| download | pkgsrc-662f2b7e7a1c3e147a5c2cb11893eec23e8a81a4.tar.gz | |
Fix PLIST issues for perl5 in the overwrite case after removing
packlist -> PLIST generator from bsd.pkg.mk to perl5/module.mk.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/perl5/Makefile | 10 | ||||
| -rw-r--r-- | lang/perl5/module.mk | 14 |
2 files changed, 15 insertions, 9 deletions
diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile index 82d52d57146..b137a3d3efd 100644 --- a/lang/perl5/Makefile +++ b/lang/perl5/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.76 2004/01/06 17:17:53 reed Exp $ +# $NetBSD: Makefile,v 1.77 2004/01/08 18:03:04 jlam Exp $ .include "../../lang/perl5/Makefile.common" @@ -19,8 +19,11 @@ NOT_FOR_PLATFORM= Darwin-*-* PKG_INSTALLATION_TYPES= overwrite pkgviews -USE_BUILDLINK3= # defined -HAS_CONFIGURE= # defined +BUILDING_PERL5= yes +PERL5_CONFIGURE= no + +USE_BUILDLINK3= yes +HAS_CONFIGURE= yes CONFIGURE_SCRIPT= ./Configure CONFIGURE_ARGS+= -sde CONFIGURE_ARGS+= -Dprefix="${PREFIX}" @@ -210,4 +213,5 @@ CC=/usr/bin/cc .undef USE_GCC3 .endif +.include "module.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/perl5/module.mk b/lang/perl5/module.mk index af515527d91..682d8cf4249 100644 --- a/lang/perl5/module.mk +++ b/lang/perl5/module.mk @@ -1,4 +1,4 @@ -# $NetBSD: module.mk,v 1.27 2003/12/03 17:29:12 erh Exp $ +# $NetBSD: module.mk,v 1.28 2004/01/08 18:03:04 jlam Exp $ # # This Makefile fragment is intended to be included by packages that build # and install perl5 modules. @@ -33,11 +33,13 @@ _PERL5_MODULE_MK= # defined BUILDLINK_DEPMETHOD.perl+= full -.if !defined(NO_BUILDLINK) -. if empty(USE_BUILDLINK3:M[nN][oO]) -. include "../../lang/perl5/buildlink3.mk" -. elif empty(USE_BUILDLINK2:M[nN][oO]) -. include "../../lang/perl5/buildlink2.mk" +.if !defined(BUILDING_PERL5) +. if !defined(NO_BUILDLINK) +. if empty(USE_BUILDLINK3:M[nN][oO]) +. include "../../lang/perl5/buildlink3.mk" +. elif empty(USE_BUILDLINK2:M[nN][oO]) +. include "../../lang/perl5/buildlink2.mk" +. endif . endif .endif |