remove unneeded CONFIG_{GUESS,SUB}_OVERRIDE, as bsd.pkg.mk does this

automatically now.

30 files changed, 30 insertions, 95 deletions

diff --git a/audio/rioutil/Makefile b/audio/rioutil/Makefile
index 8b0e1cc34e9..183bd0e7fe4 100644
--- a/audio/rioutil/Makefile
+++ b/audio/rioutil/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/07/21 16:30:44 martti Exp $
+# $NetBSD: Makefile,v 1.10 2004/02/14 00:54:44 grant Exp $
 #
 
 DISTNAME=	rioutil-1.3.3
@@ -15,8 +15,6 @@ USE_LIBTOOL=		# defined
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 GNU_CONFIGURE=		# defined
 CONFIGURE_ARGS+=	--with-libusb
-CONFIG_GUESS_OVERRIDE=	${WRKSRC}/config.guess
-CONFIG_SUB_OVERRIDE=	${WRKSRC}/config.sub
 
 ONLY_FOR_PLATFORM=	Darwin-*-* Linux-*-* NetBSD-1.[6-9]*-*
 # depends on -r1.6 of sys/dev/usb/urio.c
diff --git a/databases/gdbm/Makefile b/databases/gdbm/Makefile
index eb64f248329..6187bf7d259 100644
--- a/databases/gdbm/Makefile
+++ b/databases/gdbm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2004/02/12 08:40:22 jlam Exp $
+# $NetBSD: Makefile,v 1.33 2004/02/14 00:54:44 grant Exp $
 #
 
 DISTNAME=	gdbm-1.8.3
@@ -14,7 +14,5 @@ GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 INFO_FILES=		gdbm.info
-CONFIG_GUESS_OVERRIDE=	${WRKSRC}/config.guess
-CONFIG_SUB_OVERRIDE=	${WRKSRC}/config.sub
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/GConf/Makefile b/devel/GConf/Makefile
index 1901682c293..daf2b70a980 100644
--- a/devel/GConf/Makefile
+++ b/devel/GConf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2004/02/10 03:23:51 sekiya Exp $
+# $NetBSD: Makefile,v 1.41 2004/02/14 00:54:44 grant Exp $
 #
 
 DISTNAME=		GConf-1.0.9
@@ -23,9 +23,6 @@ USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 PKGCONFIG_OVERRIDE=	${WRKSRC}/gconf.pc.in
 
-CONFIG_GUESS_OVERRIDE+=	${WRKSRC}/config.guess
-CONFIG_SUB_OVERRIDE+=	${WRKSRC}/config.sub
-
 CPPFLAGS+=		-I${BUILDLINK_PREFIX.db3}/include/db3
 PLIST_SUBST+=		LOCALBASE=${LOCALBASE}
 
diff --git a/devel/cscope/Makefile b/devel/cscope/Makefile
index b5a7ea6ca0f..5c0a6867711 100644
--- a/devel/cscope/Makefile
+++ b/devel/cscope/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2004/01/03 00:54:18 heinz Exp $
+# $NetBSD: Makefile,v 1.31 2004/02/14 00:54:44 grant Exp $
 #
 
 DISTNAME=	cscope-15.4
@@ -11,8 +11,6 @@ HOMEPAGE=	http://cscope.sourceforge.net/
 COMMENT=	Interactive C program browser
 
 GNU_CONFIGURE=		YES
-CONFIG_GUESS_OVERRIDE=	${WRKSRC}/config.guess
-CONFIG_SUB_OVERRIDE=	${WRKSRC}/config.sub
 USE_BUILDLINK2=		YES
 
 CONFIGURE_ARGS+=	--with-ncurses=${BUILDLINK_PREFIX.ncurses}
diff --git a/devel/gettext-lib/Makefile b/devel/gettext-lib/Makefile
index 77a5ed11a4a..8875e1a9f13 100644
--- a/devel/gettext-lib/Makefile
+++ b/devel/gettext-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2004/01/06 04:37:52 jlam Exp $
+# $NetBSD: Makefile,v 1.29 2004/02/14 00:54:45 grant Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1998/08/09 15:13:33 kuriyama Exp
 #
 
@@ -24,8 +24,6 @@ LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 GNU_CONFIGURE=		# defined
 CONFIGURE_ARGS+=	--with-included-gettext
 
-CONFIG_GUESS_OVERRIDE=	${WRKSRC}/config.guess
-CONFIG_SUB_OVERRIDE=	${WRKSRC}/config.sub
 CONFIGURE_ENV+=		PKGLOCALEDIR="${PKGLOCALEDIR}"
 MAKE_ENV+=		PKGLOCALEDIR="${PKGLOCALEDIR}"
 
diff --git a/devel/gettext-m4/Makefile b/devel/gettext-m4/Makefile
index c424a1c2945..2217ce3ac83 100644
--- a/devel/gettext-m4/Makefile
+++ b/devel/gettext-m4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/07/21 16:43:22 martti Exp $
+# $NetBSD: Makefile,v 1.9 2004/02/14 00:54:45 grant Exp $
 
 DISTNAME=		gettext-0.11.5
 PKGNAME=		gettext-m4-0.11.5
@@ -13,8 +13,6 @@ COMMENT=		Autoconf/automake m4 files for GNU NLS library
 CONFLICTS=		gettext<=0.10.35nb1
 GNU_CONFIGURE=		# defined
 CONFIGURE_ARGS+=	--with-included-gettext
-CONFIG_GUESS_OVERRIDE=	${WRKSRC}/config.guess
-CONFIG_SUB_OVERRIDE=	${WRKSRC}/config.sub
 CONFIGURE_ENV+=		PKGLOCALEDIR="${PKGLOCALEDIR}"
 MAKE_ENV+=		PKGLOCALEDIR="${PKGLOCALEDIR}"
 
diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile
index 75d150259ae..4111802b21f 100644
--- a/devel/gettext/Makefile
+++ b/devel/gettext/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2003/12/05 18:15:49 erh Exp $
+# $NetBSD: Makefile,v 1.54 2004/02/14 00:54:45 grant Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1998/08/09 15:13:33 kuriyama Exp
 #
 
@@ -19,8 +19,6 @@ USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-CONFIG_GUESS_OVERRIDE=	${WRKSRC}/config.guess
-CONFIG_SUB_OVERRIDE=	${WRKSRC}/config.sub
 USE_GNU_GETTEXT=	yes
 CONFIGURE_ARGS+=	--without-included-gettext
 
diff --git a/devel/libglade/Makefile b/devel/libglade/Makefile
index 3fd486c4edc..a87d6258d7f 100644
--- a/devel/libglade/Makefile
+++ b/devel/libglade/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2004/02/11 02:08:26 sekiya Exp $
+# $NetBSD: Makefile,v 1.51 2004/02/14 00:54:45 grant Exp $
 #
 
 DISTNAME=		libglade-0.17
@@ -16,8 +16,6 @@ USE_BUILDLINK2=		YES
 USE_X11BASE=		YES
 
 GNU_CONFIGURE=		YES
-CONFIG_GUESS_OVERRIDE+=	${WRKSRC}/config.guess
-CONFIG_SUB_OVERRIDE+=	${WRKSRC}/config.sub
 
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
diff --git a/devel/libtecla/Makefile b/devel/libtecla/Makefile
index 39f7ca3c72b..0950dfa0ace 100644
--- a/devel/libtecla/Makefile
+++ b/devel/libtecla/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/01/23 23:59:54 kristerw Exp $
+# $NetBSD: Makefile,v 1.5 2004/02/14 00:54:45 grant Exp $
 #
 
 DISTNAME=	libtecla-1.5.0
@@ -13,8 +13,6 @@ WRKSRC=		${WRKDIR}/${PKGBASE}
 USE_BUILDLINK2=	YES
 USE_GNU_TOOLS+=	make
 GNU_CONFIGURE=	YES
-CONFIG_GUESS_OVERRIDE=	${WRKSRC}/config.guess
-CONFIG_SUB_OVERRIDE=	${WRKSRC}/config.sub
 ALL_TARGET=	default
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/oaf/Makefile b/devel/oaf/Makefile
index 75e958bc4a4..39c5db0d12c 100644
--- a/devel/oaf/Makefile
+++ b/devel/oaf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2004/02/10 02:33:26 sekiya Exp $
+# $NetBSD: Makefile,v 1.35 2004/02/14 00:54:45 grant Exp $
 #
 
 DISTNAME=		oaf-0.6.10
@@ -20,9 +20,6 @@ USE_GNU_TOOLS+=		lex yacc
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
-CONFIG_GUESS_OVERRIDE+=	${WRKSRC}/config.guess
-CONFIG_SUB_OVERRIDE+=	${WRKSRC}/config.sub
-
 CONFIGURE_ARGS+=	--enable-gtk-doc=no
 
 .include "../../devel/popt/buildlink2.mk"
diff --git a/devel/pth/Makefile b/devel/pth/Makefile
index 6f54823900f..f530f408803 100644
--- a/devel/pth/Makefile
+++ b/devel/pth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2004/01/05 20:48:45 jlam Exp $
+# $NetBSD: Makefile,v 1.61 2004/02/14 00:54:45 grant Exp $
 #
 
 DISTNAME=		pth-2.0.0
@@ -20,8 +20,6 @@ GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--enable-pthread
 CONFIGURE_ARGS+=	--with-fdsetsize=1024
 #CONFIGURE_ARGS+=	--enable-debug
-CONFIG_GUESS_OVERRIDE=	${WRKSRC}/config.guess
-CONFIG_SUB_OVERRIDE=	${WRKSRC}/config.sub
 
 TEST_TARGET=		test
 
diff --git a/emulators/bochs/Makefile b/emulators/bochs/Makefile
index 36c784c3fce..d56220eea78 100644
--- a/emulators/bochs/Makefile
+++ b/emulators/bochs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2004/02/12 01:57:52 hubertf Exp $
+# $NetBSD: Makefile,v 1.34 2004/02/14 00:54:45 grant Exp $
 
 DISTNAME=		bochs-2.1.1
 CATEGORIES=		emulators
@@ -9,8 +9,6 @@ HOMEPAGE=		http://bochs.sourceforge.net/
 COMMENT=		i386 machine emulator capable of running DOS/Windows
 
 GNU_CONFIGURE=		yes
-CONFIG_GUESS_OVERRIDE=	${WRKSRC}/config.guess
-CONFIG_SUB_OVERRIDE=	${WRKSRC}/config.sub
 USE_GNU_TOOLS+=		make
 USE_GCC_SHLIB=		yes
 # These options are not enabled by default because they can adversely impact
diff --git a/graphics/gle/Makefile b/graphics/gle/Makefile
index 423308e2713..a85855056d1 100644
--- a/graphics/gle/Makefile
+++ b/graphics/gle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2004/02/11 02:19:28 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2004/02/14 00:54:45 grant Exp $
 #
 
 DISTNAME=	gle-3.1.0
@@ -16,9 +16,6 @@ USE_BUILDLINK3=		YES
 USE_X11=		YES
 GNU_CONFIGURE=		YES
 
-CONFIG_GUESS_OVERRIDE+=	${WRKSRC}/config.guess
-CONFIG_SUB_OVERRIDE+=	${WRKSRC}/config.sub
-
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
diff --git a/graphics/hermes/Makefile b/graphics/hermes/Makefile
index b82f5d19333..ee8ab9032b3 100644
--- a/graphics/hermes/Makefile
+++ b/graphics/hermes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2004/02/11 08:55:58 xtraeme Exp $
+# $NetBSD: Makefile,v 1.19 2004/02/14 00:54:45 grant Exp $
 
 DISTNAME=		Hermes-1.3.3
 CATEGORIES=		graphics
@@ -15,8 +15,6 @@ USE_LIBTOOL=		yes
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 GNU_CONFIGURE=		yes
-CONFIG_GUESS_OVERRIDE=	${WRKSRC}/config.guess
-CONFIG_SUB_OVERRIDE=	${WRKSRC}/config.sub
 USE_GNU_TOOLS+=		make
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/jpeg/Makefile b/graphics/jpeg/Makefile
index 37deeb9024a..cebeb28c7f1 100644
--- a/graphics/jpeg/Makefile
+++ b/graphics/jpeg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2004/01/20 12:18:16 agc Exp $
+# $NetBSD: Makefile,v 1.28 2004/02/14 00:54:45 grant Exp $
 #
 
 DISTNAME=		jpegsrc.v6b
@@ -20,8 +20,6 @@ USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-CONFIG_GUESS_OVERRIDE=	${WRKSRC}/config.guess
-CONFIG_SUB_OVERRIDE=	${WRKSRC}/config.sub
 
 CONFIGURE_ARGS+=	--enable-shared
 CONFIGURE_ARGS+=	--enable-static
diff --git a/lang/tcl-otcl/Makefile b/lang/tcl-otcl/Makefile
index e5c531e1f2e..c10d896574c 100644
--- a/lang/tcl-otcl/Makefile
+++ b/lang/tcl-otcl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/01/31 23:04:42 xtraeme Exp $
+# $NetBSD: Makefile,v 1.7 2004/02/14 00:54:45 grant Exp $
 
 DISTNAME=	otcl-1.0a8
 PKGNAME=	tcl-${DISTNAME:S/a/rc/}
@@ -18,9 +18,6 @@ USE_X11=	yes
 CONFIGURE_ARGS+=	--with-tcl=${BUILDLINK_PREFIX.tcl}
 CONFIGURE_ARGS+=	--with-tk=${BUILDLINK_PREFIX.tk}
 
-CONFIG_GUESS_OVERRIDE=	${WRKSRC}/config.guess
-CONFIG_SUB_OVERRIDE=	${WRKSRC}/config.sub
-
 CPPFLAGS+=	-I${BUILDLINK_PREFIX.tcl}/include/tcl/generic
 
 HTMLDOCS=	CHANGES.html autoload.html capi.html class.html object.html \
diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index 597b722aa2a..145e7e76586 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.137 2004/01/06 07:06:30 jlam Exp $
+# $NetBSD: Makefile,v 1.138 2004/02/14 00:54:45 grant Exp $
 
 DISTNAME=	fetchmail-6.2.5
 PKGREVISION=	1
@@ -19,8 +19,6 @@ USE_PKGINSTALL=		YES
 USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--without-hesiod
-CONFIG_GUESS_OVERRIDE=	${WRKSRC}/config.guess
-CONFIG_SUB_OVERRIDE=	${WRKSRC}/config.sub
 
 BUILD_DEFS+=		USE_INET6
 LDFLAGS+=		${CFLAGS}
diff --git a/math/guppi/Makefile b/math/guppi/Makefile
index bf9545ebff6..698f89938d2 100644
--- a/math/guppi/Makefile
+++ b/math/guppi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2004/02/12 14:20:27 sekiya Exp $
+# $NetBSD: Makefile,v 1.35 2004/02/14 00:54:45 grant Exp $
 
 DISTNAME=	Guppi-0.40.3
 PKGNAME=	${DISTNAME:S/G/g/}
@@ -31,9 +31,6 @@ USE_X11BASE=		YES
 USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=		YES
 
-CONFIG_GUESS_OVERRIDE+=	${WRKSRC}/config.guess
-CONFIG_SUB_OVERRIDE+=	${WRKSRC}/config.sub
-
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 PLIST_SUBST+=		LOCALBASE=${LOCALBASE}
diff --git a/net/libnids/Makefile b/net/libnids/Makefile
index 5ef64f83d44..b6f50ff9690 100644
--- a/net/libnids/Makefile
+++ b/net/libnids/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/12/21 17:44:36 kristerw Exp $
+# $NetBSD: Makefile,v 1.12 2004/02/14 00:54:45 grant Exp $
 # $FreeBSD: ports/net/libnids/Makefile,v 1.5 2000/04/24 07:42:58 kris Exp $
 #
 
@@ -13,9 +13,6 @@ COMMENT=	Network monitoring library with TCP/IP reassembly
 USE_BUILDLINK2=	yes
 GNU_CONFIGURE=	yes
 
-CONFIG_GUESS_OVERRIDE=		${WRKSRC}/config.guess
-CONFIG_SUB_OVERRIDE=		${WRKSRC}/config.sub
-
 BUILDLINK_DEPMETHOD.libnet=	build
 BUILDLINK_DEPMETHOD.libpcap=	build
 
diff --git a/net/nbtscan/Makefile b/net/nbtscan/Makefile
index abef7e800fe..230eb2750f1 100644
--- a/net/nbtscan/Makefile
+++ b/net/nbtscan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/07/17 22:51:25 grant Exp $
+# $NetBSD: Makefile,v 1.7 2004/02/14 00:54:45 grant Exp $
 #
 
 DISTNAME=	nbtscan-1.5
@@ -10,7 +10,6 @@ HOMEPAGE=	http://www.inetcat.org/software/nbtscan.html
 COMMENT=	NetBIOS name network scanner
 
 GNU_CONFIGURE=	yes
-CONFIG_SUB_OVERRIDE=	${WRKSRC}/config.sub
 
 ALL_TARGET=	nbtscan
 
diff --git a/net/quagga/Makefile b/net/quagga/Makefile
index 0a8d6b919ff..21e737dc35f 100644
--- a/net/quagga/Makefile
+++ b/net/quagga/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/01/24 14:50:06 grant Exp $
+# $NetBSD: Makefile,v 1.11 2004/02/14 00:54:45 grant Exp $
 # Based on KAME Id: Makefile,v 1.1.2.1.2.1.10.2 1999/01/05 11:03:50 itojun Exp
 #
 
@@ -19,8 +19,6 @@ GNU_CONFIGURE=		# defined
 PKG_SYSCONFSUBDIR?=	zebra
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--localstatedir=/var/run/zebra
-CONFIG_GUESS_OVERRIDE=	${WRKSRC}/config.guess
-CONFIG_SUB_OVERRIDE=	${WRKSRC}/config.sub
 # you might need debugging, it's a developer release !
 #CFLAGS+=	-g
 
diff --git a/net/sniffit/Makefile b/net/sniffit/Makefile
index a14046a6bc8..1c49a68a983 100644
--- a/net/sniffit/Makefile
+++ b/net/sniffit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2003/09/28 09:13:58 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2004/02/14 00:54:45 grant Exp $
 #
 
 DISTNAME=		sniffit.0.3.5
@@ -14,7 +14,6 @@ COMMENT=		Packet sniffer program
 NOT_FOR_PLATFORM=	*-*-alpha	# severe LP64 loss
 
 GNU_CONFIGURE=		YES
-CONFIG_SUB_OVERRIDE=	${WRKSRC}/config.sub
 USE_BUILDLINK2=		YES
 ALL_TARGET=
 
diff --git a/net/tcptrace/Makefile b/net/tcptrace/Makefile
index a65c5aa25fc..9cefb13bcb9 100644
--- a/net/tcptrace/Makefile
+++ b/net/tcptrace/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2003/10/03 16:15:13 kristerw Exp $
+# $NetBSD: Makefile,v 1.20 2004/02/14 00:54:45 grant Exp $
 # FreeBSD Id: Makefile,v 1.3 1997/07/19 19:43:36 fenner Exp
 #
 
@@ -11,8 +11,6 @@ HOMEPAGE=	http://www.tcptrace.org/
 COMMENT=	TCP dump file analysis tool
 
 GNU_CONFIGURE=	yes
-CONFIG_GUESS_OVERRIDE=	${WRKSRC}/config.guess
-CONFIG_SUB_OVERRIDE=	${WRKSRC}/config.sub
 USE_BUILDLINK2=	yes
 
 ALL_TARGET=	tcptrace
diff --git a/net/wu-ftpd/Makefile b/net/wu-ftpd/Makefile
index 563d3becb1d..33b69657fca 100644
--- a/net/wu-ftpd/Makefile
+++ b/net/wu-ftpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2003/09/23 10:42:09 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2004/02/14 00:54:45 grant Exp $
 # FreeBSD Id: Makefile,v 1.16 1997/12/24 17:45:28 ache Exp
 #
 
@@ -41,9 +41,6 @@ CONFLICTS+=	lukemftpd-[0-9]*
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS+=--enable-quota --enable-noop --enable-skey
 
-CONFIG_GUESS_OVERRIDE=	${WRKSRC}/config.guess
-CONFIG_SUB_OVERRIDE=	${WRKSRC}/config.sub
-
 DIST_SUBDIR=		wu-ftpd
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/security/libtasn1/Makefile b/security/libtasn1/Makefile
index f42188da84f..d8a3b8720b9 100644
--- a/security/libtasn1/Makefile
+++ b/security/libtasn1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/02/13 13:09:43 sekiya Exp $
+# $NetBSD: Makefile,v 1.7 2004/02/14 00:54:45 grant Exp $
 
 DISTNAME=	libtasn1-0.2.6
 CATEGORIES=	security devel
@@ -12,9 +12,6 @@ USE_BUILDLINK3=	YES
 USE_LIBTOOL=	YES
 GNU_CONFIGURE=	YES
 
-CONFIG_GUESS_OVERRIDE+=	${WRKSRC}/config.guess
-CONFIG_SUB_OVERRIDE+=	${WRKSRC}/config.sub
-
 LIBTOOL_OVERRIDE=       ${WRKSRC}/libtool
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/shells/scsh/Makefile b/shells/scsh/Makefile
index c4491ef733f..b32c352e884 100644
--- a/shells/scsh/Makefile
+++ b/shells/scsh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2003/07/25 21:10:24 kristerw Exp $
+# $NetBSD: Makefile,v 1.26 2004/02/14 00:54:45 grant Exp $
 # FreeBSD Id: Makefile,v 1.4 1997/07/15 15:00:30 cracauer Exp
 #
 
@@ -13,8 +13,6 @@ COMMENT=		Unix shell embedded into Scheme, with access to all Posix calls
 NOT_FOR_PLATFORM=	*-*-alpha	# Needs scheme
 
 GNU_CONFIGURE=		yes
-CONFIG_GUESS_OVERRIDE=	${WRKSRC}/config.guess
-CONFIG_SUB_OVERRIDE=	${WRKSRC}/config.sub
 
 ALL_TARGET=		enough
 TEST_TARGET=		check
diff --git a/textproc/diction/Makefile b/textproc/diction/Makefile
index c23a144d513..1b6daaf8e2e 100644
--- a/textproc/diction/Makefile
+++ b/textproc/diction/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/03/16 14:02:23 cjep Exp $
+# $NetBSD: Makefile,v 1.4 2004/02/14 00:54:45 grant Exp $
 
 DISTNAME=	diction-1.02
 CATEGORIES=	textproc
@@ -9,7 +9,5 @@ HOMEPAGE=	http://www.gnu.org/software/diction/diction.html
 COMMENT=	GNU version of diction and style
 
 GNU_CONFIGURE=	YES
-CONFIG_GUESS_OVERRIDE=	${WRKSRC}/config.guess
-CONFIG_SUB_OVERRIDE=	${WRKSRC}/config.sub
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/devtodo/Makefile b/time/devtodo/Makefile
index 75df12db20c..cf7baa3ec40 100644
--- a/time/devtodo/Makefile
+++ b/time/devtodo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2003/12/28 16:21:35 zuntum Exp $
+# $NetBSD: Makefile,v 1.17 2004/02/14 00:54:46 grant Exp $
 #
 
 DISTNAME=	devtodo-0.1.17
@@ -14,8 +14,6 @@ LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
 USE_BUILDLINK2=		# defined
 GNU_CONFIGURE=		# defined
-CONFIG_GUESS_OVERRIDE=	${WRKSRC}/config.guess
-CONFIG_SUB_OVERRIDE=	${WRKSRC}/config.sub
 
 # We don't need curses, just termcap.
 CONFIGURE_ENV+=		ac_cv_lib_curses_tputs=no
diff --git a/wm/golem/Makefile b/wm/golem/Makefile
index 093cd8a5cc2..5bcb390b717 100644
--- a/wm/golem/Makefile
+++ b/wm/golem/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/01/24 15:18:32 grant Exp $
+# $NetBSD: Makefile,v 1.7 2004/02/14 00:54:46 grant Exp $
 #
 
 DISTNAME=	golem-0.0.5
@@ -15,8 +15,6 @@ USE_PKGINSTALL=	YES
 USE_GNU_TOOLS+=	make
 USE_X11=	YES
 GNU_CONFIGURE=	YES
-CONFIG_GUESS_OVERRIDE=	${WRKSRC}/config.guess
-CONFIG_SUB_OVERRIDE=	${WRKSRC}/config.sub
 
 CONFIGURE_ARGS=	--enable-i18n
 
diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile
index bc55b68f48d..ed6ab6ecb52 100644
--- a/x11/gtk/Makefile
+++ b/x11/gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.97 2004/01/24 15:30:33 grant Exp $
+# $NetBSD: Makefile,v 1.98 2004/02/14 00:54:46 grant Exp $
 
 DISTNAME=		gtk+-1.2.10
 PKGREVISION=		6
@@ -23,7 +23,6 @@ USE_GNU_TOOLS+=		make
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-CONFIG_SUB_OVERRIDE=	${WRKSRC}/config.sub
 PKGCONFIG_OVERRIDE=	${WRKSRC}/gdk.pc.in
 PKGCONFIG_OVERRIDE+=	${WRKSRC}/gtk+.pc.in