Remove dependency on ${BUILDLINK_TARGETS} in pre-configure and pre-build

targets as the buildlink.mk files now add the dependency automatically.
Remove any NO_CONFIGURE definitions as they seem to be useless.

35 files changed, 39 insertions, 108 deletions

diff --git a/audio/id3ed/Makefile b/audio/id3ed/Makefile
index 6fa47b775af..4124ba15676 100644
--- a/audio/id3ed/Makefile
+++ b/audio/id3ed/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/05/24 08:53:54 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2001/06/10 00:08:41 jlam Exp $
 #
 
 DISTNAME=	id3ed-1.10.2
@@ -20,8 +20,6 @@ CONFIGURE_ENV+=	LIBS="${LIBS}"
 CFLAGS+=	-I${BUILDLINK_INCDIR}
 LIBS+=		-L${BUILDLINK_LIBDIR} ${LDFLAGS}
 
-pre-configure: ${BUILDLINK_TARGETS}
-
 post-extract:
 	${TOUCH} ${WRKSRC}/install.sh
 
diff --git a/cad/felt/Makefile b/cad/felt/Makefile
index be8e0fd9715..0298140a240 100644
--- a/cad/felt/Makefile
+++ b/cad/felt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/05/24 08:53:54 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2001/06/10 00:08:42 jlam Exp $
 
 DISTNAME=		felt-3.05.src
 PKGNAME=		felt-3.05
@@ -12,7 +12,6 @@ COMMENT=		Free system for introductory level finite element analysis
 
 EXTRACT_ONLY=		felt-3.05.src.tar.gz
 WRKSRC=			${WRKDIR}/FElt-3.05
-NO_CONFIGURE=		# defined
 
 USE_X11BASE=		# defined
 USE_XAW=		# defined
@@ -32,8 +31,6 @@ LDFLAGS+=		-L${BUILDLINK_LIBDIR}
 post-extract:
 	@${GZCAT} ${DISTDIR}/felt-3.05.ps.gz > ${WRKSRC}/felt.ps
 
-pre-build: ${BUILDLINK_TARGETS}
-
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/felt
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/felt
diff --git a/comms/plptools/Makefile b/comms/plptools/Makefile
index b2ef1c055a3..23e0a0a1198 100644
--- a/comms/plptools/Makefile
+++ b/comms/plptools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/05/24 08:53:54 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2001/06/10 00:08:42 jlam Exp $
 #
 
 DISTNAME=	plptools-0.6
@@ -25,6 +25,4 @@ CONFIGURE_ENV+=		LIBS="${LIBS}"
 CPPFLAGS+=		-I${BUILDLINK_INCDIR}
 LIBS+=			-ltermcap
 
-pre-configure: ${BUILDLINK_TARGETS}
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/postgresql-client/Makefile b/databases/postgresql-client/Makefile
index 3fe2de67216..2889e342105 100644
--- a/databases/postgresql-client/Makefile
+++ b/databases/postgresql-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/05/24 08:53:55 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2001/06/10 00:08:42 jlam Exp $
 
 .include "../../databases/postgresql/Makefile.common"
 .include "../../databases/postgresql/Makefile.ssl"
@@ -16,8 +16,6 @@ CONFIGURE_ARGS+=	--enable-readline
 
 DIRS_TO_BUILD=		src/bin
 
-pre-configure: ${BUILDLINK_TARGETS}
-
 pre-build:
 	cd ${WRKSRC}/src/bin/psql &&					\
 		${RM} -f pqsignal.h &&					\
diff --git a/databases/postgresql-server/Makefile b/databases/postgresql-server/Makefile
index 919fc33779c..37d140edb74 100644
--- a/databases/postgresql-server/Makefile
+++ b/databases/postgresql-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/05/24 08:53:55 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2001/06/10 00:08:42 jlam Exp $
 
 .include "../../databases/postgresql/Makefile.common"
 .include "../../databases/postgresql/Makefile.ssl"
@@ -42,8 +42,6 @@ ADDGROUP=		groupadd
 DEINSTALL_FILE=		${WRKDIR}/DEINSTALL
 INSTALL_FILE=		${WRKDIR}/INSTALL
 
-pre-configure: ${BUILDLINK_TARGETS}
-
 do-build:
 .for DIR in ${DIRS_TO_BUILD}
 	cd ${WRKSRC}/${DIR} && ${SETENV} ${MAKE_ENV}			\
diff --git a/databases/sqsh/Makefile b/databases/sqsh/Makefile
index 8276baf09a8..882b4ab7572 100644
--- a/databases/sqsh/Makefile
+++ b/databases/sqsh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/05/24 08:53:55 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2001/06/10 00:08:43 jlam Exp $
 
 DISTNAME=	sqsh-1.7-src
 PKGNAME=	sqsh-1.7
@@ -28,6 +28,4 @@ LDFLAGS+=		-L${BUILDLINK_LIBDIR}
 CONFIGURE_ENV+=		INCDIRS="${BUILDLINK_INCDIR}"
 CONFIGURE_ENV+=		LIBDIRS="${BUILDLINK_LIBDIR}"
 
-pre-configure: ${BUILDLINK_TARGETS}
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/cdecl/Makefile b/devel/cdecl/Makefile
index 4af91257d34..88e52a1ea6b 100644
--- a/devel/cdecl/Makefile
+++ b/devel/cdecl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/05/24 08:53:55 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2001/06/10 00:08:43 jlam Exp $
 #
 
 DISTNAME=	cdecl-2.5
@@ -21,8 +21,6 @@ LDFLAGS+=	-L${BUILDLINK_LIBDIR}
 
 EGDIR=		${PREFIX}/share/examples/cdecl
 
-pre-configure: ${BUILDLINK_TARGETS}
-
 post-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/testset* ${EGDIR}
diff --git a/devel/cmdline/Makefile b/devel/cmdline/Makefile
index 80d1bc511e8..f417e4a8261 100644
--- a/devel/cmdline/Makefile
+++ b/devel/cmdline/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/05/24 08:53:55 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2001/06/10 00:08:43 jlam Exp $
 
 DISTNAME=	CmdLine
 PKGNAME=	cmdline-${PKG_VERS}
@@ -14,7 +14,6 @@ COMMENT=	C++ library for parsing command arguments
 DIST_SUBDIR=	cmdline-${DIST_VERS}
 
 USE_LIBTOOL=	# defined
-NO_CONFIGURE=	# defined
 
 .include "../../devel/readline/buildlink.mk"
 
@@ -25,6 +24,4 @@ MAKE_ENV+=	OPT="${CXXFLAGS}"
 MAKE_ENV+=	MOREUSRDEFS="${MOREUSRDEFS}"
 MAKE_ENV+=	MOREUSRLIBS="${MOREUSRLIBS}"
 
-pre-build: ${BUILDLINK_TARGETS}
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/rpc2/Makefile b/devel/rpc2/Makefile
index 4fb6e4f9dfa..11725e6bb7e 100644
--- a/devel/rpc2/Makefile
+++ b/devel/rpc2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/05/31 22:52:17 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2001/06/10 00:08:43 jlam Exp $
 #
 
 DISTNAME=	rpc2-1.10
@@ -27,6 +27,4 @@ CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}"
 CPPFLAGS+=	-I${BUILDLINK_INCDIR}
 LDFLAGS+=	-L${BUILDLINK_LIBDIR}
 
-pre-configure: ${BUILDLINK_TARGETS}
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/rvm/Makefile b/devel/rvm/Makefile
index ba783e58d3a..2064856ef38 100644
--- a/devel/rvm/Makefile
+++ b/devel/rvm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/05/31 22:53:48 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2001/06/10 00:08:43 jlam Exp $
 #
 
 DISTNAME=	rvm-1.3
@@ -23,6 +23,4 @@ LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
 CONFIGURE_ARGS+=	--with-lwp-includes=${BUILDLINK_INCDIR}
 LDFLAGS+=		-L${BUILDLINK_LIBDIR}
 
-pre-configure: ${BUILDLINK_TARGETS}
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index f4feaa59773..124d358e2cf 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2001/05/26 08:13:13 jlam Exp $
+# $NetBSD: Makefile,v 1.28 2001/06/10 00:08:44 jlam Exp $
 #
 # According to AbiSource's explanation of their trademark rights,
 # compilations/distributions of AbiWord not provided by AbiSource must
@@ -58,8 +58,6 @@ WRKSRC=		${WRKDIR}/abi
 post-extract:
 	${RM} -rf ${WRKSRC}/user/wp/help/images/CVS
 
-pre-configure: ${BUILDLINK_TARGETS}
-
 post-install:
 	${CHMOD} -R a+r ${PREFIX}/share/AbiSuite
 	${RM} -f ${PREFIX}/share/AbiSuite/dictionary/american.hash
diff --git a/games/freeciv-server/Makefile b/games/freeciv-server/Makefile
index 6a47cb8350b..643d8feadae 100644
--- a/games/freeciv-server/Makefile
+++ b/games/freeciv-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/05/24 08:53:56 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2001/06/10 00:08:44 jlam Exp $
 
 PKGNAME=		${DISTNAME:S/-/-server-/}
 
@@ -18,8 +18,6 @@ CPPFLAGS+=		-I${BUILDLINK_INCDIR}
 LDFLAGS+=		-L${BUILDLINK_LIBDIR}
 LIBS+=			-ltermcap
 
-pre-configure: ${BUILDLINK_TARGETS}
-
 do-install:
 	cd ${WRKSRC}/server; ${SETENV} ${MAKE_ENV} \
 		${MAKE_PROGRAM} ${MAKE_FLAGS} ${INSTALL_TARGET}
diff --git a/graphics/freetype-lib/Makefile.common b/graphics/freetype-lib/Makefile.common
index a9696929d90..994478924a3 100644
--- a/graphics/freetype-lib/Makefile.common
+++ b/graphics/freetype-lib/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.12 2001/06/07 16:07:12 jlam Exp $
+# $NetBSD: Makefile.common,v 1.13 2001/06/10 00:08:44 jlam Exp $
 
 DISTNAME=		freetype-${FT_VERS}
 FT_VERS=		1.3.1
@@ -32,6 +32,4 @@ CPPFLAGS+=		-I${BUILDLINK_INCDIR}
 CFLAGS+=		-I${BUILDLINK_INCDIR}
 LDFLAGS+=		-L${BUILDLINK_LIBDIR}
 
-pre-configure: ${BUILDLINK_TARGETS}
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/png/Makefile b/graphics/png/Makefile
index f471066c2d7..695575cd545 100644
--- a/graphics/png/Makefile
+++ b/graphics/png/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2001/05/28 02:41:54 jlam Exp $
+# $NetBSD: Makefile,v 1.34 2001/06/10 00:08:44 jlam Exp $
 
 # On update, don't forget to increase shared library major/minor's in
 # accordance with changes (patch-aa).
@@ -24,8 +24,6 @@ MAKE_ENV+=	REALCC="${CC}"
 CFLAGS+=	-I${BUILDLINK_INCDIR}
 LDFLAGS+=	-L${BUILDLINK_LIBDIR}
 
-pre-configure: ${BUILDLINK_TARGETS}
-
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/libpng.3 ${PREFIX}/man/man3
 	${INSTALL_MAN} ${WRKSRC}/libpngpf.3 ${PREFIX}/man/man3
diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile
index f54e759e601..6ebb97fde3c 100644
--- a/graphics/tiff/Makefile
+++ b/graphics/tiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2001/05/28 02:50:24 jlam Exp $
+# $NetBSD: Makefile,v 1.32 2001/06/10 00:08:45 jlam Exp $
 
 DISTNAME=	tiff-v3.5.5
 PKGNAME=	tiff-3.5.5
@@ -58,6 +58,4 @@ pre-patch:
 	${SED}	-e "s,\(\$${CC} -o\),\$${LIBTOOL} \1,g" \
 		${WRKSRC}/tools/Makefile.in.in  > ${WRKSRC}/tools/Makefile.in
 
-pre-configure: ${BUILDLINK_TARGETS}
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/japanese/vflib-lib/Makefile.common b/japanese/vflib-lib/Makefile.common
index fea9e4da65a..3dbab4af40a 100644
--- a/japanese/vflib-lib/Makefile.common
+++ b/japanese/vflib-lib/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.9 2001/05/28 03:24:29 jlam Exp $
+# $NetBSD: Makefile.common,v 1.10 2001/06/10 00:08:45 jlam Exp $
 # FreeBSD Id: Makefile,v 1.20 1999/05/03 01:58:33 steve Exp $
 
 DISTNAME=		VFlib2-${VFLIB_VERSION}
@@ -38,6 +38,4 @@ PATCHDIR=		${.CURDIR}/../../japanese/vflib-lib/patches
 
 EXTRACT_ONLY=		${VFLIB_SRC}
 
-pre-configure: ${BUILDLINK_TARGETS}
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/guile/Makefile b/lang/guile/Makefile
index e1d5997fb0a..1134ebf92b3 100644
--- a/lang/guile/Makefile
+++ b/lang/guile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2001/05/28 05:36:28 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2001/06/10 00:08:45 jlam Exp $
 # FreeBSD Id: Makefile,v 1.12 1997/11/22 16:01:32 jseger Exp
 #
 
@@ -25,6 +25,4 @@ INFO_FILES=		data-rep.info
 CFLAGS+=		-I${BUILDLINK_INCDIR}
 LDFLAGS+=		-L${BUILDLINK_LIBDIR}
 
-pre-configure: ${BUILDLINK_TARGETS}
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/hugs/Makefile b/lang/hugs/Makefile
index 529bf6f2c10..1ab1b2ec74d 100644
--- a/lang/hugs/Makefile
+++ b/lang/hugs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2001/05/24 08:53:57 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2001/06/10 00:08:45 jlam Exp $
 
 DISTNAME=	hugs98-Feb2000
 PKGNAME=	hugs98-200002
@@ -24,8 +24,6 @@ CONFIGURE_ENV+=		ac_cv_lib_ncurses_main=no
 
 LDFLAGS+=		-L${BUILDLINK_LIBDIR}
 
-pre-configure: ${BUILDLINK_TARGETS}
-
 do-build:
 	@cd ${WRKSRC}/.. && ${SETENV} ${MAKE_ENV} \
 		${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} ${ALL_TARGET}
diff --git a/lang/librep/Makefile b/lang/librep/Makefile
index 56cdbad99e2..dc697da3379 100644
--- a/lang/librep/Makefile
+++ b/lang/librep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/05/28 06:19:10 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2001/06/10 00:08:45 jlam Exp $
 #
 
 DISTNAME=		librep-${REP_VERS}
@@ -32,6 +32,4 @@ LDFLAGS+=		-L${BUILDLINK_LIBDIR}
 
 PLIST_SUBST+=		REP_VERS=${REP_VERS}
 
-pre-configure: ${BUILDLINK_TARGETS}
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/capc-calc/Makefile b/math/capc-calc/Makefile
index c4f65623afe..8f58e8be6da 100644
--- a/math/capc-calc/Makefile
+++ b/math/capc-calc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/05/24 08:53:57 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2001/06/10 00:08:46 jlam Exp $
 #
 
 DISTNAME=	calc-2.11.4t2
@@ -11,14 +11,10 @@ MAINTAINER=	wiz@netbsd.org
 HOMEPAGE=	http://www.isthe.com/chongo/tech/comp/calc/
 COMMENT=	C arbitrary precision calculator
 
-NO_CONFIGURE=	# defined
-
 .include "../../devel/readline/buildlink.mk"
 
 MAKE_ENV+=	CPPFLAGS="${CPPFLAGS}"
 CPPFLAGS+=	-I${BUILDLINK_INCDIR}
 LDFLAGS+=	-L${BUILDLINK_LIBDIR}
 
-pre-build: ${BUILDLINK_TARGETS}
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/chipmunk/Makefile b/misc/chipmunk/Makefile
index 953b8053d03..fcc3cecaf52 100644
--- a/misc/chipmunk/Makefile
+++ b/misc/chipmunk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/05/24 08:53:57 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2001/06/10 00:08:46 jlam Exp $
 #
 
 DISTNAME=       chipmunk-1.4
@@ -20,8 +20,6 @@ MAKE_ENV+=	EXTRA_LIBS=-li386
 CPPFLAGS+=	-I${BUILDLINK_INCDIR}
 LDFLAGS+=	-L${BUILDLINK_LIBDIR}
 
-pre-configure: ${BUILDLINK_TARGETS}
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/chipmunk ${PREFIX}/sbin/chipmunk
 
diff --git a/misc/py-readline/Makefile b/misc/py-readline/Makefile
index 26e9fa11308..0fcb2d3511f 100644
--- a/misc/py-readline/Makefile
+++ b/misc/py-readline/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2001/05/30 05:02:51 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2001/06/10 00:08:46 jlam Exp $
 #
 
 DISTNAME=	${PY_DISTNAME}
@@ -20,8 +20,6 @@ USE_GNU_READLINE=	# defined
 PY_SETUP_SUBST+=	BUILDLINK_INCDIR=${BUILDLINK_INCDIR}
 PY_SETUP_SUBST+=	BUILDLINK_LIBDIR=${BUILDLINK_LIBDIR}
 
-pre-configure: ${BUILDLINK_TARGETS}
-
 do-configure:	python-std-do-configure
 
 do-install:
diff --git a/net/coda5_client/Makefile b/net/coda5_client/Makefile
index e34bcc5383b..406533f0177 100644
--- a/net/coda5_client/Makefile
+++ b/net/coda5_client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2001/05/31 22:55:54 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2001/06/10 00:08:46 jlam Exp $
 #
 
 DISTNAME=		coda-5.3.13
@@ -39,8 +39,6 @@ INSTALL_SUBST+=		RM=${RM}
 INSTALL_SUBST+=		RMDIR=${RMDIR}
 INSTALL_SUBST+=		TRUE=${TRUE}
 
-pre-configure: ${BUILDLINK_TARGETS}
-
 pre-install:
 	${SED} ${INSTALL_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/}		\
 		${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE}
diff --git a/net/coda5_server/Makefile b/net/coda5_server/Makefile
index df19795f79d..36e4202a394 100644
--- a/net/coda5_server/Makefile
+++ b/net/coda5_server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2001/05/31 22:58:08 jlam Exp $
+# $NetBSD: Makefile,v 1.29 2001/06/10 00:08:46 jlam Exp $
 #
 
 DISTNAME=		coda-5.3.13
@@ -38,8 +38,6 @@ INSTALL_SUBST+=		RM=${RM}
 INSTALL_SUBST+=		RMDIR=${RMDIR}
 INSTALL_SUBST+=		TRUE=${TRUE}
 
-pre-configure: ${BUILDLINK_TARGETS}
-
 pre-install:
 	${SED} ${INSTALL_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/}		\
 		${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE}
diff --git a/net/ncftp2/Makefile b/net/ncftp2/Makefile
index 16195ba7267..6c701888cda 100644
--- a/net/ncftp2/Makefile
+++ b/net/ncftp2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2001/05/24 08:53:57 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2001/06/10 00:08:47 jlam Exp $
 # FreeBSD Id: Makefile,v 1.39 1998/01/31 17:49:48 jseger Exp
 #
 
@@ -35,8 +35,6 @@ DEPENDS+=		socks5-1.0.2:../../net/socks5
 CPPFLAGS+=		-I${BUILDLINK_INCDIR}
 LDFLAGS+=		-L${BUILDLINK_LIBDIR}
 
-pre-configure: ${BUILDLINK_TARGETS}
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ncftp ${PREFIX}/bin/ncftp2
 	${INSTALL_MAN} ${WRKSRC}/ncftp.1 ${PREFIX}/man/man1/ncftp2.1
diff --git a/net/samba/Makefile b/net/samba/Makefile
index 4032b3085bd..9d697b2d464 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2001/06/07 20:17:39 jlam Exp $
+# $NetBSD: Makefile,v 1.55 2001/06/10 00:08:47 jlam Exp $
 
 DISTNAME=		samba-2.2.0
 PKGNAME=		${DISTNAME}nb1
@@ -74,9 +74,8 @@ DOCDIR=			${PREFIX}/share/doc/samba
 HTMLDIR=		${PREFIX}/share/doc/html/samba
 
 post-extract:
-	${FIND} ${WRKDIR}/${DISTNAME} -name ".cvsignore" -exec ${RM} -f {} \;
-
-pre-configure: ${BUILDLINK_TARGETS}
+	${FIND} ${WRKDIR}/${DISTNAME} -name ".cvsignore" -print0 |	\
+		${XARGS} -0 ${RM} -f
 
 pre-install:
 	for file in nmbd.sh smbd.sh; do					\
diff --git a/net/zebra/Makefile b/net/zebra/Makefile
index b6ed7113313..b895d4c7ebc 100644
--- a/net/zebra/Makefile
+++ b/net/zebra/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2001/05/28 21:02:28 jlam Exp $
+# $NetBSD: Makefile,v 1.38 2001/06/10 00:08:47 jlam Exp $
 # Based on KAME Id: Makefile,v 1.1.2.1.2.1.10.2 1999/01/05 11:03:50 itojun Exp
 #
 
@@ -49,7 +49,7 @@ PLIST_SRC+=		${PKGDIR}/PLIST
 CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
 CONFIGURE_ENV+=		LIBS="${LDFLAGS} ${LIBS}"
 
-pre-configure: ${BUILDLINK_TARGETS}
+pre-configure:
 	cd ${WRKSRC} && ${LOCALBASE}/bin/autoreconf
 #	cd ${WRKSRC} && ${LOCALBASE}/bin/automake
 
diff --git a/print/cups/Makefile b/print/cups/Makefile
index 722bd352ff5..ee67691a969 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2001/05/26 16:32:37 jlam Exp $
+# $NetBSD: Makefile,v 1.31 2001/06/10 00:08:47 jlam Exp $
 
 DISTNAME=		cups-${VERS}-source
 PKGNAME=		cups-${VERS}
@@ -81,8 +81,6 @@ EGDIR=			${PREFIX}/share/examples/cups
 post-extract:
 	cd ${WRKSRC}/conf; ${MV} -f cupsd.conf cupsd.conf.in
 
-pre-configure: ${BUILDLINK_TARGETS}
-
 post-build:
 	${SED}	-e "s|@CUPS_USER@|${CUPS_USER}|g"			\
 		-e "s|@CUPS_GROUP@|${CUPS_GROUP}|g"			\
diff --git a/print/ghostscript-nox11/Makefile.common b/print/ghostscript-nox11/Makefile.common
index fd54aca587e..cfc3cbde538 100644
--- a/print/ghostscript-nox11/Makefile.common
+++ b/print/ghostscript-nox11/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.14 2001/05/28 03:52:12 jlam Exp $
+# $NetBSD: Makefile.common,v 1.15 2001/06/10 00:08:48 jlam Exp $
 
 DISTNAME=		ghostscript-${GS_VERS}
 GS_VERS=		6.01
@@ -179,8 +179,6 @@ post-patch:
 	${SED} -e "s|epsimage\.src|${GSINST_DIR}/lib/escp_24.src|g"	\
 		${WRKDIR}/dmp_site.ps.bak > ${WRKDIR}/dmp_site.ps
 
-pre-configure: ${BUILDLINK_TARGETS}
-
 do-configure:
 	#
 	# Append build rules for extra drivers to contrib.mak
diff --git a/print/xpp/Makefile b/print/xpp/Makefile
index 696de40bc71..dfa0952e38c 100644
--- a/print/xpp/Makefile
+++ b/print/xpp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/05/26 07:16:16 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2001/06/10 00:08:48 jlam Exp $
 
 DISTNAME=	xpp-1.0
 CATEGORIES=	print x11
@@ -22,7 +22,7 @@ LDFLAGS+=	-L${BUILDLINK_LIBDIR}
 
 DOCDIR=		${PREFIX}/share/doc/xpp
 
-pre-configure: ${BUILDLINK_TARGETS}
+pre-configure:
 	cd ${WRKSRC}; ${TOUCH} Makefile.in aclocal.m4 configure
 
 post-install:
diff --git a/sysutils/amanda-client/Makefile b/sysutils/amanda-client/Makefile
index 7b4f700ff53..5bbb2571401 100644
--- a/sysutils/amanda-client/Makefile
+++ b/sysutils/amanda-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2001/05/29 18:04:30 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2001/06/10 00:08:48 jlam Exp $
 # FreeBSD Id: Makefile,v 1.9 1997/03/08 05:00:11 gpalmer Exp
 #
 
@@ -44,6 +44,4 @@ CONFIGURE_ARGS+=	--with-smbclient
 DEPENDS+=		samba>=2.0.0:../../net/samba
 .endif
 
-pre-configure: ${BUILDLINK_TARGETS}
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/devtodo/Makefile b/time/devtodo/Makefile
index c87feaa0752..1d401d10062 100644
--- a/time/devtodo/Makefile
+++ b/time/devtodo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/05/29 05:48:56 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2001/06/10 00:08:48 jlam Exp $
 #
 
 DISTNAME=	devtodo-0.1.6-1
@@ -25,6 +25,4 @@ USE_GNU_READLINE=	# uses rl_startup_hook()
 CXXFLAGS+=		-I${BUILDLINK_INCDIR}
 LDFLAGS+=		-L${BUILDLINK_LIBDIR}
 
-pre-configure: ${BUILDLINK_TARGETS}
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/cadaver/Makefile b/www/cadaver/Makefile
index 4e2ec537a92..7e1d80c605f 100644
--- a/www/cadaver/Makefile
+++ b/www/cadaver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/05/24 08:53:58 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2001/06/10 00:08:48 jlam Exp $
 
 DISTNAME=		cadaver-0.17.0
 CATEGORIES=		www
@@ -32,8 +32,6 @@ CFLAGS+=		-I${BUILDLINK_INCDIR} ${CPPFLAGS}
 LDFLAGS+=		-L${BUILDLINK_LIBDIR}
 LIBS+=			-ltermcap
 
-pre-configure: ${BUILDLINK_TARGETS}
-
 # The build process doesn't correctly find some headers for utility functions
 # which are provided in ${WRKSRC}/lib.  Help the compiler by linking the
 # headers to ${WRKSRC} and explicitly passing -I. to the compiler.
diff --git a/www/sitecopy/Makefile b/www/sitecopy/Makefile
index deee6bc4c9d..f8557cf870f 100644
--- a/www/sitecopy/Makefile
+++ b/www/sitecopy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/05/24 08:53:58 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2001/06/10 00:08:49 jlam Exp $
 
 DISTNAME=		sitecopy-0.10.15
 CATEGORIES=		www
@@ -23,8 +23,6 @@ CONFIGURE_ARGS+=	--enable-libxml
 
 CFLAGS+=		-I${BUILDLINK_INCDIR} ${CPPFLAGS}
 
-pre-configure: ${BUILDLINK_TARGETS}
-
 # The build process doesn't correctly find the header for GNU fnmatch, which
 # is provided in ${WRKSRC}/lib.  Help the compiler by linking the header
 # to ${WRKSRC} and explicitly passing -I. to the compiler.
diff --git a/x11/fltk/Makefile b/x11/fltk/Makefile
index bc94e340df1..81132fe4f6d 100644
--- a/x11/fltk/Makefile
+++ b/x11/fltk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2001/05/26 06:37:45 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2001/06/10 00:08:49 jlam Exp $
 #
 
 DISTNAME=	${PKGNAME}-source
@@ -32,8 +32,6 @@ CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}"
 CPPFLAGS+=	-I${BUILDLINK_INCDIR}
 LDFLAGS+=	-L${BUILDLINK_LIBDIR}
 
-pre-configure: ${BUILDLINK_TARGETS}
-
 test:
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV}				\
 		${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} test