Use BUILDLINK_FILES_CMD.<pkg> instead of manually adding the shell pipeline

to BUILDLINK_FILES.<pkg>.

9 files changed, 18 insertions, 27 deletions

diff --git a/lang/python15/buildlink2.mk b/lang/python15/buildlink2.mk
index a29707f920c..1323f4c9060 100644
--- a/lang/python15/buildlink2.mk
+++ b/lang/python15/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.6 2002/10/12 09:00:35 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.7 2002/10/13 07:16:50 jlam Exp $
 
 .if !defined(PYTHON15_BUILDLINK2_MK)
 PYTHON15_BUILDLINK2_MK=	# defined
@@ -16,10 +16,9 @@ BUILDLINK_DEPMETHOD.python15?=	${BUILDLINK_DEPMETHOD.python}
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.python15=python15
 BUILDLINK_PREFIX.python15_DEFAULT=	${LOCALBASE}
-_PY15_BLNK_FILES= \
+BUILDLINK_FILES_CMD.python15= \
 	${BUILDLINK_PLIST_CMD.python15} |				\
 		${GREP} '^\(include\|lib.*/lib[^/]*$$\)'
-BUILDLINK_FILES.python15=	`${_PY15_BLNK_FILES}`
 BUILDLINK_TRANSFORM+=		l:python:python1.5
 
 BUILDLINK_CPPFLAGS.python15+= \
diff --git a/lang/python20/buildlink2.mk b/lang/python20/buildlink2.mk
index 1124044e49f..da291768d4e 100644
--- a/lang/python20/buildlink2.mk
+++ b/lang/python20/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.7 2002/10/12 09:00:35 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.8 2002/10/13 07:16:51 jlam Exp $
 
 .if !defined(PYTHON20_BUILDLINK2_MK)
 PYTHON20_BUILDLINK2_MK=	# defined
@@ -16,10 +16,9 @@ BUILDLINK_DEPMETHOD.python20?=	${BUILDLINK_DEPMETHOD.python}
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.python20=python20
 BUILDLINK_PREFIX.python20_DEFAULT=	${LOCALBASE}
-_PY20_BLNK_FILES= \
+BUILDLINK_FILES_CMD.python20= \
 	${BUILDLINK_PLIST_CMD.python20} |				\
 		${GREP} '^\(include\|lib.*/lib[^/]*$$\)'
-BUILDLINK_FILES.python20=	`${_PY20_BLNK_FILES}`
 BUILDLINK_TRANSFORM+=		l:python:python2.0
 
 BUILDLINK_CPPFLAGS.python20+= \
diff --git a/lang/python21-pth/buildlink2.mk b/lang/python21-pth/buildlink2.mk
index 42ccb423a2b..471e831ced7 100644
--- a/lang/python21-pth/buildlink2.mk
+++ b/lang/python21-pth/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.6 2002/10/12 09:00:35 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.7 2002/10/13 07:16:51 jlam Exp $
 
 .if !defined(PYTHON21_BUILDLINK2_MK)
 PYTHON21_BUILDLINK2_MK=	# defined
@@ -16,10 +16,9 @@ BUILDLINK_DEPMETHOD.python21-pth?=	${BUILDLINK_DEPMETHOD.python}
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.python21-pth=python21-pth
 BUILDLINK_PREFIX.python21-pth_DEFAULT=	${LOCALBASE}
-_PY21_PTH_BLNK_FILES= \
+BUILDLINK_FILES_CMD.python21-pth= \
 	${BUILDLINK_PLIST_CMD.python21-pth} |				\
 		${GREP} '^\(include\|lib.*/lib[^/]*$$\)'
-BUILDLINK_FILES.python21-pth=	`${_PY21_PTH_BLNK_FILES}`
 BUILDLINK_TRANSFORM+=		l:python:python2p1
 
 BUILDLINK_CPPFLAGS.python21-pth+= \
diff --git a/lang/python21/buildlink2.mk b/lang/python21/buildlink2.mk
index 0d2a2b7de0a..d6941377a18 100644
--- a/lang/python21/buildlink2.mk
+++ b/lang/python21/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.6 2002/10/12 09:00:35 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.7 2002/10/13 07:16:52 jlam Exp $
 
 .if !defined(PYTHON21_BUILDLINK2_MK)
 PYTHON21_BUILDLINK2_MK=	# defined
@@ -16,10 +16,9 @@ BUILDLINK_DEPMETHOD.python21?=	${BUILDLINK_DEPMETHOD.python}
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.python21=python21
 BUILDLINK_PREFIX.python21_DEFAULT=	${LOCALBASE}
-_PY21_BLNK_FILES= \
+BUILDLINK_FILES_CMD.python21= \
 	${BUILDLINK_PLIST_CMD.python21} |				\
 		${GREP} '^\(include\|lib.*/lib[^/]*$$\)'
-BUILDLINK_FILES.python21=	`${_PY21_BLNK_FILES}`
 BUILDLINK_TRANSFORM+=		l:python:python2.1
 
 BUILDLINK_CPPFLAGS.python21+= \
diff --git a/lang/python22/buildlink2.mk b/lang/python22/buildlink2.mk
index 4ee9696c31d..6d70bc5ecf0 100644
--- a/lang/python22/buildlink2.mk
+++ b/lang/python22/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.9 2002/10/12 09:03:51 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.10 2002/10/13 07:16:52 jlam Exp $
 
 .if !defined(PYTHON22_BUILDLINK2_MK)
 PYTHON22_BUILDLINK2_MK=	# defined
@@ -16,10 +16,9 @@ BUILDLINK_DEPMETHOD.python22?=	${BUILDLINK_DEPMETHOD.python}
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.python22=python22
 BUILDLINK_PREFIX.python22_DEFAULT=	${LOCALBASE}
-_PY22_BLNK_FILES= \
+BUILDLINK_FILES_CMD.python22= \
 	${BUILDLINK_PLIST_CMD.python22} |				\
 		${GREP} '^\(include\|lib.*/lib[^/]*$$\)'
-BUILDLINK_FILES.python22=	`${_PY22_BLNK_FILES}`
 BUILDLINK_TRANSFORM+=		l:python:python2.2
 
 BUILDLINK_CPPFLAGS.python22+= \
diff --git a/x11/kdebase2/buildlink2.mk b/x11/kdebase2/buildlink2.mk
index 0f1d5602260..11b7d5cbe75 100644
--- a/x11/kdebase2/buildlink2.mk
+++ b/x11/kdebase2/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.5 2002/10/12 09:00:36 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2002/10/13 07:16:53 jlam Exp $
 
 .if !defined(KDEBASE2_BUILDLINK2_MK)
 KDEBASE2_BUILDLINK2_MK=	# defined
@@ -12,9 +12,8 @@ BUILDLINK_PKGSRCDIR.kdebase2?=	../../x11/kdebase2
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.kdebase2=kdebase
 BUILDLINK_PREFIX.kdebase2_DEFAULT=	${X11PREFIX}
-_KDEBASE2_BLNK_FILES= \
+BUILDLINK_FILES_CMD.kdebase2= \
 	${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 ea950e9c3f4..aaa41977ec9 100644
--- a/x11/kdebase3/buildlink2.mk
+++ b/x11/kdebase3/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.5 2002/10/12 09:00:36 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2002/10/13 07:16:53 jlam Exp $
 
 .if !defined(KDEBASE3_BUILDLINK2_MK)
 KDEBASE3_BUILDLINK2_MK=	# defined
@@ -12,9 +12,8 @@ BUILDLINK_PKGSRCDIR.kdebase3?=	../../x11/kdebase3
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.kdebase3=kdebase
 BUILDLINK_PREFIX.kdebase3_DEFAULT=	${X11PREFIX}
-_KDEBASE3_BLNK_FILES= \
+BUILDLINK_FILES_CMD.kdebase3= \
 	${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 c4749e51318..f5b0288d7cd 100644
--- a/x11/kdelibs2/buildlink2.mk
+++ b/x11/kdelibs2/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.7 2002/10/12 09:00:36 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.8 2002/10/13 07:16:53 jlam Exp $
 
 .if !defined(KDELIBS2_BUILDLINK2_MK)
 KDELIBS2_BUILDLINK2_MK=	# defined
@@ -12,9 +12,8 @@ BUILDLINK_PKGSRCDIR.kdelibs2?=	../../x11/kdelibs2
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.kdelibs2=kdelibs
 BUILDLINK_PREFIX.kdelibs2_DEFAULT=	${X11PREFIX}
-_KDELIBS2_BLNK_FILES= \
+BUIDLINK_FILES_CMD.kdelibs2= \
 	${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 d511f71ae16..ddb76678a94 100644
--- a/x11/kdelibs3/buildlink2.mk
+++ b/x11/kdelibs3/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.6 2002/10/12 09:00:36 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.7 2002/10/13 07:16:54 jlam Exp $
 
 .if !defined(KDELIBS3_BUILDLINK2_MK)
 KDELIBS3_BUILDLINK2_MK=	# defined
@@ -12,9 +12,8 @@ BUILDLINK_PKGSRCDIR.kdelibs3?=	../../x11/kdelibs3
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.kdelibs3=kdelibs
 BUILDLINK_PREFIX.kdelibs3_DEFAULT=	${X11PREFIX}
-_KDELIBS3_BLNK_FILES= \
+BUILDLINK_FILES_CMD.kdelibs3= \
 	${BUILDLINK_PLIST_CMD.kdelibs3} | ${GREP} '^\(include\|lib\)'
-BUILDLINK_FILES.kdelibs3=	`${_KDELIBS3_BLNK_FILES}`
 
 KDEDIR=				${BUILDLINK_PREFIX.kdelibs3}