Move USE_BUILDLINK_ONLY definition out of Makefile.common and into the

individual package Makefiles.

18 files changed, 45 insertions, 37 deletions

diff --git a/graphics/freetype-lib/Makefile b/graphics/freetype-lib/Makefile
index d14e256df8f..d6c071e82af 100644
--- a/graphics/freetype-lib/Makefile
+++ b/graphics/freetype-lib/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.5 2001/05/28 03:16:44 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2001/09/09 03:37:00 jlam Exp $
 
 PKGNAME=		freetype-lib-${FT_VERS}
-
 COMMENT=		TrueType font rendering engine and library API
 
 CONFIGURE_ARGS+=	--without-x
 
+USE_BUILDLINK_ONLY=	# defined
 ALL_TARGET=		ttlib ttpo
 INSTALL_TARGET=		install-ttlib install-ttpo
 
-.include "../../graphics/freetype-lib/Makefile.common"
+.include "Makefile.common"
diff --git a/graphics/freetype-lib/Makefile.common b/graphics/freetype-lib/Makefile.common
index e002e8db6fb..21383490d57 100644
--- a/graphics/freetype-lib/Makefile.common
+++ b/graphics/freetype-lib/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.17 2001/06/25 20:03:54 jlam Exp $
+# $NetBSD: Makefile.common,v 1.18 2001/09/09 03:37:00 jlam Exp $
 
 DISTNAME=		freetype-${FT_VERS}
 FT_VERS=		1.3.1
@@ -12,7 +12,6 @@ HOMEPAGE=		http://www.freetype.org/
 
 CONFLICTS=		freetype-1.[12]*
 
-USE_BUILDLINK_ONLY=	# defined
 BUILD_USES_MSGFMT=	# defined
 
 USE_LIBTOOL=		# defined
diff --git a/graphics/freetype-utils/Makefile b/graphics/freetype-utils/Makefile
index 79bdf499546..e20913fa208 100644
--- a/graphics/freetype-utils/Makefile
+++ b/graphics/freetype-utils/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.5 2001/06/25 20:02:08 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2001/09/09 03:37:00 jlam Exp $
 
 PKGNAME=		freetype-utils-${FT_VERS}
 COMMENT=		Utilities for manipulating TrueType fonts
 
 BUILDLINK_DEPENDS.freetype=	freetype-lib>=${FT_VERS}
 
+USE_BUILDLINK_ONLY=	# defined
 USE_X11=		# defined
 CONFIGURE_ARGS+=	--with-x
 
@@ -12,4 +13,4 @@ ALL_TARGET=		tttest
 INSTALL_TARGET=		install-tttest
 
 .include "../../graphics/freetype-lib/buildlink.mk"
-.include "../../graphics/freetype-lib/Makefile.common"
+.include "../freetype-lib/Makefile.common"
diff --git a/graphics/gdk-pixbuf-gnome/Makefile b/graphics/gdk-pixbuf-gnome/Makefile
index c4667857a78..a3c26413ff0 100644
--- a/graphics/gdk-pixbuf-gnome/Makefile
+++ b/graphics/gdk-pixbuf-gnome/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/06/26 16:30:57 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2001/09/09 03:37:01 jlam Exp $
 
 .include "../gdk-pixbuf/Makefile.common"
 
@@ -7,6 +7,7 @@ COMMENT=	the GNOME image loading library GNOME canvas support add-on
 
 CONFLICTS+=	gdk-pixbuf<0.10.1
 
+USE_BUILDLINK_ONLY=		# defined
 BUILDLINK_DEPENDS.gdk-pixbuf=	gdk-pixbuf>=0.10.1
 REPLACE_BUILDLINK=		gnomecanvaspixbufConf.sh
 
diff --git a/graphics/gdk-pixbuf/Makefile b/graphics/gdk-pixbuf/Makefile
index 08874ca182f..210cfa116ee 100644
--- a/graphics/gdk-pixbuf/Makefile
+++ b/graphics/gdk-pixbuf/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.17 2001/08/29 22:41:17 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2001/09/09 03:37:01 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
 
diff --git a/graphics/gdk-pixbuf/Makefile.common b/graphics/gdk-pixbuf/Makefile.common
index 345e34b7b2d..dd448275027 100644
--- a/graphics/gdk-pixbuf/Makefile.common
+++ b/graphics/gdk-pixbuf/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.14 2001/08/26 10:32:21 skrll Exp $
+# $NetBSD: Makefile.common,v 1.15 2001/09/09 03:37:01 jlam Exp $
 #
 
 DISTNAME=		gdk-pixbuf-0.10.1
@@ -17,7 +17,6 @@ USE_LIBTOOL=		# defined
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
 GNU_CONFIGURE=		# defined
-USE_BUILDLINK_ONLY=	# defined
 
 M4=			${LOCALBASE}/bin/gm4
 PLIST_SUBST+=		LOCALBASE=${LOCALBASE}
diff --git a/japanese/vflib-lib/Makefile b/japanese/vflib-lib/Makefile
index 9b917d00b27..bdd34ff4a3a 100644
--- a/japanese/vflib-lib/Makefile
+++ b/japanese/vflib-lib/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.5 2001/05/28 03:27:17 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2001/09/09 03:37:01 jlam Exp $
 
 PKGNAME=		ja-vflib-lib-${VFLIB_VERSION}
-
 COMMENT=		Japanese Vector font library
 
 CONFIGURE_ARGS+=	--without-x
 
+USE_BUILDLINK_ONLY=	# defined
 ALL_TARGET=		build-src
 INSTALL_TARGET=		install-src
 
@@ -27,4 +27,4 @@ post-install:
 	cd ${WRKSRC}; ${PAX} -rw jTeX ${PREFIX}/share/VFlib/${VFLIB_VERSION}
 	${CHMOD} -R a-w ${PREFIX}/share/VFlib/${VFLIB_VERSION}
 
-.include "../../japanese/vflib-lib/Makefile.common"
+.include "Makefile.common"
diff --git a/japanese/vflib-lib/Makefile.common b/japanese/vflib-lib/Makefile.common
index adcba40e1dc..845a2872275 100644
--- a/japanese/vflib-lib/Makefile.common
+++ b/japanese/vflib-lib/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.12 2001/06/25 20:19:52 jlam Exp $
+# $NetBSD: Makefile.common,v 1.13 2001/09/09 03:37:01 jlam Exp $
 # FreeBSD Id: Makefile,v 1.20 1999/05/03 01:58:33 steve Exp $
 
 DISTNAME=		VFlib2-${VFLIB_VERSION}
@@ -15,7 +15,6 @@ VFLIB_VERSION=		2.24.2
 PLIST_SUBST+=		VFLIB_VERSION=${VFLIB_VERSION}
 PLIST_SUBST+=		VFLIB_SO_VERSION=${VFLIB_VERSION:C/^2.//}
 
-USE_BUILDLINK_ONLY=	# defined
 USE_LIBTOOL=		# defined
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
diff --git a/japanese/vflib-utils/Makefile b/japanese/vflib-utils/Makefile
index 9c76a82b0d9..0b5398f886b 100644
--- a/japanese/vflib-utils/Makefile
+++ b/japanese/vflib-utils/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2001/08/12 18:16:34 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2001/09/09 03:37:01 jlam Exp $
 
 PKGNAME=		ja-vflib-utils-${VFLIB_VERSION}
 COMMENT=		Utilities for manipulating VFlib vector font files
 
 BUILDLINK_DEPENDS.vflib=	ja-vflib-lib>=${VFLIB_VERSION}
 
+USE_BUILDLINK_ONLY=	# defined
 USE_X11=		# defined
 CONFIGURE_ARGS+=	--enable-tools --with-x
 
@@ -12,4 +13,4 @@ ALL_TARGET=		build-tools
 INSTALL_TARGET=		install-tools
 
 .include "../../japanese/vflib-lib/buildlink.mk"
-.include "../../japanese/vflib-lib/Makefile.common"
+.include "../vflib-lib/Makefile.common"
diff --git a/mail/poppassd/Makefile b/mail/poppassd/Makefile
index e39331e9a5c..d3bd295bdd6 100644
--- a/mail/poppassd/Makefile
+++ b/mail/poppassd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/07/26 15:44:44 taca Exp $
+# $NetBSD: Makefile,v 1.3 2001/09/09 03:37:02 jlam Exp $
 #
 
 DISTNAME=		qpopper${VERSION}
@@ -15,6 +15,7 @@ HOMEPAGE=		http://www.eudora.com/qpopper/
 COMMENT=		Qualcomm's password change server mainly for Eudora
 
 VERSION=		4.0.3
+USE_BUILDLINK_ONLY=	# defined
 CONFIGURE_ARGS+=	--enable-poppassd
 CONFIGURE_ENV+=	CDEFS='-DSMBPASSWD_BINARY=\"${LOCALBASE}/bin/smbpasswd\"'
 
diff --git a/mail/qpopper/Makefile b/mail/qpopper/Makefile
index 2a31c26665d..47113caa337 100644
--- a/mail/qpopper/Makefile
+++ b/mail/qpopper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2001/07/26 15:43:28 taca Exp $
+# $NetBSD: Makefile,v 1.30 2001/09/09 03:37:02 jlam Exp $
 #
 
 DISTNAME=		qpopper${VERSION}
@@ -15,6 +15,7 @@ HOMEPAGE=		http://www.eudora.com/qpopper/
 COMMENT=		Qualcomm's POP server for Eudora
 
 VERSION=		4.0.3
+USE_BUILDLINK_ONLY=	# defined
 
 DEINSTALL_FILE=		${WRKDIR}/DEINSTALL
 INSTALL_FILE=		${WRKDIR}/INSTALL
diff --git a/mail/qpopper/Makefile.common b/mail/qpopper/Makefile.common
index abee5d1a59d..934448667c5 100644
--- a/mail/qpopper/Makefile.common
+++ b/mail/qpopper/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2001/07/26 15:43:28 taca Exp $
+# $NetBSD: Makefile.common,v 1.4 2001/09/09 03:37:02 jlam Exp $
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--libexecdir=${LOCALBASE}/libexec \
@@ -15,7 +15,6 @@ DB_SUFFIX?=		db
 
 .include "../../mk/bsd.prefs.mk"
 
-USE_BUILDLINK_ONLY=	# defined
 CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_DIR}
 
 .if defined(KERBEROS)
diff --git a/wm/icewm-gnome/Makefile b/wm/icewm-gnome/Makefile
index 4c77f315d4f..fac6e2efcab 100644
--- a/wm/icewm-gnome/Makefile
+++ b/wm/icewm-gnome/Makefile
@@ -1,11 +1,13 @@
-# $NetBSD: Makefile,v 1.4 2001/08/29 22:41:24 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2001/09/09 03:37:02 jlam Exp $
 
 PKGNAME=		${DISTNAME:S/-/-gnome-/}
 COMMENT=		small, fast and light-weight window manager (GNOME version)
 
 CONFLICTS+=		icewm-[0-9]*
 
-.include "../../wm/icewm/Makefile.common"
+USE_BUILDLINK_ONLY=	# defined
+
+.include "../icewm/Makefile.common"
 
 CONFIGURE_ARGS+=	--with-gnome-menus="${GNOME_CONFIG}"
 CONFIGURE_ARGS+=	--with-imlib
diff --git a/wm/icewm/Makefile b/wm/icewm/Makefile
index 8413a8476cc..bd8273f33bb 100644
--- a/wm/icewm/Makefile
+++ b/wm/icewm/Makefile
@@ -1,11 +1,13 @@
-# $NetBSD: Makefile,v 1.5 2001/08/29 22:41:24 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2001/09/09 03:37:02 jlam Exp $
 #
 
 COMMENT=		small, fast and light-weight window manager
 
 CONFLICTS+=		icewm-gnome-[0-9]*
 
-.include "../../wm/icewm/Makefile.common"
+USE_BUILDLINK_ONLY=	# defined
+
+.include "Makefile.common"
 .include "../../graphics/xpm/buildlink.mk"
 .include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/icewm/Makefile.common b/wm/icewm/Makefile.common
index 8a700240a76..1300a74f445 100644
--- a/wm/icewm/Makefile.common
+++ b/wm/icewm/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2001/08/24 05:35:17 jlam Exp $
+# $NetBSD: Makefile.common,v 1.6 2001/09/09 03:37:02 jlam Exp $
 #
 
 DISTNAME=	icewm-1.0.4
@@ -10,7 +10,6 @@ EXTRACT_SUFX=	.src.tar.gz
 MAINTAINER=	wiz@netbsd.org
 HOMEPAGE=	http://icewm.sourceforge.net/
 
-USE_BUILDLINK_ONLY=	YES
 GNU_CONFIGURE=	# defined
 USE_X11BASE=	# defined
 
diff --git a/x11/lesstif/Makefile b/x11/lesstif/Makefile
index 82f45ebc7e1..382811e8e9a 100644
--- a/x11/lesstif/Makefile
+++ b/x11/lesstif/Makefile
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.58 2001/08/29 22:41:29 jlam Exp $
-
-.include "../../x11/lesstif/Makefile.common"
+# $NetBSD: Makefile,v 1.59 2001/09/09 03:37:02 jlam Exp $
 
 COMMENT=	API compatible clone of the OSF/Motif toolkit
 
+USE_BUILDLINK_ONLY=	# defined
+
+.include "Makefile.common"
+
 CONFIGURE_ARGS+=	--disable-build-12
 CONFIGURE_ARGS+=	--enable-build-20
 CONFIGURE_ARGS+=	--disable-build-21
diff --git a/x11/lesstif/Makefile.common b/x11/lesstif/Makefile.common
index 2ee1680e69f..a1b03bb85d6 100644
--- a/x11/lesstif/Makefile.common
+++ b/x11/lesstif/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.11 2001/08/26 10:32:24 skrll Exp $
+# $NetBSD: Makefile.common,v 1.12 2001/09/09 03:37:03 jlam Exp $
 
 DISTNAME=		lesstif-${LESSTIF_VERSION}
 LESSTIF_VERSION=	0.92.32
@@ -18,7 +18,6 @@ CONFLICTS+=		openmotif-[0-9]*
 BUILD_DEPENDS+=		autoconf-2.13:../../devel/autoconf
 BUILD_DEPENDS+=		automake>=1.4:../../devel/automake
 
-USE_BUILDLINK_ONLY=	# defined
 USE_X11BASE=		# defined
 USE_GMAKE=		# defined
 USE_LIBTOOL=		# defined
diff --git a/x11/lesstif12/Makefile b/x11/lesstif12/Makefile
index 46f1c252ef8..54c22ecdec2 100644
--- a/x11/lesstif12/Makefile
+++ b/x11/lesstif12/Makefile
@@ -1,6 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/08/29 22:41:29 jlam Exp $
-
-.include "../../x11/lesstif/Makefile.common"
+# $NetBSD: Makefile,v 1.9 2001/09/09 03:37:03 jlam Exp $
 
 PKGNAME=	lesstif12-${LESSTIF_VERSION}
 COMMENT=	API compatible clone of the OSF/Motif toolkit, version 1.2
@@ -8,7 +6,11 @@ COMMENT=	API compatible clone of the OSF/Motif toolkit, version 1.2
 CONFLICTS+=	lesstif-0.[0-8]*
 CONFLICTS+=	lesstif-0.90*
 CONFLICTS+=	lesstif-0.91 lesstif-0.91.[0-3]
-CONFLICTS+=	openmotif-*
+CONFLICTS+=	openmotif-[0-9]*
+
+USE_BUILDLINK_ONLY=	# defined
+
+.include "../lesstif/Makefile.common"
 
 CONFIGURE_ARGS+=	--enable-build-12
 CONFIGURE_ARGS+=	--disable-build-20