[pkgsrc/trunk]: pkgsrc/lang/perl5 Fix PLIST issues for perl5 in the overwrite...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3d3994624e2f
branches:  trunk
changeset: 465935:3d3994624e2f
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Thu Jan 08 18:03:04 2004 +0000

description:
Fix PLIST issues for perl5 in the overwrite case after removing
packlist -> PLIST generator from bsd.pkg.mk to perl5/module.mk.

diffstat:

 lang/perl5/Makefile  |  10 +++++++---
 lang/perl5/module.mk |  14 ++++++++------
 2 files changed, 15 insertions(+), 9 deletions(-)

diffs (57 lines):

diff -r 62eced8e377f -r 3d3994624e2f lang/perl5/Makefile
--- a/lang/perl5/Makefile       Thu Jan 08 17:57:14 2004 +0000
+++ b/lang/perl5/Makefile       Thu Jan 08 18:03:04 2004 +0000
@@ -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 @@
 
 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 @@
 .undef USE_GCC3
 .endif
 
+.include "module.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 62eced8e377f -r 3d3994624e2f lang/perl5/module.mk
--- a/lang/perl5/module.mk      Thu Jan 08 17:57:14 2004 +0000
+++ b/lang/perl5/module.mk      Thu Jan 08 18:03:04 2004 +0000
@@ -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 @@
 
 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