Use BUILDLINK_PLIST_CMD instead of grepping the PLISTs so that we use the

file list from the installed package, not the file list from the pkgsrc
PLIST, which may be for a new version than the installed package.

4 files changed, 20 insertions, 12 deletions

diff --git a/x11/kdebase2/buildlink2.mk b/x11/kdebase2/buildlink2.mk
index fad4ff0ccef..ef9f7393d63 100644
--- a/x11/kdebase2/buildlink2.mk
+++ b/x11/kdebase2/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/09/20 02:06:08 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2002/10/10 00:11:49 jlam Exp $
 
 .if !defined(KDEBASE2_BUILDLINK2_MK)
 KDEBASE2_BUILDLINK2_MK=	# defined
@@ -6,14 +6,15 @@ KDEBASE2_BUILDLINK2_MK=	# defined
 .include "../../mk/bsd.prefs.mk"
 
 BUILDLINK_PACKAGES+=		kdebase2
+BUILDLINK_PKGBASE.kdebase2?=	kdebase
 BUILDLINK_DEPENDS.kdebase2?=	kdebase>=2.2.2nb1
 BUILDLINK_PKGSRCDIR.kdebase2?=	../../x11/kdebase2
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.kdebase2=kdebase
 BUILDLINK_PREFIX.kdebase2_DEFAULT=	${X11PREFIX}
-BUILDLINK_FILES.kdebase2!=						\
-	${GREP} "^\(include\|lib\)"					\
-		${.CURDIR}/${BUILDLINK_PKGSRCDIR.kdebase2}/PLIST
+_KDEBASE2_BLNK_FILES= \
+	${BUILDLINK_PLIST_CMD.kdebase2} | ${GREP} '^\(include\|lib\)'
+BUILDLINK_FILES.kdebase2=	`${_KDEBASE2_BLNK_FILES}`
 
 .include "../../x11/kdelibs2/buildlink2.mk"
 
diff --git a/x11/kdebase3/buildlink2.mk b/x11/kdebase3/buildlink2.mk
index e4af8ec3700..929e23a15d3 100644
--- a/x11/kdebase3/buildlink2.mk
+++ b/x11/kdebase3/buildlink2.mk
@@ -1,9 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:35 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2002/10/10 00:11:50 jlam Exp $
 
 .if !defined(KDEBASE3_BUILDLINK2_MK)
 KDEBASE3_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		kdebase3
+BUILDLINK_PKGBASE.kdebase3?=	kdebase
 BUILDLINK_DEPENDS.kdebase3?=	kdebase>=3.0
 BUILDLINK_PKGSRCDIR.kdebase3?=	../../x11/kdebase3
 
@@ -11,7 +12,9 @@ BUILDLINK_PKGSRCDIR.kdebase3?=	../../x11/kdebase3
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.kdebase3=kdebase
 BUILDLINK_PREFIX.kdebase3_DEFAULT=	${X11PREFIX}
-BUILDLINK_FILES.kdebase3!=	${GREP} "^\(include\|lib\)" ${.CURDIR}/../../x11/kdebase3/PLIST
+_KDEBASE3_BLNK_FILES= \
+	${BUILDLINK_PLIST_CMD.kdebase3} | ${GREP} '^\(include\|lib\)'
+BUILDLINK_FILES.kdebase3=	`${_KDEBASE3_BLNK_FILES}`
 
 .include "../../x11/kdelibs3/buildlink2.mk"
 
diff --git a/x11/kdelibs2/buildlink2.mk b/x11/kdelibs2/buildlink2.mk
index 5d114f66db3..851feb1d0f0 100644
--- a/x11/kdelibs2/buildlink2.mk
+++ b/x11/kdelibs2/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.4 2002/09/20 02:04:33 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2002/10/10 00:11:50 jlam Exp $
 
 .if !defined(KDELIBS2_BUILDLINK2_MK)
 KDELIBS2_BUILDLINK2_MK=	# defined
@@ -6,14 +6,15 @@ KDELIBS2_BUILDLINK2_MK=	# defined
 .include "../../mk/bsd.prefs.mk"
 
 BUILDLINK_PACKAGES+=		kdelibs2
+BUILDLINK_PKGBASE.kdelibs2?=	kdelibs
 BUILDLINK_DEPENDS.kdelibs2?=	kdelibs>=2.2.2nb3
 BUILDLINK_PKGSRCDIR.kdelibs2?=	../../x11/kdelibs2
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.kdelibs2=kdelibs
 BUILDLINK_PREFIX.kdelibs2_DEFAULT=	${X11PREFIX}
-BUILDLINK_FILES.kdelibs2!=						\
-	${GREP} "^\(include\|lib\)"					\
-		${.CURDIR}/${BUILDLINK_PKGSRCDIR.kdelibs2}/PLIST
+_KDELIBS2_BLNK_FILES= \
+	${BUILDLINK_PLIST_CMD.kdelibs2} | ${GREP} '^\(include\|lib\)'
+BUILDLINK_FILES.kdelibs2=	`${_KDELIBS2_BLNK_FILES}`
 
 KDEDIR=				${BUILDLINK_PREFIX.kdelibs2}
 
diff --git a/x11/kdelibs3/buildlink2.mk b/x11/kdelibs3/buildlink2.mk
index 6f4605b61a5..0e1b284773f 100644
--- a/x11/kdelibs3/buildlink2.mk
+++ b/x11/kdelibs3/buildlink2.mk
@@ -1,9 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.3 2002/09/10 16:06:55 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2002/10/10 00:11:51 jlam Exp $
 
 .if !defined(KDELIBS3_BUILDLINK2_MK)
 KDELIBS3_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		kdelibs3
+BUILDLINK_PKGBASE.kdelibs3?=	kdelibs
 BUILDLINK_DEPENDS.kdelibs3?=	kdelibs>=3.0.3nb1
 BUILDLINK_PKGSRCDIR.kdelibs3?=	../../x11/kdelibs3
 
@@ -11,7 +12,9 @@ BUILDLINK_PKGSRCDIR.kdelibs3?=	../../x11/kdelibs3
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.kdelibs3=kdelibs
 BUILDLINK_PREFIX.kdelibs3_DEFAULT=	${X11PREFIX}
-BUILDLINK_FILES.kdelibs3!=	${GREP} "^\(include\|lib\)" ${.CURDIR}/../../x11/kdelibs3/PLIST
+_KDELIBS3_BLNK_FILES= \
+	${BUILDLINK_PLIST_CMD.kdelibs3} | ${GREP} '^\(include\|lib\)'
+BUILDLINK_FILES.kdelibs3=	`${_KDELIBS3_BLNK_FILES}`
 
 KDEDIR=				${BUILDLINK_PREFIX.kdelibs3}