Revert previous...GREP is correct.

9 files changed, 21 insertions, 18 deletions

diff --git a/lang/python15/buildlink2.mk b/lang/python15/buildlink2.mk
index 7bb6920f566..a29707f920c 100644
--- a/lang/python15/buildlink2.mk
+++ b/lang/python15/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.5 2002/10/12 07:28:14 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2002/10/12 09:00:35 jlam Exp $
 
 .if !defined(PYTHON15_BUILDLINK2_MK)
 PYTHON15_BUILDLINK2_MK=	# defined
@@ -18,7 +18,7 @@ EVAL_PREFIX+=	BUILDLINK_PREFIX.python15=python15
 BUILDLINK_PREFIX.python15_DEFAULT=	${LOCALBASE}
 _PY15_BLNK_FILES= \
 	${BUILDLINK_PLIST_CMD.python15} |				\
-		${EGREP} '^\(include\|lib.*/lib[^/]*$$\)'
+		${GREP} '^\(include\|lib.*/lib[^/]*$$\)'
 BUILDLINK_FILES.python15=	`${_PY15_BLNK_FILES}`
 BUILDLINK_TRANSFORM+=		l:python:python1.5
 
diff --git a/lang/python20/buildlink2.mk b/lang/python20/buildlink2.mk
index 72d90a60b9a..1124044e49f 100644
--- a/lang/python20/buildlink2.mk
+++ b/lang/python20/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.6 2002/10/12 07:28:15 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.7 2002/10/12 09:00:35 jlam Exp $
 
 .if !defined(PYTHON20_BUILDLINK2_MK)
 PYTHON20_BUILDLINK2_MK=	# defined
@@ -18,7 +18,7 @@ EVAL_PREFIX+=	BUILDLINK_PREFIX.python20=python20
 BUILDLINK_PREFIX.python20_DEFAULT=	${LOCALBASE}
 _PY20_BLNK_FILES= \
 	${BUILDLINK_PLIST_CMD.python20} |				\
-		${EGREP} '^\(include\|lib.*/lib[^/]*$$\)'
+		${GREP} '^\(include\|lib.*/lib[^/]*$$\)'
 BUILDLINK_FILES.python20=	`${_PY20_BLNK_FILES}`
 BUILDLINK_TRANSFORM+=		l:python:python2.0
 
diff --git a/lang/python21-pth/buildlink2.mk b/lang/python21-pth/buildlink2.mk
index c310c4aa7ab..42ccb423a2b 100644
--- a/lang/python21-pth/buildlink2.mk
+++ b/lang/python21-pth/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.5 2002/10/12 07:28:15 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2002/10/12 09:00:35 jlam Exp $
 
 .if !defined(PYTHON21_BUILDLINK2_MK)
 PYTHON21_BUILDLINK2_MK=	# defined
@@ -18,7 +18,7 @@ EVAL_PREFIX+=	BUILDLINK_PREFIX.python21-pth=python21-pth
 BUILDLINK_PREFIX.python21-pth_DEFAULT=	${LOCALBASE}
 _PY21_PTH_BLNK_FILES= \
 	${BUILDLINK_PLIST_CMD.python21-pth} |				\
-		${EGREP} '^\(include\|lib.*/lib[^/]*$$\)'
+		${GREP} '^\(include\|lib.*/lib[^/]*$$\)'
 BUILDLINK_FILES.python21-pth=	`${_PY21_PTH_BLNK_FILES}`
 BUILDLINK_TRANSFORM+=		l:python:python2p1
 
diff --git a/lang/python21/buildlink2.mk b/lang/python21/buildlink2.mk
index f5b3fe7e106..0d2a2b7de0a 100644
--- a/lang/python21/buildlink2.mk
+++ b/lang/python21/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.5 2002/10/12 07:28:15 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2002/10/12 09:00:35 jlam Exp $
 
 .if !defined(PYTHON21_BUILDLINK2_MK)
 PYTHON21_BUILDLINK2_MK=	# defined
@@ -18,7 +18,7 @@ EVAL_PREFIX+=	BUILDLINK_PREFIX.python21=python21
 BUILDLINK_PREFIX.python21_DEFAULT=	${LOCALBASE}
 _PY21_BLNK_FILES= \
 	${BUILDLINK_PLIST_CMD.python21} |				\
-		${EGREP} '^\(include\|lib.*/lib[^/]*$$\)'
+		${GREP} '^\(include\|lib.*/lib[^/]*$$\)'
 BUILDLINK_FILES.python21=	`${_PY21_BLNK_FILES}`
 BUILDLINK_TRANSFORM+=		l:python:python2.1
 
diff --git a/lang/python22/buildlink2.mk b/lang/python22/buildlink2.mk
index ab0472d1874..bd98f9a77f0 100644
--- a/lang/python22/buildlink2.mk
+++ b/lang/python22/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.7 2002/10/12 07:28:16 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.8 2002/10/12 09:00:36 jlam Exp $
 
 .if !defined(PYTHON22_BUILDLINK2_MK)
 PYTHON22_BUILDLINK2_MK=	# defined
@@ -18,10 +18,13 @@ EVAL_PREFIX+=	BUILDLINK_PREFIX.python22=python22
 BUILDLINK_PREFIX.python22_DEFAULT=	${LOCALBASE}
 _PY22_BLNK_FILES= \
 	${BUILDLINK_PLIST_CMD.python22} |				\
-		${EGREP} '^\(include\|lib.*/lib[^/]*$$\)'
+		${GREP} '^\(include\|lib.*/lib[^/]*$$\)'
 BUILDLINK_FILES.python22=	`${_PY22_BLNK_FILES}`
 BUILDLINK_TRANSFORM+=		l:python:python2.2
 
+jlam:
+	@${ECHO} ${BUILDLINK_FILES.python22}
+
 BUILDLINK_CPPFLAGS.python22+= \
 	-I${BUILDLINK_PREFIX.python22}/include/python2.2
 BUILDLINK_LDFLAGS.python22+= \
diff --git a/x11/kdebase2/buildlink2.mk b/x11/kdebase2/buildlink2.mk
index c86a51f800e..0f1d5602260 100644
--- a/x11/kdebase2/buildlink2.mk
+++ b/x11/kdebase2/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.4 2002/10/12 07:29:01 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2002/10/12 09:00:36 jlam Exp $
 
 .if !defined(KDEBASE2_BUILDLINK2_MK)
 KDEBASE2_BUILDLINK2_MK=	# defined
@@ -13,7 +13,7 @@ BUILDLINK_PKGSRCDIR.kdebase2?=	../../x11/kdebase2
 EVAL_PREFIX+=	BUILDLINK_PREFIX.kdebase2=kdebase
 BUILDLINK_PREFIX.kdebase2_DEFAULT=	${X11PREFIX}
 _KDEBASE2_BLNK_FILES= \
-	${BUILDLINK_PLIST_CMD.kdebase2} | ${EGREP} '^\(include\|lib\)'
+	${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 982f6157b5d..ea950e9c3f4 100644
--- a/x11/kdebase3/buildlink2.mk
+++ b/x11/kdebase3/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.4 2002/10/12 07:29:02 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2002/10/12 09:00:36 jlam Exp $
 
 .if !defined(KDEBASE3_BUILDLINK2_MK)
 KDEBASE3_BUILDLINK2_MK=	# defined
@@ -13,7 +13,7 @@ BUILDLINK_PKGSRCDIR.kdebase3?=	../../x11/kdebase3
 EVAL_PREFIX+=			BUILDLINK_PREFIX.kdebase3=kdebase
 BUILDLINK_PREFIX.kdebase3_DEFAULT=	${X11PREFIX}
 _KDEBASE3_BLNK_FILES= \
-	${BUILDLINK_PLIST_CMD.kdebase3} | ${EGREP} '^\(include\|lib\)'
+	${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 13b87deabc2..c4749e51318 100644
--- a/x11/kdelibs2/buildlink2.mk
+++ b/x11/kdelibs2/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.6 2002/10/12 07:29:02 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.7 2002/10/12 09:00:36 jlam Exp $
 
 .if !defined(KDELIBS2_BUILDLINK2_MK)
 KDELIBS2_BUILDLINK2_MK=	# defined
@@ -13,7 +13,7 @@ BUILDLINK_PKGSRCDIR.kdelibs2?=	../../x11/kdelibs2
 EVAL_PREFIX+=	BUILDLINK_PREFIX.kdelibs2=kdelibs
 BUILDLINK_PREFIX.kdelibs2_DEFAULT=	${X11PREFIX}
 _KDELIBS2_BLNK_FILES= \
-	${BUILDLINK_PLIST_CMD.kdelibs2} | ${EGREP} '^\(include\|lib\)'
+	${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 8e6d47ea903..d511f71ae16 100644
--- a/x11/kdelibs3/buildlink2.mk
+++ b/x11/kdelibs3/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.5 2002/10/12 07:29:03 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2002/10/12 09:00:36 jlam Exp $
 
 .if !defined(KDELIBS3_BUILDLINK2_MK)
 KDELIBS3_BUILDLINK2_MK=	# defined
@@ -13,7 +13,7 @@ BUILDLINK_PKGSRCDIR.kdelibs3?=	../../x11/kdelibs3
 EVAL_PREFIX+=			BUILDLINK_PREFIX.kdelibs3=kdelibs
 BUILDLINK_PREFIX.kdelibs3_DEFAULT=	${X11PREFIX}
 _KDELIBS3_BLNK_FILES= \
-	${BUILDLINK_PLIST_CMD.kdelibs3} | ${EGREP} '^\(include\|lib\)'
+	${BUILDLINK_PLIST_CMD.kdelibs3} | ${GREP} '^\(include\|lib\)'
 BUILDLINK_FILES.kdelibs3=	`${_KDELIBS3_BLNK_FILES}`
 
 KDEDIR=				${BUILDLINK_PREFIX.kdelibs3}