Packages that USE_IMAKE shouldn't set USE_BUILDLINK_ONLY, as they don't

satisfy the condition of being "strongly-buildlinked" (see
http://mail-index.netbsd.org/tech-pkg/2001/08/20/0005.html for the
definition).  This is in response to the recent change to bsd.pkg.mk to
not use buildlink-x11.

9 files changed, 25 insertions, 32 deletions

diff --git a/audio/nas/Makefile b/audio/nas/Makefile
index af9734732e0..5267a4a9bf5 100644
--- a/audio/nas/Makefile
+++ b/audio/nas/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/07/14 13:35:12 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2001/08/22 17:38:56 jlam Exp $
 # FreeBSD ID: Makefile,v 1.8 1997/01/06 12:04:12 jkh Exp
 #
 
@@ -13,7 +13,6 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://radscan.com/nas.html
 COMMENT=	Network Audio System
 
-USE_BUILDLINK_ONLY=	# defined
 USE_IMAKE=		# defined
 USE_X11BASE=		# defined
 
diff --git a/audio/wsoundprefs/Makefile b/audio/wsoundprefs/Makefile
index 43ff4a609a8..9fa253805ff 100644
--- a/audio/wsoundprefs/Makefile
+++ b/audio/wsoundprefs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/07/24 11:04:20 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2001/08/22 17:38:56 jlam Exp $
 
 DISTNAME=	WSoundPrefs-1.1.1
 PKGNAME=	wsoundprefs-1.1.1
@@ -9,9 +9,8 @@ MAINTAINER=	jlam@netbsd.org
 HOMEPAGE=	http://shadowmere.student.utwente.nl/
 COMMENT=	WSoundServer configuration utility
 
-USE_BUILDLINK_ONLY=	YES
-USE_X11BASE=		YES
-USE_IMAKE=		YES
+USE_X11BASE=	YES
+USE_IMAKE=	YES
 
 .include "../../audio/wsoundserver/buildlink.mk"
 .include "../../wm/windowmaker/buildlink.mk"
diff --git a/audio/wsoundprefs/distinfo b/audio/wsoundprefs/distinfo
index d35161ed2fd..bbe2ccbf75b 100644
--- a/audio/wsoundprefs/distinfo
+++ b/audio/wsoundprefs/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.3 2001/07/24 11:04:20 jlam Exp $
+$NetBSD: distinfo,v 1.4 2001/08/22 17:38:56 jlam Exp $
 
 SHA1 (WSoundPrefs-1.1.1.tar.gz) = 444571543e7a076cc49ee484dbcfd0aefc184316
 Size (WSoundPrefs-1.1.1.tar.gz) = 32042 bytes
 SHA1 (patch-aa) = 8ae650bc0a79ee02dbbefc5519eff735a02a722b
-SHA1 (patch-ab) = b5c2e7e41a1ad4508e91dfd98446be73805dda0c
+SHA1 (patch-ab) = 1c378cf46b5902fbc0a364de9b3648e16504a946
 SHA1 (patch-ac) = 592155f98fa0b51690e766eb75bde69531313533
 SHA1 (patch-ad) = 5d37585aea3950f2d01d66333cbd6fd59d3a42c8
 SHA1 (patch-ae) = 675b6b8039016f99b7bdb744eb01747f5f5f8c31
diff --git a/audio/wsoundprefs/patches/patch-ab b/audio/wsoundprefs/patches/patch-ab
index 84f3e857265..71092683d8d 100644
--- a/audio/wsoundprefs/patches/patch-ab
+++ b/audio/wsoundprefs/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.5 2001/07/24 11:04:21 jlam Exp $
+$NetBSD: patch-ab,v 1.6 2001/08/22 17:38:56 jlam Exp $
 
 --- src/Imakefile.orig	Mon Oct 18 01:35:58 1999
 +++ src/Imakefile
@@ -12,12 +12,12 @@ $NetBSD: patch-ab,v 1.5 2001/07/24 11:04:21 jlam Exp $
 -WRASTERCFLAGS = `get-wraster-flags --cflags`
 -WRASTERLFLAGS = `get-wraster-flags --lflags`
 -WRASTERLIBS = `get-wraster-flags --libs`
-+WSOUNDCFLAGS = `${BUILDLINK_DIR}/bin/get-wsound-flags --cflags`
-+WSOUNDLFLAGS = `${BUILDLINK_DIR}/bin/get-wsound-flags --lflags`
-+WSOUNDLIBS = `${BUILDLINK_DIR}/bin/get-wsound-flags --libs`
-+WRASTERCFLAGS = `${BUILDLINK_DIR}/bin/get-wraster-flags --cflags`
-+WRASTERLFLAGS = `${BUILDLINK_DIR}/bin/get-wraster-flags --lflags`
-+WRASTERLIBS = `${BUILDLINK_DIR}/bin/get-wraster-flags --libs`
++WSOUNDCFLAGS = `${GET_WSOUND_FLAGS} --cflags`
++WSOUNDLFLAGS = `${GET_WSOUND_FLAGS} --lflags`
++WSOUNDLIBS = `${GET_WSOUND_FLAGS} --libs`
++WRASTERCFLAGS = `${GET_WRASTER_FLAGS} --cflags`
++WRASTERLFLAGS = `${GET_WRASTER_FLAGS}} --lflags`
++WRASTERLIBS = `${GET_WRASTER_FLAGS} --libs`
  WINGSLIBS = -lWINGs -lPropList
  
  STD_INCLUDES = $(WRASTERCFLAGS) $(WSOUNDCFLAGS)
diff --git a/audio/xcdplayer/Makefile b/audio/xcdplayer/Makefile
index 562140b84ef..3baeeaecdaa 100644
--- a/audio/xcdplayer/Makefile
+++ b/audio/xcdplayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/07/02 21:37:41 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2001/08/22 17:38:56 jlam Exp $
 # FreeBSD Id: Makefile,v 1.8 1997/04/01 23:08:24 swallace Exp
 #
 
@@ -11,7 +11,6 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	packages@netbsd.org
 COMMENT=	CD player for X
 
-USE_BUILDLINK_ONLY=	yes
-USE_IMAKE=		yes
+USE_IMAKE=	yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmcd/Makefile b/audio/xmcd/Makefile
index 409c45dffbe..cd78255e1e6 100644
--- a/audio/xmcd/Makefile
+++ b/audio/xmcd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2001/07/24 16:00:01 nra Exp $
+# $NetBSD: Makefile,v 1.27 2001/08/22 17:38:56 jlam Exp $
 #
 
 DISTNAME=	xmcd-3.0.1
@@ -10,11 +10,10 @@ HOMEPAGE=	http://www.ibiblio.org/tkan/xmcd/
 COMMENT=	Motif CD player
 
 WRKSRC=		${WRKDIR}/xmcd-3.0
-USE_BUILDLINK_ONLY=	yes
-USE_NCURSES=		yes
-USE_IMAKE=		yes
-IS_INTERACTIVE=		yes	# asks a lot of questions
-MAKE_ENV+=		SHELL=${SH}
+USE_NCURSES=	yes
+USE_IMAKE=	yes
+IS_INTERACTIVE=	yes	# asks a lot of questions
+MAKE_ENV+=	SHELL=${SH}
 
 pre-install:
 	cd ${WRKSRC} && \
diff --git a/audio/xmix/Makefile b/audio/xmix/Makefile
index 5164e379729..9d971fb136a 100644
--- a/audio/xmix/Makefile
+++ b/audio/xmix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/07/02 21:42:30 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2001/08/22 17:38:57 jlam Exp $
 # FreeBSD Id: Makefile,v 1.5 1996/11/18 13:56:53 asami Exp 
 #
 
@@ -12,7 +12,6 @@ PATCHFILES=		xmix-2.1.mixers.patch
 MAINTAINER=		packages@netbsd.org
 COMMENT=		Mixer for X Window System
 
-USE_BUILDLINK_ONLY=	yes
 USE_IMAKE=		yes
 WRKSRC=			${WRKDIR}/xmix
 
diff --git a/audio/xmmix/Makefile b/audio/xmmix/Makefile
index e9ee17559b0..98dc794d3fd 100644
--- a/audio/xmmix/Makefile
+++ b/audio/xmmix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2001/07/01 21:40:27 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2001/08/22 17:38:57 jlam Exp $
 # FreeBSD ID: Makefile,v 1.5 1997/09/08 13:37:47 tg Exp
 #
 
@@ -10,8 +10,7 @@ MAINTAINER=	augustss@cs.chalmers.se
 HOMEPAGE=	http://sunsite.unc.edu/~cddb/xmmix/index.html
 COMMENT=	X interface to the audio mixer device
 
-USE_BUILDLINK_ONLY=	yes
-USE_IMAKE=		yes
+USE_IMAKE=	yes
 
 post-patch:
 	for file in ${WRKSRC}/XMmix.ad ${WRKSRC}/resource.h; do		\
diff --git a/audio/xmradio/Makefile b/audio/xmradio/Makefile
index 252d7436e36..69b3d1cb01d 100644
--- a/audio/xmradio/Makefile
+++ b/audio/xmradio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/07/02 08:17:10 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2001/08/22 17:38:57 jlam Exp $
 
 DISTNAME=	xmradio-1.0
 CATEGORIES=	audio
@@ -13,8 +13,7 @@ DEPENDS+=	sox>=12.16:../sox
 ONLY_FOR_PLATFORM=	NetBSD-1.4[Y-Z]-* NetBSD-1.4Z[A-Z]-i386 \
 			NetBSD-1.5_ALPHA-i386 NetBSD-1.[5-9]*-*
 
-USE_BUILDLINK_ONLY=	YES
-USE_IMAKE=		YES
+USE_IMAKE=	YES
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xmradio