Change the default for BUILDLINK_DEPMETHOD.qt3-tools from "full" to "build",

without affecting packages that are currently using it.

Packages which previously didn't set BUILDLINK_DEPMETHOD to neither "full" nor
"build" now set it to "full", but should be checked whether they really need it
(comment added).  Packages which previously set it to "build" now don't set it
anymore.

Ok by jlam, wiz.

34 files changed, 130 insertions, 55 deletions

diff --git a/audio/hydrogen/Makefile b/audio/hydrogen/Makefile
index dbf4ed16af3..32aa51c5523 100644
--- a/audio/hydrogen/Makefile
+++ b/audio/hydrogen/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/05/22 20:07:38 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2006/01/05 10:08:58 ghen Exp $
 
 DISTNAME=	hydrogen-0.8.0
 PKGREVISION=	1
@@ -23,4 +23,8 @@ CONFIGURE_ARGS+=	--with-xinerama
 .include "../../audio/libhydrogen/buildlink3.mk"
 .include "../../x11/qt3-libs/buildlink3.mk"
 .include "../../x11/qt3-tools/buildlink3.mk"
+# XXX Please verify whether qt3-tools is really needed at run-time.
+# If it is, then remove this comment.  If it is not, then remove
+# this comment and the line below, and bump PKGREVISION.
+BUILDLINK_DEPMETHOD.qt3-tools=	full
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/kmp/Makefile b/audio/kmp/Makefile
index da1aade71d5..8dbb4576848 100644
--- a/audio/kmp/Makefile
+++ b/audio/kmp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/11/18 20:19:42 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2006/01/05 10:08:58 ghen Exp $
 
 DISTNAME=		kmp-0.01
 PKGREVISION=		1
@@ -17,4 +17,8 @@ CONFIGURE_ARGS+=	${PREFIX}
 
 .include "../../x11/qt3-libs/buildlink3.mk"
 .include "../../x11/qt3-tools/buildlink3.mk"
+# XXX Please verify whether qt3-tools is really needed at run-time.
+# If it is, then remove this comment.  If it is not, then remove
+# this comment and the line below, and bump PKGREVISION.
+BUILDLINK_DEPMETHOD.qt3-tools=	full
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/madman/Makefile b/audio/madman/Makefile
index e9d5c5cb685..57c1e52146b 100644
--- a/audio/madman/Makefile
+++ b/audio/madman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/01/04 04:29:05 schmonz Exp $
+# $NetBSD: Makefile,v 1.13 2006/01/05 10:08:58 ghen Exp $
 
 DISTNAME=	madman-0.93
 PKGREVISION=	2
@@ -38,6 +38,10 @@ do-install:
 
 .include "../../x11/qt3-libs/buildlink3.mk"
 .include "../../x11/qt3-tools/buildlink3.mk"
+# XXX Please verify whether qt3-tools is really needed at run-time.
+# If it is, then remove this comment.  If it is not, then remove
+# this comment and the line below, and bump PKGREVISION.
+BUILDLINK_DEPMETHOD.qt3-tools=	full
 .include "../../devel/glib/buildlink3.mk"
 .include "../../audio/xmms/buildlink3.mk"
 .include "../../audio/libid3tag/buildlink3.mk"
diff --git a/audio/qsynth/Makefile b/audio/qsynth/Makefile
index 00b0b1ce175..22fbdef866c 100644
--- a/audio/qsynth/Makefile
+++ b/audio/qsynth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/10/19 15:13:38 adam Exp $
+# $NetBSD: Makefile,v 1.2 2006/01/05 10:08:58 ghen Exp $
 
 DISTNAME=	qsynth-0.2.4
 CATEGORIES=	audio
@@ -26,4 +26,8 @@ do-install:
 
 .include "../../audio/fluidsynth/buildlink3.mk"
 .include "../../x11/qt3-tools/buildlink3.mk"
+# XXX Please verify whether qt3-tools is really needed at run-time.
+# If it is, then remove this comment.  If it is not, then remove
+# this comment and the line below, and bump PKGREVISION.
+BUILDLINK_DEPMETHOD.qt3-tools=	full
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/qcad/Makefile b/cad/qcad/Makefile
index 52045bc90dc..4638de5e84b 100644
--- a/cad/qcad/Makefile
+++ b/cad/qcad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/12/05 20:49:52 rillig Exp $
+# $NetBSD: Makefile,v 1.31 2006/01/05 10:08:58 ghen Exp $
 
 DISTNAME=		qcad-1.5.4-src
 PKGNAME=		qcad-1.5.4
@@ -48,4 +48,8 @@ do-install:
 
 .include "../../x11/qt3-libs/buildlink3.mk"
 .include "../../x11/qt3-tools/buildlink3.mk"
+# XXX Please verify whether qt3-tools is really needed at run-time.
+# If it is, then remove this comment.  If it is not, then remove
+# this comment and the line below, and bump PKGREVISION.
+BUILDLINK_DEPMETHOD.qt3-tools=	full
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/vipec/Makefile b/cad/vipec/Makefile
index ab04bb7858b..30e0601e520 100644
--- a/cad/vipec/Makefile
+++ b/cad/vipec/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2005/06/01 18:02:41 jlam Exp $
+# $NetBSD: Makefile,v 1.43 2006/01/05 10:08:58 ghen Exp $
 #
 
 DISTNAME=	ViPEC-3.2.0
@@ -24,4 +24,8 @@ post-install:
 
 .include "../../x11/qt3-libs/buildlink3.mk"
 .include "../../x11/qt3-tools/buildlink3.mk"
+# XXX Please verify whether qt3-tools is really needed at run-time.
+# If it is, then remove this comment.  If it is not, then remove
+# this comment and the line below, and bump PKGREVISION.
+BUILDLINK_DEPMETHOD.qt3-tools=	full
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/psi/Makefile b/chat/psi/Makefile
index 7a901b33d2a..901ace287cf 100644
--- a/chat/psi/Makefile
+++ b/chat/psi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/12/31 10:12:58 rillig Exp $
+# $NetBSD: Makefile,v 1.31 2006/01/05 10:08:58 ghen Exp $
 
 PSI_VERSION=	0.9.3
 DISTNAME=	psi-${PSI_VERSION}
@@ -70,7 +70,6 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/psi ${PREFIX}/bin/psi
 
 .include "../../x11/qt3-libs/buildlink3.mk"
-BUILDLINK_DEPMETHOD.qt3-tools=	build
 .include "../../x11/qt3-tools/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/qca/buildlink3.mk"
diff --git a/databases/luma/Makefile b/databases/luma/Makefile
index f47f121ec24..d63e3c25090 100644
--- a/databases/luma/Makefile
+++ b/databases/luma/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/10/29 01:44:35 kristerw Exp $
+# $NetBSD: Makefile,v 1.5 2006/01/05 10:08:59 ghen Exp $
 #
 
 DISTNAME=		luma-2.2.1
@@ -27,4 +27,8 @@ do-install:
 .include "../../databases/py-ldap/buildlink3.mk"
 .include "../../x11/py-qt3-base/buildlink3.mk"
 .include "../../x11/py-qt3-modules/buildlink3.mk"
+# XXX Please verify whether qt3-tools is really needed at run-time.
+# If it is, then remove this comment.  If it is not, then remove
+# this comment and the line below, and bump PKGREVISION.
+BUILDLINK_DEPMETHOD.qt3-tools=	full
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/mysqlcc/Makefile b/databases/mysqlcc/Makefile
index 3239cc04e37..8be6ea87b83 100644
--- a/databases/mysqlcc/Makefile
+++ b/databases/mysqlcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/07/27 16:21:16 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2006/01/05 10:08:58 ghen Exp $
 #
 
 DISTNAME=		mysqlcc-0.9.4-src
@@ -36,5 +36,9 @@ do-install:
 
 .include "../../security/openssl/buildlink3.mk"
 .include "../../x11/qt3-tools/buildlink3.mk"
+# XXX Please verify whether qt3-tools is really needed at run-time.
+# If it is, then remove this comment.  If it is not, then remove
+# this comment and the line below, and bump PKGREVISION.
+BUILDLINK_DEPMETHOD.qt3-tools=	full
 .include "../../mk/mysql.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/lincvs/Makefile b/devel/lincvs/Makefile
index 31dbbaa8585..9b21fa3111a 100644
--- a/devel/lincvs/Makefile
+++ b/devel/lincvs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/12/31 09:08:22 ghen Exp $
+# $NetBSD: Makefile,v 1.3 2006/01/05 10:08:58 ghen Exp $
 
 DISTNAME=		lincvs-1.4.4-0-generic-src
 PKGNAME=		${DISTNAME:S/-0-generic-src//}
@@ -41,5 +41,4 @@ do-install:
 
 .include "../../x11/qt3-libs/buildlink3.mk"
 .include "../../x11/qt3-tools/buildlink3.mk"
-BUILDLINK_DEPMETHOD.qt3-tools=	build
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/lyx-qt/Makefile b/editors/lyx-qt/Makefile
index 36d8f04596c..d48ac11f6b8 100644
--- a/editors/lyx-qt/Makefile
+++ b/editors/lyx-qt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/12/05 23:55:06 rillig Exp $
+# $NetBSD: Makefile,v 1.23 2006/01/05 10:08:58 ghen Exp $
 #
 
 .include "./Makefile.common"
@@ -17,4 +17,8 @@ CONFIGURE_ARGS+= 	--with-extra-prefix=${BUILDLINK_PREFIX.qt3-libs} \
 			--with-frontend=qt
 
 .include "../../x11/qt3-tools/buildlink3.mk"
+# XXX Please verify whether qt3-tools is really needed at run-time.
+# If it is, then remove this comment.  If it is not, then remove
+# this comment and the line below, and bump PKGREVISION.
+BUILDLINK_DEPMETHOD.qt3-tools=	full
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/texmaker/Makefile b/editors/texmaker/Makefile
index 01d17e855aa..52828bfe5dc 100644
--- a/editors/texmaker/Makefile
+++ b/editors/texmaker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/12/13 12:15:16 ghen Exp $
+# $NetBSD: Makefile,v 1.4 2006/01/05 10:08:58 ghen Exp $
 
 DISTNAME=	texmaker-1.12
 CATEGORIES=	editors
@@ -17,5 +17,4 @@ post-configure:
 
 .include "../../x11/qt3-libs/buildlink3.mk"
 .include "../../x11/qt3-tools/buildlink3.mk"
-BUILDLINK_DEPMETHOD.qt3-tools=	build
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/qnetwalk/Makefile b/games/qnetwalk/Makefile
index 6a049aaa083..38d715e9106 100644
--- a/games/qnetwalk/Makefile
+++ b/games/qnetwalk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:17 rillig Exp $
+# $NetBSD: Makefile,v 1.7 2006/01/05 10:08:59 ghen Exp $
 #
 
 DISTNAME=	qnetwalk-1.2
@@ -10,9 +10,6 @@ MAINTAINER=	ianzag@mail.ru
 HOMEPAGE=	http://qt.osdn.org.ua/qnetwalk.html
 COMMENT=	QNetwalk is a Qt-version of the popular NetWalk game
 
-# We need qmake to build package's Makefile
-BUILDLINK_DEPMETHOD.qt3-tools=	build
-
 USE_TOOLS+=	gmake
 USE_LANGUAGES=	c c++
 USE_LIBTOOL=	YES
diff --git a/graphics/TiffIO/Makefile b/graphics/TiffIO/Makefile
index 013622aefc1..7e453594ff4 100644
--- a/graphics/TiffIO/Makefile
+++ b/graphics/TiffIO/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/12/09 15:47:34 gdt Exp $
+# $NetBSD: Makefile,v 1.2 2006/01/05 10:08:59 ghen Exp $
 #
 
 DISTNAME=		TiffIO-110c
@@ -11,9 +11,6 @@ MAINTAINER=		gdt@ir.bbn.com
 HOMEPAGE=		http://artis.imag.fr/Software/TiffIO/
 COMMENT=		Tiff support for QT image loader
 
-# We need qmake to build package's Makefile
-BUILDLINK_DEPMETHOD.qt3-tools=  build
-
 USE_TOOLS+=     gmake
 USE_LANGUAGES=  c c++
 
diff --git a/graphics/f4l/Makefile b/graphics/f4l/Makefile
index 21021b97485..11f3a755224 100644
--- a/graphics/f4l/Makefile
+++ b/graphics/f4l/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/11/20 16:58:12 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2006/01/05 10:08:59 ghen Exp $
 #
 
 DISTNAME=	f4l-0.2
@@ -20,4 +20,8 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/f4l ${PREFIX}/bin
 
 .include "../../x11/qt3-tools/buildlink3.mk"
+# XXX Please verify whether qt3-tools is really needed at run-time.
+# If it is, then remove this comment.  If it is not, then remove
+# this comment and the line below, and bump PKGREVISION.
+BUILDLINK_DEPMETHOD.qt3-tools=	full
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/lprof/Makefile b/graphics/lprof/Makefile
index 5f677c74e30..e863b1fc57c 100644
--- a/graphics/lprof/Makefile
+++ b/graphics/lprof/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:21 rillig Exp $
+# $NetBSD: Makefile,v 1.9 2006/01/05 10:08:59 ghen Exp $
 #
 
 DISTNAME=		lprof-1.10.1
@@ -15,8 +15,6 @@ USE_TOOLS+=	gmake
 MAKE_ENV+=	BASEDIR=${PREFIX:Q} QTDIR=${PREFIX}/qt3
 MAKE_ENV+=	LDFLAGS=${LDFLAGS:M*:Q}
 
-BUILDLINK_DEPMETHOD.qt3-tools= build
-
 .include "../../x11/qt3-libs/buildlink3.mk"
 .include "../../x11/qt3-tools/buildlink3.mk"
 .include "../../graphics/lcms/buildlink3.mk"
diff --git a/graphics/veusz/Makefile b/graphics/veusz/Makefile
index 8e93242897a..d85baca3474 100644
--- a/graphics/veusz/Makefile
+++ b/graphics/veusz/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/10/21 15:03:01 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2006/01/05 10:08:59 ghen Exp $
 #
 
 DISTNAME=		veusz-0.8
@@ -15,5 +15,9 @@ PYDISTUTILSPKG=		yes
 .include "../../lang/python/extension.mk"
 .include "../../x11/py-qt3-base/buildlink3.mk"
 .include "../../x11/py-qt3-modules/buildlink3.mk"
+# XXX Please verify whether qt3-tools is really needed at run-time.
+# If it is, then remove this comment.  If it is not, then remove
+# this comment and the line below, and bump PKGREVISION.
+BUILDLINK_DEPMETHOD.qt3-tools=	full
 .include "../../math/py-numarray/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/meta-pkgs/kde3/kde3.mk b/meta-pkgs/kde3/kde3.mk
index e6a5a153911..fb1c8ccada0 100644
--- a/meta-pkgs/kde3/kde3.mk
+++ b/meta-pkgs/kde3/kde3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: kde3.mk,v 1.11 2005/12/05 23:55:12 rillig Exp $
+# $NetBSD: kde3.mk,v 1.12 2006/01/05 10:08:59 ghen Exp $
 #
 # This Makefile fragment is included by packages that use the KDE3
 # configure-and-build process.
@@ -96,7 +96,6 @@ BUILDLINK_DEPENDS.qt3-libs+=	qt3-libs>=3.3.3nb1
 .include "../../x11/qt3-libs/buildlink3.mk"
 .endif
 
-BUILDLINK_DEPMETHOD.qt3-tools=	build
 .include "../../x11/qt3-tools/buildlink3.mk"
 
 .endif	# KDE3_MK
diff --git a/misc/celestia-kde/Makefile b/misc/celestia-kde/Makefile
index 6c6302e94bf..7ef234edf31 100644
--- a/misc/celestia-kde/Makefile
+++ b/misc/celestia-kde/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/12/05 20:50:38 rillig Exp $
+# $NetBSD: Makefile,v 1.19 2006/01/05 10:08:59 ghen Exp $
 
 PKGNAME=	${DISTNAME:S/-/-kde-/}
 PKGREVISION=	1
@@ -56,6 +56,10 @@ do-install:
 
 .include "../../x11/kdelibs3/buildlink3.mk"
 .include "../../x11/qt3-tools/buildlink3.mk"
+# XXX Please verify whether qt3-tools is really needed at run-time.
+# If it is, then remove this comment.  If it is not, then remove
+# this comment and the line below, and bump PKGREVISION.
+BUILDLINK_DEPMETHOD.qt3-tools=	full
 
 .include "../../misc/celestia/Makefile.common"
 
diff --git a/misc/pyqt_memaid/Makefile b/misc/pyqt_memaid/Makefile
index 2b0ba36390c..374098f638e 100644
--- a/misc/pyqt_memaid/Makefile
+++ b/misc/pyqt_memaid/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/10/12 20:18:11 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2006/01/05 10:09:00 ghen Exp $
 #
 
 DISTNAME=		pyqt_memaid_0.2.4
@@ -36,4 +36,8 @@ post-install:
 .include "../../lang/python/extension.mk"
 .include "../../textproc/py-xml/buildlink3.mk"
 .include "../../x11/py-qt3-base/buildlink3.mk"
+# XXX Please verify whether qt3-tools is really needed at run-time.
+# If it is, then remove this comment.  If it is not, then remove
+# this comment and the line below, and bump PKGREVISION.
+BUILDLINK_DEPMETHOD.qt3-tools=	full
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/qbrew/Makefile b/misc/qbrew/Makefile
index 871aad325ba..4f611ded2a9 100644
--- a/misc/qbrew/Makefile
+++ b/misc/qbrew/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:17 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2006/01/05 10:08:59 ghen Exp $
 
 DISTNAME=	qbrew-0.3.4
 CATEGORIES=	misc
@@ -8,10 +8,14 @@ MAINTAINER=	wulf@NetBSD.org
 HOMEPAGE=	http://www.usermode.org/code.html
 COMMENT= 	Homebrewer's recipe calculator
 
-USE_TOOLS+= gmake
-GNU_CONFIGURE=  yes
-USE_LIBTOOL=    yes
+USE_TOOLS+=	gmake
+GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
 
 .include "../../x11/qt3-libs/buildlink3.mk"
 .include "../../x11/qt3-tools/buildlink3.mk"
+# XXX Please verify whether qt3-tools is really needed at run-time.
+# If it is, then remove this comment.  If it is not, then remove
+# this comment and the line below, and bump PKGREVISION.
+BUILDLINK_DEPMETHOD.qt3-tools=	full
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/scribus/Makefile b/print/scribus/Makefile
index a64cea30904..f251252b9ff 100644
--- a/print/scribus/Makefile
+++ b/print/scribus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/12/05 23:55:16 rillig Exp $
+# $NetBSD: Makefile,v 1.31 2006/01/05 10:08:59 ghen Exp $
 
 DISTNAME=	scribus-1.2.3
 PKGREVISION=	1
@@ -32,7 +32,6 @@ CONFIGURE_ENV+=		ac_cv_prog_hacups=no
 .include "../../graphics/libart2/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/qt3-libs/buildlink3.mk"
-BUILDLINK_DEPMETHOD.qt3-tools=	build
 .include "../../x11/qt3-tools/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../lang/python/application.mk"
diff --git a/security/MyPasswordSafe/Makefile b/security/MyPasswordSafe/Makefile
index dc5f2254eed..68e69f0f6fc 100644
--- a/security/MyPasswordSafe/Makefile
+++ b/security/MyPasswordSafe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/11/17 22:12:37 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2006/01/05 10:08:59 ghen Exp $
 #
 
 DISTNAME=		MyPasswordSafe-20050615.src
@@ -17,4 +17,8 @@ MAKE_FLAGS+=		QMAKE=${QTDIR:Q}/bin/qmake
 
 .include "../../x11/qt3-libs/buildlink3.mk"
 .include "../../x11/qt3-tools/buildlink3.mk"
+# XXX Please verify whether qt3-tools is really needed at run-time.
+# If it is, then remove this comment.  If it is not, then remove
+# this comment and the line below, and bump PKGREVISION.
+BUILDLINK_DEPMETHOD.qt3-tools=	full
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/fwbuilder/Makefile b/security/fwbuilder/Makefile
index af6cc8e998f..de7d107462f 100644
--- a/security/fwbuilder/Makefile
+++ b/security/fwbuilder/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/12/12 20:25:09 bad Exp $
+# $NetBSD: Makefile,v 1.8 2006/01/05 10:08:59 ghen Exp $
 
 DISTNAME=	fwbuilder-2.0.10
 CATEGORIES=	security net
@@ -18,6 +18,11 @@ QMAKE=		${QTDIR}/bin/qmake
 CONFIGURE_ENV+=	QMAKE=${QMAKE:Q}
 MAKE_ENV+=	QMAKE=${QMAKE:Q}
 
+# XXX Please verify whether qt3-tools is really needed at run-time.
+# If it is, then remove this comment.  If it is not, then remove
+# this comment and the line below, and bump PKGREVISION.
+BUILDLINK_DEPMETHOD.qt3-tools=	full
+
 .include "../../security/libfwbuilder/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/libfwbuilder/Makefile b/security/libfwbuilder/Makefile
index 35915473681..f3a40d5f6a7 100644
--- a/security/libfwbuilder/Makefile
+++ b/security/libfwbuilder/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/12/12 20:25:09 bad Exp $
+# $NetBSD: Makefile,v 1.13 2006/01/05 10:08:59 ghen Exp $
 
 DISTNAME=	libfwbuilder-2.0.10
 CATEGORIES=	security net
@@ -24,5 +24,9 @@ post-install:
 .include "../../textproc/libxslt/buildlink3.mk"
 .include "../../x11/qt3-libs/buildlink3.mk"
 .include "../../x11/qt3-tools/buildlink3.mk"
+# XXX Please verify whether qt3-tools is really needed at run-time.
+# If it is, then remove this comment.  If it is not, then remove
+# this comment and the line below, and bump PKGREVISION.
+BUILDLINK_DEPMETHOD.qt3-tools=	full
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/qca-tls/Makefile b/security/qca-tls/Makefile
index 48ef05ea5c6..7f4599637aa 100644
--- a/security/qca-tls/Makefile
+++ b/security/qca-tls/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/11/01 22:57:06 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2006/01/05 10:08:59 ghen Exp $
 
 DISTNAME=	qca-tls-1.0
 CATEGORIES=	security
@@ -31,6 +31,5 @@ do-install:
 
 .include "../../security/openssl/buildlink3.mk"
 .include "../../x11/qt3-libs/buildlink3.mk"
-BUILDLINK_DEPMETHOD.qt3-tools=	build
 .include "../../x11/qt3-tools/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/qca/Makefile b/security/qca/Makefile
index 3257927b7eb..cce2ddbbb94 100644
--- a/security/qca/Makefile
+++ b/security/qca/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:58 rillig Exp $
+# $NetBSD: Makefile,v 1.7 2006/01/05 10:08:59 ghen Exp $
 
 DISTNAME=	qca-1.0
 CATEGORIES=	security
@@ -21,6 +21,5 @@ do-install:
 	libtool --mode=install ${INSTALL_LIB} libqca.la ${PREFIX}/lib
 
 .include "../../x11/qt3-libs/buildlink3.mk"
-BUILDLINK_DEPMETHOD.qt3-tools= build
 .include "../../x11/qt3-tools/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/ptimetracker/Makefile b/time/ptimetracker/Makefile
index f452cfa9ad8..1c0476a080c 100644
--- a/time/ptimetracker/Makefile
+++ b/time/ptimetracker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/12/05 20:51:09 rillig Exp $
+# $NetBSD: Makefile,v 1.7 2006/01/05 10:08:59 ghen Exp $
 
 DISTNAME=	ptimetracker-1.7.3
 CATEGORIES=	time kde
@@ -20,9 +20,6 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ptimetracker ${PREFIX}/bin/
 	${INSTALL_MAN} ${WRKSRC}/ptimetracker.1 ${PREFIX}/man/man1/
 
-# need only qmake during build
-BUILDLINK_DEPMETHOD.qt3-tools=	build
-
 .include "../../x11/qt3-libs/buildlink3.mk"
 .include "../../x11/qt3-tools/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/icecc/Makefile b/wm/icecc/Makefile
index cc1be211260..953aaa441de 100644
--- a/wm/icecc/Makefile
+++ b/wm/icecc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/12/05 20:51:09 rillig Exp $
+# $NetBSD: Makefile,v 1.3 2006/01/05 10:09:00 ghen Exp $
 
 # Package version reflects icecc version, with PKGREVISION incremented
 # for any tool updates, according to the authors scheme.
@@ -71,4 +71,8 @@ post-install:
 .include "../../editors/vim-share/version.mk"
 .include "../../lang/python/application.mk"
 .include "../../x11/py-qt3-base/buildlink3.mk"
+# XXX Please verify whether qt3-tools is really needed at run-time.
+# If it is, then remove this comment.  If it is not, then remove
+# this comment and the line below, and bump PKGREVISION.
+BUILDLINK_DEPMETHOD.qt3-tools=	full
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/py-qt3-base/Makefile b/x11/py-qt3-base/Makefile
index fff2a4594f4..0f6cf0110d6 100644
--- a/x11/py-qt3-base/Makefile
+++ b/x11/py-qt3-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/12/05 20:51:18 rillig Exp $
+# $NetBSD: Makefile,v 1.19 2006/01/05 10:08:59 ghen Exp $
 #
 
 .include "../../x11/py-qt3-base/Makefile.common"
@@ -25,4 +25,8 @@ SUBST_SED.pyversfx=	-e "s|@PYVERSSUFFIX@|${PYVERSSUFFIX}|g"
 .include "../../x11/py-qt3-sip/buildlink3.mk"
 .include "../../x11/qt3-libs/buildlink3.mk"
 .include "../../x11/qt3-tools/buildlink3.mk"
+# XXX Please verify whether qt3-tools is really needed at run-time.
+# If it is, then remove this comment.  If it is not, then remove
+# this comment and the line below, and bump PKGREVISION.
+BUILDLINK_DEPMETHOD.qt3-tools=	full
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/py-qt3-modules/Makefile b/x11/py-qt3-modules/Makefile
index 4f0ef6d6579..09b73325013 100644
--- a/x11/py-qt3-modules/Makefile
+++ b/x11/py-qt3-modules/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/07/01 01:20:28 reed Exp $
+# $NetBSD: Makefile,v 1.19 2006/01/05 10:09:00 ghen Exp $
 #
 
 .include "../../x11/py-qt3-base/Makefile.common"
@@ -11,5 +11,10 @@ INSTALL_DIRS=	${WRKSRC}/qtcanvas ${WRKSRC}/qtgl ${WRKSRC}/qtnetwork
 INSTALL_DIRS+=	${WRKSRC}/qtsql ${WRKSRC}/qttable ${WRKSRC}/qtui
 INSTALL_DIRS+=	${WRKSRC}/qtxml
 
+# XXX Please verify whether qt3-tools is really needed at run-time.
+# If it is, then remove this comment.  If it is not, then remove
+# this comment and the line below, and bump PKGREVISION.
+BUILDLINK_DEPMETHOD.qt3-tools=	full
+
 .include "../../x11/py-qt3-base/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/py-qt3-qscintilla/Makefile b/x11/py-qt3-qscintilla/Makefile
index d5bce991b62..eac67ce7973 100644
--- a/x11/py-qt3-qscintilla/Makefile
+++ b/x11/py-qt3-qscintilla/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/07/01 01:30:21 reed Exp $
+# $NetBSD: Makefile,v 1.18 2006/01/05 10:09:00 ghen Exp $
 #
 
 .include "../../x11/py-qt3-base/Makefile.common"
@@ -12,6 +12,11 @@ CONFIGURE_ARGS+=	-o ${QTDIR}/lib
 
 INSTALL_DIRS=	${WRKSRC}/qtext
 
+# XXX Please verify whether qt3-tools is really needed at run-time.
+# If it is, then remove this comment.  If it is not, then remove
+# this comment and the line below, and bump PKGREVISION.
+BUILDLINK_DEPMETHOD.qt3-tools=	full
+
 .include "../../x11/py-qt3-base/buildlink3.mk"
 .include "../../x11/qt3-qscintilla/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/py-qt3-sip/Makefile b/x11/py-qt3-sip/Makefile
index 7b63ecfea5e..dd4226522ce 100644
--- a/x11/py-qt3-sip/Makefile
+++ b/x11/py-qt3-sip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/12/05 20:51:18 rillig Exp $
+# $NetBSD: Makefile,v 1.24 2006/01/05 10:09:00 ghen Exp $
 #
 
 DISTNAME=	sip-4.3.2
@@ -53,6 +53,11 @@ do-configure:
 	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		${PYTHONBIN} configure.py ${CONFIGURE_ARGS})
 
+# XXX Please verify whether qt3-tools is really needed at run-time.
+# If it is, then remove this comment.  If it is not, then remove
+# this comment and the line below, and bump PKGREVISION.
+BUILDLINK_DEPMETHOD.qt3-tools=	full
+
 .include "../../lang/python/extension.mk"
 .include "../../lang/python/application.mk"
 .include "../../x11/qt3-libs/buildlink3.mk"
diff --git a/x11/qt3-tools/buildlink3.mk b/x11/qt3-tools/buildlink3.mk
index 8a896c75f5c..ec2649ac14a 100644
--- a/x11/qt3-tools/buildlink3.mk
+++ b/x11/qt3-tools/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2005/09/13 12:13:54 dmcmahill Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/01/05 10:08:59 ghen Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 QT3_TOOLS_BUILDLINK3_MK:=	${QT3_TOOLS_BUILDLINK3_MK}+
@@ -14,6 +14,7 @@ BUILDLINK_PACKAGES+=	qt3-tools
 BUILDLINK_DEPENDS.qt3-tools+=	qt3-tools>=3.1.2nb3
 BUILDLINK_RECOMMENDED.qt3-tools+=	qt3-tools>=3.3.3nb1
 BUILDLINK_PKGSRCDIR.qt3-tools?=	../../x11/qt3-tools
+BUILDLINK_DEPMETHOD.qt3-tools?=	build
 .endif	# QT3_TOOLS_BUILDLINK3_MK
 
 .include "../../x11/qt3-libs/buildlink3.mk"