bsd.buildlink.mk will automatically handle the REPLACE_BUILDLINK stuff, so

we can remove REPLACE_BUILDLINK settings containing *-config, *Conf.sh, and
*.pc.

18 files changed, 19 insertions, 49 deletions

diff --git a/audio/esound/Makefile b/audio/esound/Makefile
index 0446b5a97b3..b5007e80675 100644
--- a/audio/esound/Makefile
+++ b/audio/esound/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2001/09/13 18:11:35 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2001/10/03 22:36:37 jlam Exp $
 
 DISTNAME=		esound-0.2.23
 CATEGORIES=		audio
@@ -8,12 +8,10 @@ MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://www.tux.org/~ricdude/EsounD.html
 COMMENT=		the Enlightened sound daemon
 
+USE_BUILDLINK_ONLY=	YES
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
-USE_BUILDLINK_ONLY=	YES
-REPLACE_BUILDLINK=	esd-config
-
 .include "../../audio/libaudiofile/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/libmikmod/Makefile b/audio/libmikmod/Makefile
index 1775d7ea58a..c3d3abe2f13 100644
--- a/audio/libmikmod/Makefile
+++ b/audio/libmikmod/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2001/06/29 04:54:49 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2001/10/03 22:36:37 jlam Exp $
 
 DISTNAME=		libmikmod-3.1.9
 CATEGORIES=		audio
@@ -12,9 +12,7 @@ USE_GMAKE=		# defined
 USE_GTEXINFO=		# defined
 GNU_CONFIGURE=		# defined
 USE_LIBTOOL=		# defined
-
 USE_BUILDLINK_ONLY=	# defined
-REPLACE_BUILDLINK=	libmikmod-config
 
 CONFIGURE_ARGS+=	--disable-threads
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
diff --git a/audio/xmms/Makefile b/audio/xmms/Makefile
index cde4888961a..e631f48a28d 100644
--- a/audio/xmms/Makefile
+++ b/audio/xmms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2001/08/23 14:26:41 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2001/10/03 22:36:38 jlam Exp $
 # FreeBSD: ports/audio/xmms/Makefile,v 1.9 2000/02/11 01:46:12 cpiazza Exp
 
 DISTNAME=	xmms-1.2.5
@@ -19,7 +19,6 @@ GNU_CONFIGURE=		yes
 CPPFLAGS+=		-D_POSIX_THREAD_SYSCALL_SOFT=1
 CONFIGURE_ARGS+=	--without-gnome
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
-REPLACE_BUILDLINK+=	xmms-config
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/devel/SDL/Makefile b/devel/SDL/Makefile
index 2aa85c19563..922c1176844 100644
--- a/devel/SDL/Makefile
+++ b/devel/SDL/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2001/09/24 14:28:55 rh Exp $
+# $NetBSD: Makefile,v 1.23 2001/10/03 22:36:38 jlam Exp $
 #
 
 DISTNAME=	SDL-1.2.2
@@ -15,7 +15,6 @@ BUILD_DEPENDS+=		nasm>=0.98:../../devel/nasm
 BUILDLINK_DEPENDS.pth=	pth>=1.4.0
 
 USE_BUILDLINK_ONLY=	YES
-REPLACE_BUILDLINK=	sdl-config
 
 GNU_CONFIGURE=		YES
 USE_GMAKE=		YES
diff --git a/devel/libnet/Makefile b/devel/libnet/Makefile
index 40b0d59bb26..7f76426aff6 100644
--- a/devel/libnet/Makefile
+++ b/devel/libnet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/07/14 16:41:38 sakamoto Exp $
+# $NetBSD: Makefile,v 1.9 2001/10/03 22:36:38 jlam Exp $
 #
 
 DISTNAME=	libnet-1.0.1b
@@ -10,7 +10,6 @@ HOMEPAGE=	http://www.packetfactory.net/libnet/
 COMMENT=	C library for portable packet creation and injection
 
 USE_BUILDLINK_ONLY= # defined
-REPLACE_BUILDLINK=  libnet-config
 
 USE_LIBTOOL=	#defined
 GNU_CONFIGURE=	#defined
diff --git a/devel/smpeg/Makefile b/devel/smpeg/Makefile
index 0bc87532cb0..1f9773f5921 100644
--- a/devel/smpeg/Makefile
+++ b/devel/smpeg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/06/29 04:54:52 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2001/10/03 22:36:38 jlam Exp $
 #
 
 DISTNAME=	smpeg-0.4.3
@@ -17,7 +17,6 @@ USE_LIBTOOL=		yes
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
 USE_BUILDLINK_ONLY=	yes
-REPLACE_BUILDLINK=	smpeg-config
 
 CPPFLAGS+=		-Dunix=1
 
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 925ec67b1fe..35a4f575c71 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.77 2001/09/27 23:18:09 jlam Exp $
+# $NetBSD: Makefile,v 1.78 2001/10/03 22:36:39 jlam Exp $
 
 DISTNAME=		ImageMagick-5.3.9
 CATEGORIES=		graphics
@@ -16,9 +16,6 @@ DEPENDS+=		mpeg2codec-1.2:../../graphics/mpeg2codec
 NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL
 
 USE_BUILDLINK_ONLY=	YES
-REPLACE_BUILDLINK=	Magick++/bin/Magick++-config
-REPLACE_BUILDLINK+=	magick/Magick-config
-
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
diff --git a/graphics/freetype2/Makefile b/graphics/freetype2/Makefile
index d38a085de66..b77fc1acab8 100644
--- a/graphics/freetype2/Makefile
+++ b/graphics/freetype2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/06/29 04:54:54 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2001/10/03 22:36:39 jlam Exp $
 #
 
 DISTNAME=	freetype-2.0.3
@@ -16,7 +16,6 @@ HOMEPAGE=	http://www.freetype.org/
 COMMENT=	font rendering engine and library API
 
 USE_BUILDLINK_ONLY=	YES
-REPLACE_BUILDLINK=	freetype-config
 CHECK_FREETYPE2=	YES
 USE_GMAKE=		YES
 GNU_CONFIGURE=		YES
diff --git a/graphics/gdk-pixbuf-gnome/Makefile b/graphics/gdk-pixbuf-gnome/Makefile
index a3c26413ff0..884a46bc94f 100644
--- a/graphics/gdk-pixbuf-gnome/Makefile
+++ b/graphics/gdk-pixbuf-gnome/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/09/09 03:37:01 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2001/10/03 22:36:39 jlam Exp $
 
 .include "../gdk-pixbuf/Makefile.common"
 
@@ -9,7 +9,6 @@ CONFLICTS+=	gdk-pixbuf<0.10.1
 
 USE_BUILDLINK_ONLY=		# defined
 BUILDLINK_DEPENDS.gdk-pixbuf=	gdk-pixbuf>=0.10.1
-REPLACE_BUILDLINK=		gnomecanvaspixbufConf.sh
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/gdk-pixbuf/gnome-canvas-pixbuf.h \
diff --git a/graphics/gdk-pixbuf/Makefile b/graphics/gdk-pixbuf/Makefile
index 210cfa116ee..ebacc362efb 100644
--- a/graphics/gdk-pixbuf/Makefile
+++ b/graphics/gdk-pixbuf/Makefile
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.18 2001/09/09 03:37:01 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2001/10/03 22:36:39 jlam Exp $
 #
 
 PKGNAME=	${DISTNAME}
 COMMENT=	the GNOME image loading library
 
 USE_BUILDLINK_ONLY=	# defined
-REPLACE_BUILDLINK=	gdk_pixbufConf.sh
-REPLACE_BUILDLINK+=	gdk_pixbuf_xlibConf.sh
 
 .include "Makefile.common"
 
diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index efe43e321e7..e34c2993878 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2001/08/29 22:41:18 jlam Exp $
+# $NetBSD: Makefile,v 1.58 2001/10/03 22:36:40 jlam Exp $
 #
 
 DISTNAME=		imlib-1.9.11
@@ -20,7 +20,6 @@ PLIST_SUBST+=		LOCALBASE=${LOCALBASE}
 USE_GMAKE=		yes
 
 USE_BUILDLINK_ONLY=	yes
-REPLACE_BUILDLINK=	imlib-config
 
 CPPFLAGS+=		-DENABLE_NLS
 CONFIGURE_ENV+=		ac_cv_path_CONVERT_PROG="${LOCALBASE}/bin/convert"
diff --git a/net/ORBit/Makefile b/net/ORBit/Makefile
index b71a0444065..ae5d3f88a96 100644
--- a/net/ORBit/Makefile
+++ b/net/ORBit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2001/10/03 17:38:07 jlam Exp $
+# $NetBSD: Makefile,v 1.66 2001/10/03 22:36:40 jlam Exp $
 #
 
 DISTNAME=		ORBit-0.${ORBIT_MAJOR}.${ORBIT_MINOR}
@@ -21,9 +21,6 @@ LTCONFIG_OVERRIDE+=	${WRKSRC}/libIDL/ltconfig
 
 GNU_CONFIGURE=		YES
 USE_BUILDLINK_ONLY=	YES
-REPLACE_BUILDLINK=	orbit-config
-REPLACE_BUILDLINK+=	ORBit.pc
-REPLACE_BUILDLINK+=	libIDL/libIDLConf.sh
 
 # for DISTNAME, PKGNAME, and PLIST
 ORBIT_MAJOR=		5
diff --git a/print/pdflib/Makefile b/print/pdflib/Makefile
index 6fcc99b07e8..37f94e2433d 100644
--- a/print/pdflib/Makefile
+++ b/print/pdflib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2001/10/01 20:51:45 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2001/10/03 22:36:40 jlam Exp $
 
 .include "Makefile.common"
 
@@ -7,7 +7,6 @@ PDFLIB_PKG_VERS=	# empty
 COMMENT=		C library to produce PDF files
 
 USE_BUILDLINK_ONLY=	YES
-REPLACE_BUILDLINK+=	pdflib-config
 
 ALL_TARGET=		pdflib
 DOCDIR=			${PREFIX}/share/doc/pdflib
diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index f47aa009a13..60afe45ec09 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/09/26 23:22:17 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2001/10/03 22:36:40 jlam Exp $
 
 DISTNAME=	libxml2-2.4.5
 CATEGORIES=	textproc
@@ -9,8 +9,6 @@ HOMEPAGE=	http://xmlsoft.org/
 COMMENT=	Xml parser library for GNOME
 
 USE_BUILDLINK_ONLY=	yes
-REPLACE_BUILDLINK=	xml2-config xml2Conf.sh
-
 USE_GMAKE=		yes
 USE_LIBTOOL=		yes
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
diff --git a/www/curl/Makefile b/www/curl/Makefile
index ddb758ed619..f545462db3a 100644
--- a/www/curl/Makefile
+++ b/www/curl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/09/29 15:42:24 seb Exp $
+# $NetBSD: Makefile,v 1.8 2001/10/03 22:36:41 jlam Exp $
 
 DISTNAME=	curl-7.9
 CATEGORIES=	www
@@ -9,8 +9,6 @@ HOMEPAGE=	http://curl.haxx.se/
 COMMENT=	client that groks URLs
 
 USE_BUILDLINK_ONLY=	yes
-REPLACE_BUILDLINK=	curl-config
-
 GNU_CONFIGURE=		yes
 USE_GMAKE=		yes
 USE_LIBTOOL=		yes
diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index 186277de211..95be3088a9f 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.70 2001/09/30 21:14:34 rh Exp $
+# $NetBSD: Makefile,v 1.71 2001/10/03 22:36:41 jlam Exp $
 
 DISTNAME=		gnome-libs-1.4.1.2
 CATEGORIES=		x11 gnome
@@ -24,8 +24,6 @@ CONFIGURE_ENV+=		LOCALBASE=${LOCALBASE} \
 			PKGLOCALEDIR=${PKGLOCALEDIR}
 
 USE_BUILDLINK_ONLY=	YES
-REPLACE_BUILDLINK=	gnomeConf.sh
-REPLACE_BUILDLINK+=	gnome-config
 
 LOCALSTATEDIR=		/var/gnome
 PLIST_SUBST+=		LOCALBASE=${LOCALBASE} \
diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile
index 1796444c20f..feb3c7b167e 100644
--- a/x11/gtk/Makefile
+++ b/x11/gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2001/08/29 22:41:29 jlam Exp $
+# $NetBSD: Makefile,v 1.66 2001/10/03 22:36:41 jlam Exp $
 
 DISTNAME=		gtk+-1.2.10
 CATEGORIES=		x11
@@ -15,8 +15,6 @@ BUILD_DEPENDS+=		perl>=${PERL5_REQD}:../../lang/perl5
 BUILD_USES_MSGFMT=	yes
 
 USE_BUILDLINK_ONLY=	yes
-REPLACE_BUILDLINK=	gtk-config
-
 USE_LIBTOOL=		yes
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 USE_X11BASE=		yes
diff --git a/x11/wxGTK/Makefile b/x11/wxGTK/Makefile
index 6cc71743d1a..46fd7a644de 100644
--- a/x11/wxGTK/Makefile
+++ b/x11/wxGTK/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/06/29 08:53:17 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2001/10/03 22:36:41 jlam Exp $
 #
 
 DISTNAME=		wxGTK-2.2.7
@@ -10,8 +10,6 @@ HOMEPAGE=		http://www.freiburg.linux.de/~wxxt/
 COMMENT=		GTK-based implementation of the wxWindows GUI library
 
 USE_BUILDLINK_ONLY=	# defined
-REPLACE_BUILDLINK=	wxgtk-config
-
 USE_GMAKE=		# defined
 USE_LIBTOOL=		# defined
 GNU_CONFIGURE=		# defined