Use BUILDLINK_PLIST_CMD instead of grepping the PLIST, which for some of

these python packages is empty.

4 files changed, 24 insertions, 72 deletions

diff --git a/lang/python15/buildlink2.mk b/lang/python15/buildlink2.mk
index a26994471cc..0c3df0f0469 100644
--- a/lang/python15/buildlink2.mk
+++ b/lang/python15/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2002/10/09 11:40:40 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2002/10/09 23:46:14 jlam Exp $
 
 .if !defined(PYTHON15_BUILDLINK2_MK)
 PYTHON15_BUILDLINK2_MK=	# defined
@@ -6,6 +6,7 @@ PYTHON15_BUILDLINK2_MK=	# defined
 .include "../../mk/bsd.prefs.mk"
 
 BUILDLINK_PACKAGES+=		python15
+BUILDLINK_PKGBASE.python15?=	python15
 BUILDLINK_DEPENDS.python15?=	python15>=1.5
 BUILDLINK_PKGSRCDIR.python15?=	../../lang/python15
 
@@ -15,9 +16,10 @@ BUILDLINK_DEPMETHOD.python15?=	${BUILDLINK_DEPMETHOD.python}
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.python15=python15
 BUILDLINK_PREFIX.python15_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.python15!= \
-	${GREP} "^include/" ${.CURDIR}/${BUILDLINK_PKGSRCDIR.python15}/PLIST
-BUILDLINK_FILES.python15+=	lib/python1.5/config/libpython1.5.*
+_PY15_BLNK_FILES= \
+	${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 9f8408d1f85..580f10d64bf 100644
--- a/lang/python20/buildlink2.mk
+++ b/lang/python20/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.4 2002/10/09 14:34:21 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2002/10/09 23:46:14 jlam Exp $
 
 .if !defined(PYTHON20_BUILDLINK2_MK)
 PYTHON20_BUILDLINK2_MK=	# defined
@@ -6,6 +6,7 @@ PYTHON20_BUILDLINK2_MK=	# defined
 .include "../../mk/bsd.prefs.mk"
 
 BUILDLINK_PACKAGES+=		python20
+BUILDLINK_PKGBASE.python20?=	python20
 BUILDLINK_DEPENDS.python20?=	python20>=2.0
 BUILDLINK_PKGSRCDIR.python20?=	../../lang/python20
 
@@ -15,65 +16,10 @@ BUILDLINK_DEPMETHOD.python20?=	${BUILDLINK_DEPMETHOD.python}
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.python20=python20
 BUILDLINK_PREFIX.python20_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.python20+=	include/python2.0/Python.h
-BUILDLINK_FILES.python20+=	include/python2.0/abstract.h
-BUILDLINK_FILES.python20+=	include/python2.0/bitset.h
-BUILDLINK_FILES.python20+=	include/python2.0/bufferobject.h
-BUILDLINK_FILES.python20+=	include/python2.0/cStringIO.h
-BUILDLINK_FILES.python20+=	include/python2.0/ceval.h
-BUILDLINK_FILES.python20+=	include/python2.0/classobject.h
-BUILDLINK_FILES.python20+=	include/python2.0/cobject.h
-BUILDLINK_FILES.python20+=	include/python2.0/codecs.h
-BUILDLINK_FILES.python20+=	include/python2.0/compile.h
-BUILDLINK_FILES.python20+=	include/python2.0/complexobject.h
-BUILDLINK_FILES.python20+=	include/python2.0/dictobject.h
-BUILDLINK_FILES.python20+=	include/python2.0/errcode.h
-BUILDLINK_FILES.python20+=	include/python2.0/eval.h
-BUILDLINK_FILES.python20+=	include/python2.0/fileobject.h
-BUILDLINK_FILES.python20+=	include/python2.0/floatobject.h
-BUILDLINK_FILES.python20+=	include/python2.0/frameobject.h
-BUILDLINK_FILES.python20+=	include/python2.0/funcobject.h
-BUILDLINK_FILES.python20+=	include/python2.0/graminit.h
-BUILDLINK_FILES.python20+=	include/python2.0/grammar.h
-BUILDLINK_FILES.python20+=	include/python2.0/import.h
-BUILDLINK_FILES.python20+=	include/python2.0/intobject.h
-BUILDLINK_FILES.python20+=	include/python2.0/intrcheck.h
-BUILDLINK_FILES.python20+=	include/python2.0/listobject.h
-BUILDLINK_FILES.python20+=	include/python2.0/longintrepr.h
-BUILDLINK_FILES.python20+=	include/python2.0/longobject.h
-BUILDLINK_FILES.python20+=	include/python2.0/marshal.h
-BUILDLINK_FILES.python20+=	include/python2.0/metagrammar.h
-BUILDLINK_FILES.python20+=	include/python2.0/methodobject.h
-BUILDLINK_FILES.python20+=	include/python2.0/modsupport.h
-BUILDLINK_FILES.python20+=	include/python2.0/moduleobject.h
-BUILDLINK_FILES.python20+=	include/python2.0/node.h
-BUILDLINK_FILES.python20+=	include/python2.0/object.h
-BUILDLINK_FILES.python20+=	include/python2.0/objimpl.h
-BUILDLINK_FILES.python20+=	include/python2.0/opcode.h
-BUILDLINK_FILES.python20+=	include/python2.0/osdefs.h
-BUILDLINK_FILES.python20+=	include/python2.0/parsetok.h
-BUILDLINK_FILES.python20+=	include/python2.0/patchlevel.h
-BUILDLINK_FILES.python20+=	include/python2.0/pgenheaders.h
-BUILDLINK_FILES.python20+=	include/python2.0/pydebug.h
-BUILDLINK_FILES.python20+=	include/python2.0/pyerrors.h
-BUILDLINK_FILES.python20+=	include/python2.0/pyfpe.h
-BUILDLINK_FILES.python20+=	include/python2.0/pymem.h
-BUILDLINK_FILES.python20+=	include/python2.0/pyport.h
-BUILDLINK_FILES.python20+=	include/python2.0/pystate.h
-BUILDLINK_FILES.python20+=	include/python2.0/pythonrun.h
-BUILDLINK_FILES.python20+=	include/python2.0/pythread.h
-BUILDLINK_FILES.python20+=	include/python2.0/rangeobject.h
-BUILDLINK_FILES.python20+=	include/python2.0/sliceobject.h
-BUILDLINK_FILES.python20+=	include/python2.0/stringobject.h
-BUILDLINK_FILES.python20+=	include/python2.0/structmember.h
-BUILDLINK_FILES.python20+=	include/python2.0/sysmodule.h
-BUILDLINK_FILES.python20+=	include/python2.0/token.h
-BUILDLINK_FILES.python20+=	include/python2.0/traceback.h
-BUILDLINK_FILES.python20+=	include/python2.0/tupleobject.h
-BUILDLINK_FILES.python20+=	include/python2.0/ucnhash.h
-BUILDLINK_FILES.python20+=	include/python2.0/unicodeobject.h
-BUILDLINK_FILES.python20+=	include/python2.0/config.h
-BUILDLINK_FILES.python20+=	lib/python2.0/config/libpython2.0.*
+_PY20_BLNK_FILES= \
+	${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 920fbc361fe..a9684d3b246 100644
--- a/lang/python21-pth/buildlink2.mk
+++ b/lang/python21-pth/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2002/10/09 11:40:41 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2002/10/09 23:46:15 jlam Exp $
 
 .if !defined(PYTHON21_BUILDLINK2_MK)
 PYTHON21_BUILDLINK2_MK=	# defined
@@ -6,6 +6,7 @@ PYTHON21_BUILDLINK2_MK=	# defined
 .include "../../mk/bsd.prefs.mk"
 
 BUILDLINK_PACKAGES+=			python21-pth
+BUILDLINK_PKGBASE.python21-pth?=	python21-pth
 BUILDLINK_DEPENDS.python21-pth?=	python21-pth>=2.1
 BUILDLINK_PKGSRCDIR.python21-pth?=	../../lang/python21-pth
 
@@ -15,9 +16,10 @@ BUILDLINK_DEPMETHOD.python21-pth?=	${BUILDLINK_DEPMETHOD.python}
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.python21-pth=python21-pth
 BUILDLINK_PREFIX.python21-pth_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.python21-pth!= \
-	${GREP} "^include/" ${.CURDIR}/${BUILDLINK_PKGSRCDIR.python21-pth}/PLIST
-BUILDLINK_FILES.python21-pth+=	lib/python2p1/config/libpython2p1.*
+_PY21_PTH_BLNK_FILES= \
+	${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 e18c85798af..045907cf446 100644
--- a/lang/python21/buildlink2.mk
+++ b/lang/python21/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2002/10/09 11:40:41 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2002/10/09 23:46:15 jlam Exp $
 
 .if !defined(PYTHON21_BUILDLINK2_MK)
 PYTHON21_BUILDLINK2_MK=	# defined
@@ -6,6 +6,7 @@ PYTHON21_BUILDLINK2_MK=	# defined
 .include "../../mk/bsd.prefs.mk"
 
 BUILDLINK_PACKAGES+=		python21
+BUILDLINK_PKGBASE.python21?=	python21
 BUILDLINK_DEPENDS.python21?=	python21>=2.1
 BUILDLINK_PKGSRCDIR.python21?=	../../lang/python21
 
@@ -15,9 +16,10 @@ BUILDLINK_DEPMETHOD.python21?=	${BUILDLINK_DEPMETHOD.python}
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.python21=python21
 BUILDLINK_PREFIX.python21_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.python21!= \
-	${GREP} "^include/" ${.CURDIR}/${BUILDLINK_PKGSRCDIR.python21}/PLIST
-BUILDLINK_FILES.python21+=	lib/python2.1/config/libpython2.1.*
+_PY21_BLNK_FILES= \
+	${BUILDLINK_PLIST_CMD.python21} |				\
+		${GREP} '^\(include\|lib.*/lib[^/]*$$\)'
+BUILDLINK_FILES.python21=	`${_PY21_BLNK_FILES}`
 BUILDLINK_TRANSFORM+=		l:python:python2.1
 
 BUILDLINK_CPPFLAGS.python21+= \