Regularize fixes to config scripts to use the same code.

6 files changed, 44 insertions, 32 deletions

diff --git a/audio/esound/Makefile b/audio/esound/Makefile
index f82c3775dc2..1e15e629717 100644
--- a/audio/esound/Makefile
+++ b/audio/esound/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2001/06/16 19:50:57 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2001/06/18 20:49:00 jlam Exp $
 
 DISTNAME=		esound-0.2.22
 CATEGORIES=		audio
@@ -17,14 +17,17 @@ USE_CONFIG_WRAPPER=	YES
 .include "../../audio/libaudiofile/buildlink.mk"
 .include "../../devel/libgetopt/buildlink.mk"
 
-# Fix esd-config by removing buildlink directory references.
+# Fix config scripts by removing buildlink directory references.
 post-build:
 	@cd ${WRKSRC};							\
-	${MV} -f esd-config esd-config.fixme;				\
-	${SED}  -e "/^audiofile/s|-I${BUILDLINK_DIR}/|-I${LOCALBASE}/|g" \
-		-e "/^audiofile/s|-L${BUILDLINK_DIR}/|-L${LOCALBASE}/|g" \
-		esd-config.fixme > esd-config;				\
-	${RM} -f esd-config.fixme;					\
-	${CHMOD} +x esd-config
+	config_scripts="esd-config";					\
+	for file in $${config_scripts}; do				\
+		${MV} -f $${file} $${file}.fixme;			\
+		${SED}	-e "s|-I${BUILDLINK_DIR}/|-I${LOCALBASE}/|g"	\
+			-e "s|-L${BUILDLINK_DIR}/|-L${LOCALBASE}/|g"	\
+			$${file}.fixme > $${file};			\
+		${RM} -f $${file}.fixme;				\
+		${CHMOD} +x $${file};					\
+	done
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gdk-pixbuf-gnome/Makefile b/graphics/gdk-pixbuf-gnome/Makefile
index 94ee583dccc..20142f3c424 100644
--- a/graphics/gdk-pixbuf-gnome/Makefile
+++ b/graphics/gdk-pixbuf-gnome/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/06/16 19:53:09 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2001/06/18 20:49:01 jlam Exp $
 
 .include "../gdk-pixbuf/Makefile.common"
 
@@ -16,7 +16,8 @@ GDK_PIXBUF_REQD=	0.10.1
 # Fix config scripts by removing buildlink directory references.
 post-build:
 	@cd ${WRKSRC};							\
-	for file in gnomecanvaspixbufConf.sh; do			\
+	config_scripts="gnomecanvaspixbufConf.sh";			\
+	for file in $${config_scripts}; do				\
 		${MV} -f $${file} $${file}.fixme;			\
 		${SED}	-e "s|-I${BUILDLINK_DIR}/|-I${LOCALBASE}/|g"	\
 			-e "s|-L${BUILDLINK_DIR}/|-L${LOCALBASE}/|g"	\
diff --git a/graphics/gdk-pixbuf/Makefile b/graphics/gdk-pixbuf/Makefile
index 8538f282b09..b1b99d7b618 100644
--- a/graphics/gdk-pixbuf/Makefile
+++ b/graphics/gdk-pixbuf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/06/16 19:53:08 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2001/06/18 20:49:01 jlam Exp $
 #
 .include "Makefile.common"
 
@@ -18,7 +18,8 @@ post-configure:
 # Fix config scripts by removing buildlink directory references.
 post-build:
 	@cd ${WRKSRC};							\
-	for file in gdk_pixbufConf.sh gdk_pixbuf_xlibConf.sh; do	\
+	config_scripts="gdk_pixbufConf.sh gdk_pixbuf_xlibConf.sh";	\
+	for file in $${config_scripts}; do				\
 		${MV} -f $${file} $${file}.fixme;			\
 		${SED}	-e "s|-I${BUILDLINK_DIR}/|-I${LOCALBASE}/|g"	\
 			-e "s|-L${BUILDLINK_DIR}/|-L${LOCALBASE}/|g"	\
diff --git a/net/ORBit/Makefile b/net/ORBit/Makefile
index 5e646fc99ae..0a19257a6e4 100644
--- a/net/ORBit/Makefile
+++ b/net/ORBit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2001/06/16 20:02:10 jlam Exp $
+# $NetBSD: Makefile,v 1.56 2001/06/18 20:49:01 jlam Exp $
 #
 
 DISTNAME=		ORBit-0.${ORBIT_MAJOR}.${ORBIT_MINOR}
@@ -39,14 +39,17 @@ INFO_FILES=		libIDL.info
 pre-configure:
 	cd ${WRKSRC}/popt && ${LOCALBASE}/bin/autoreconf --include-deps --force
 
-# Fix libIDLConf.sh by removing buildlink directory references.
+# Fix config scripts by removing buildlink directory references.
 post-build:
-	@cd ${WRKSRC}/libIDL;						\
-	${MV} -f libIDLConf.sh libIDLConf.sh.fixme;			\
-	${SED}	-e "s|-I${BUILDLINK_DIR}/|-I${LOCALBASE}/|g"		\
-		-e "s|-L${BUILDLINK_DIR}/|-L${LOCALBASE}/|g"		\
-		libIDLConf.sh.fixme > libIDLConf.sh;			\
-	${RM} -f libIDLConf.sh.fixme;					\
-	${CHMOD} +x libIDLConf.sh
+	@cd ${WRKSRC};							\
+	config_scripts="libIDL/libIDLConf.sh";				\
+	for file in $${config_scripts}; do				\
+		${MV} -f $${file} $${file}.fixme;			\
+		${SED}	-e "s|-I${BUILDLINK_DIR}/|-I${LOCALBASE}/|g"	\
+			-e "s|-L${BUILDLINK_DIR}/|-L${LOCALBASE}/|g"	\
+			$${file}.fixme > $${file};			\
+		${RM} -f $${file}.fixme;				\
+		${CHMOD} +x $${file};					\
+	done
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index ab744fccdb8..d09eb1a4773 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2001/06/16 20:05:10 jlam Exp $
+# $NetBSD: Makefile,v 1.63 2001/06/18 20:49:01 jlam Exp $
 
 DISTNAME=		gnome-libs-1.2.13
 CATEGORIES=		x11 gnome
@@ -61,10 +61,11 @@ pre-build:
 	cd ${WRKSRC}/support && \
 		${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} gnomesupport.h
 
-# Fix gnomeConf.sh, gnome-config by removing buildlink directory references.
+# Fix config scripts by removing buildlink directory references.
 post-build:
 	@cd ${WRKSRC};							\
-	for file in gnomeConf.sh gnome-config; do			\
+	config_scripts="gnomeConf.sh gnome-config";			\
+	for file in $${config_scripts}; do				\
 		${MV} -f $${file} $${file}.fixme;			\
 		${SED}	-e "s|-I${BUILDLINK_DIR}/|-I${LOCALBASE}/|g"	\
 			-e "s|-L${BUILDLINK_DIR}/|-L${LOCALBASE}/|g"	\
diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile
index 0d82c6e4dfc..50450ab1208 100644
--- a/x11/gtk/Makefile
+++ b/x11/gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2001/06/16 19:50:58 jlam Exp $
+# $NetBSD: Makefile,v 1.60 2001/06/18 20:49:02 jlam Exp $
 
 DISTNAME=		gtk+-1.2.10
 CATEGORIES=		x11
@@ -38,15 +38,18 @@ PLIST_SUBST+=		LOCALBASE=${LOCALBASE}
 #
 X_LDFLAGS=		-Wl,-R${X11BASE}/lib -L${X11BASE}/lib
 
-# Fix gtk-config by removing buildlink directory references.
+# Fix config scripts by removing buildlink directory references.
 post-build:
 	@cd ${WRKSRC};							\
-	${MV} -f gtk-config gtk-config.fixme;				\
-	${SED}	-e "/^glib/s|-I${BUILDLINK_DIR}/|-I${LOCALBASE}/|g"	\
-		-e "/^glib/s|-L${BUILDLINK_DIR}/|-L${LOCALBASE}/|g"	\
-		gtk-config.fixme > gtk-config;				\
-	${RM} -f gtk-config.fixme;					\
-	${CHMOD} +x gtk-config
+	config_scripts="gtk-config";					\
+	for file in $${config_scripts}; do				\
+		${MV} -f $${file} $${file}.fixme;			\
+		${SED}	-e "s|-I${BUILDLINK_DIR}/|-I${LOCALBASE}/|g"	\
+			-e "s|-L${BUILDLINK_DIR}/|-L${LOCALBASE}/|g"	\
+			$${file}.fixme > $${file};			\
+		${RM} -f $${file}.fixme;				\
+		${CHMOD} +x $${file};					\
+	done
 
 post-install:
 	${TEST} ${PREFIX} = ${LOCALBASE} || \