Use x11.buildlink.mk instead of USE_X11. Also convert hard-coded references

to ${X11BASE} in the header and library search paths into references to
${LOCALBASE}/share/x11-links.  These packages should now be strongly-
buildlinked regardless of whether xpkgwedge is installed.

Changes well-tested on NetBSD-1.5X/i386 with and without xpkgwedge and
lightly-tested on NetBSD-1.5.1/alpha without xpkgwedge.

19 files changed, 43 insertions, 48 deletions

diff --git a/audio/gqmpeg/Makefile b/audio/gqmpeg/Makefile
index caf6a689c4f..33c0613e2d2 100644
--- a/audio/gqmpeg/Makefile
+++ b/audio/gqmpeg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2001/08/24 08:43:13 lukem Exp $
+# $NetBSD: Makefile,v 1.42 2001/08/29 22:41:00 jlam Exp $
 # FreeBSD Id: Makefile,v 1.6 1998/12/28 01:02:05 vanilla Exp
 
 DISTNAME=		gqmpeg-0.9.0
@@ -30,4 +30,5 @@ pre-install:
 .include "../../devel/gettext-lib/buildlink.mk"
 .include "../../graphics/gdk-pixbuf/buildlink.mk"
 .include "../../x11/gtk/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/snd/Makefile b/audio/snd/Makefile
index 2bb15d71894..34f0af599c0 100644
--- a/audio/snd/Makefile
+++ b/audio/snd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2001/07/16 19:50:50 nra Exp $
+# $NetBSD: Makefile,v 1.23 2001/08/29 22:41:01 jlam Exp $
 #
 
 DISTNAME=		snd
@@ -27,4 +27,5 @@ do-install:
 
 .include "../../graphics/xpm/buildlink.mk"
 .include "../../x11/lesstif/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/snd/distinfo b/audio/snd/distinfo
index b16561dc4b3..3a26f7cfa5f 100644
--- a/audio/snd/distinfo
+++ b/audio/snd/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2001/06/30 21:14:10 jlam Exp $
+$NetBSD: distinfo,v 1.4 2001/08/29 22:41:01 jlam Exp $
 
 SHA1 (snd.tar.gz) = cb48922170602f30553b604bda039974c1706b65
 Size (snd.tar.gz) = 735422 bytes
@@ -6,7 +6,7 @@ SHA1 (patch-aa) = 3aa0e5bcc54730628d220515919d8dbf11951c1a
 SHA1 (patch-ab) = de7027da166eda24e9f19c8ffc86192027e7eee1
 SHA1 (patch-ac) = d3073b7d102abcd05d7588b57eb8a053f20b74a7
 SHA1 (patch-ad) = 19a185e3e5a9800e56c904c06613b5d9645e6d17
-SHA1 (patch-ae) = c4b33c31fb70107f0501228f3c1f66512febd945
+SHA1 (patch-ae) = 3366a8151ceab8a835e18417d61cb5d8a62d4bd0
 SHA1 (patch-af) = a8cf1931093397bcf88be08d36bd11efd9d4c161
 SHA1 (patch-ag) = 7a19ce85c0c45ef2844ca22bca74de9238aa3ad1
 SHA1 (patch-ah) = f744861a8736e4acf498a751b42708e0922d5ff2
diff --git a/audio/snd/patches/patch-ae b/audio/snd/patches/patch-ae
index d9c10022176..fbe7108bd83 100644
--- a/audio/snd/patches/patch-ae
+++ b/audio/snd/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.7 2001/06/30 21:14:10 jlam Exp $
+$NetBSD: patch-ae,v 1.8 2001/08/29 22:41:01 jlam Exp $
 
 --- makefile.netbsd.orig	Mon Aug  9 19:22:24 1999
 +++ makefile.netbsd	Mon Aug  9 19:25:36 1999
@@ -6,8 +6,8 @@ $NetBSD: patch-ae,v 1.7 2001/06/30 21:14:10 jlam Exp $
 +# Snd make file for NetBSD, assuming Motif is available (audio currently stubbed out)
 +
 +#CC = gcc
-+#CFLAGS = -O2 -DXPM -DHAVE_OSS -I${X11BASE}/include -I${BUILDLINK_DIR}/include
-+CFLAGS += -DXPM -DHAVE_OSS -I${X11BASE}/include -I${BUILDLINK_DIR}/include
++#CFLAGS = -O2 -DXPM -DHAVE_OSS -I${BUILDLINK_X11_DIR}/include -I${BUILDLINK_DIR}/include
++CFLAGS += -DXPM -DHAVE_OSS -I${BUILDLINK_X11_DIR}/include -I${BUILDLINK_DIR}/include
 +CFLAGS += -g
 +
 +LIBS = ${LDFLAGS} -lMrm -lXm -lXpm -lXmu -lSM -lXt -lXext -lX11 -lm -lossaudio
diff --git a/audio/wsoundserver/Makefile b/audio/wsoundserver/Makefile
index 00a3e03d875..6ef0f15b147 100644
--- a/audio/wsoundserver/Makefile
+++ b/audio/wsoundserver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/07/24 10:39:01 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2001/08/29 22:41:01 jlam Exp $
 #
 
 DISTNAME=	WSoundServer-0.4.0
@@ -18,15 +18,6 @@ GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
-.include "../../mk/bsd.prefs.mk"
-
-.if (${OPSYS} == SunOS)
-CPPFLAGS+=	-I${X11BASE}/include
-MAKE_ENV+=	OSSAUDIO_LIBS=
-.else
-MAKE_ENV+=	OSSAUDIO_LIBS=-lossaudio
-.endif
-
 post-patch:
 	@cd ${WRKSRC}/doc && for f in *; do				\
 		${SED} "s/1x/1/g" $$f > $$f.tmp && ${MV} $$f.tmp $$f;	\
@@ -46,4 +37,5 @@ post-install:
 .include "../../devel/libdockapp/buildlink.mk"
 .include "../../wm/windowmaker/buildlink.mk"
 .include "../../mk/ossaudio.buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/wsoundserver/distinfo b/audio/wsoundserver/distinfo
index 351e6025807..f9cafd34f62 100644
--- a/audio/wsoundserver/distinfo
+++ b/audio/wsoundserver/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2001/07/24 10:39:01 jlam Exp $
+$NetBSD: distinfo,v 1.5 2001/08/29 22:41:02 jlam Exp $
 
 SHA1 (WSoundServer-0.4.0.tar.gz) = b414025f0f19e66cd9146546ecf634564941b1e4
 Size (WSoundServer-0.4.0.tar.gz) = 147044 bytes
-SHA1 (patch-ac) = a8968a49ad6d2e3ae755e7f980704819c15d9654
+SHA1 (patch-ac) = 8595912bdc913dae46c82bc3a59fc96318350982
 SHA1 (patch-ad) = 998cc4b2f87c4bce4d8c32e42aa9c06134633252
 SHA1 (patch-ae) = 3a008dc50f6e78070ceb78b1f564d7c94be2dfea
 SHA1 (patch-af) = 1ea20d0e00d19a2c23bb8e07cdf182e43db28ca8
diff --git a/audio/wsoundserver/patches/patch-ac b/audio/wsoundserver/patches/patch-ac
index 9cc9c7ae240..40a70bb48f9 100644
--- a/audio/wsoundserver/patches/patch-ac
+++ b/audio/wsoundserver/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.2 2001/07/07 17:15:06 tron Exp $
+$NetBSD: patch-ac,v 1.3 2001/08/29 22:41:02 jlam Exp $
 
 --- wslib/Makefile.in.orig	Fri Mar 31 22:10:25 2000
 +++ wslib/Makefile.in
@@ -7,7 +7,7 @@ $NetBSD: patch-ac,v 1.2 2001/07/07 17:15:06 tron Exp $
  
  libwsound.la: $(libwsound_la_OBJECTS) $(libwsound_la_DEPENDENCIES)
 -	$(LINK) -rpath $(libdir) $(libwsound_la_LDFLAGS) $(libwsound_la_OBJECTS) $(libwsound_la_LIBADD) $(LIBS)
-+	$(LINK) -rpath $(libdir) $(libwsound_la_LDFLAGS) $(libwsound_la_OBJECTS) $(libwsound_la_LIBADD) $(LIBS) $(OSSAUDIO_LIBS)
++	$(LINK) -rpath $(libdir) $(libwsound_la_LDFLAGS) $(libwsound_la_OBJECTS) $(libwsound_la_LIBADD) $(LIBS) ${LIBOSSAUDIO}
  
  mostlyclean-noinstPROGRAMS:
  
diff --git a/audio/xmms-crossfade/Makefile b/audio/xmms-crossfade/Makefile
index c8a583656d5..d94c399d064 100644
--- a/audio/xmms-crossfade/Makefile
+++ b/audio/xmms-crossfade/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/08/23 13:57:57 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2001/08/29 22:41:03 jlam Exp $
 #
 
 DISTNAME=		xmms-crossfade-0.2.9
@@ -13,7 +13,6 @@ COMMENT=		Crossfading/Gapless Plugin for XMMS
 USE_BUILDLINK_ONLY=	YES
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
-USE_X11=		YES
 
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 LDFLAGS+=		${LIBOSSAUDIO}
@@ -21,4 +20,5 @@ CPPFLAGS+=		-D_POSIX_THREAD_SYSCALL_SOFT=1
 
 .include "../../audio/xmms/buildlink.mk"
 .include "../../mk/ossaudio.buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms-dflowers/Makefile b/audio/xmms-dflowers/Makefile
index 3dd0e0c1abd..1553548a853 100644
--- a/audio/xmms-dflowers/Makefile
+++ b/audio/xmms-dflowers/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/08/23 13:54:51 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2001/08/29 22:41:03 jlam Exp $
 #
 
 DISTNAME=	dflowers-1.2
@@ -11,9 +11,9 @@ HOMEPAGE=	http://hem.passagen.se/joakime/linuxapp.html
 COMMENT=	XMMS plugin for dual flower scope
 
 USE_BUILDLINK_ONLY=	YES
-USE_X11=		YES
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
 .include "../../audio/xmms/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms-dscope/Makefile b/audio/xmms-dscope/Makefile
index 38be48c30eb..1ddf744480a 100644
--- a/audio/xmms-dscope/Makefile
+++ b/audio/xmms-dscope/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/08/17 21:16:48 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2001/08/29 22:41:03 jlam Exp $
 #
 
 DISTNAME=	dscope-1.2
@@ -11,11 +11,11 @@ HOMEPAGE=	http://hem.passagen.se/joakime/linuxapp.html
 COMMENT=	XMMS plugin for dual scope
 
 USE_BUILDLINK_ONLY=	YES
-USE_X11=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL=		YES
 
 pre-build:
 		cd ${WRKSRC} ; ${MAKE} clean
 
 .include "../../audio/xmms/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms-dspectogram/Makefile b/audio/xmms-dspectogram/Makefile
index b278390a591..d75b1ed34cf 100644
--- a/audio/xmms-dspectogram/Makefile
+++ b/audio/xmms-dspectogram/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/08/17 21:16:48 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2001/08/29 22:41:03 jlam Exp $
 #
 
 DISTNAME=	dspectogram-1.2
@@ -11,11 +11,11 @@ HOMEPAGE=	http://hem.passagen.se/joakime/linuxapp.html
 COMMENT=	XMMS plugin for dual spectogram
 
 USE_BUILDLINK_ONLY=	YES
-USE_X11=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL=		YES
 
 pre-build:
 		cd ${WRKSRC} ; ${MAKE} clean
 
 .include "../../audio/xmms/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms-dspectralizer/Makefile b/audio/xmms-dspectralizer/Makefile
index 33f38c6bc15..79852adb425 100644
--- a/audio/xmms-dspectralizer/Makefile
+++ b/audio/xmms-dspectralizer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/08/23 14:07:52 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2001/08/29 22:41:03 jlam Exp $
 #
 
 DISTNAME=	dspectral-1.2
@@ -11,11 +11,11 @@ HOMEPAGE=	http://hem.passagen.se/joakime/linuxapp.html
 COMMENT=	XMMS plugin for dual spectral analyzer
 
 USE_BUILDLINK_ONLY=	YES
-USE_X11=		YES
 USE_LIBTOOL=		YES
 
 pre-build:
 		cd ${WRKSRC} ; ${MAKE} clean
 
 .include "../../audio/xmms/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms-gdancer/Makefile b/audio/xmms-gdancer/Makefile
index 3f29a107904..6539f987c5a 100644
--- a/audio/xmms-gdancer/Makefile
+++ b/audio/xmms-gdancer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/08/23 14:07:32 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2001/08/29 22:41:04 jlam Exp $
 #
 
 DISTNAME=	gdancer-0.4.3
@@ -12,9 +12,9 @@ COMMENT=	XMMS plugin to animate characters to the beat of the music
 
 USE_BUILDLINK_ONLY=	YES
 GNU_CONFIGURE=		YES
-USE_X11=		YES
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
 .include "../../audio/xmms/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms-neato/Makefile b/audio/xmms-neato/Makefile
index 3c6a674a4f5..22404578f0c 100644
--- a/audio/xmms-neato/Makefile
+++ b/audio/xmms-neato/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/08/18 05:02:21 hubertf Exp $
+# $NetBSD: Makefile,v 1.2 2001/08/29 22:41:04 jlam Exp $
 #
 
 DISTNAME=	neato
@@ -12,7 +12,6 @@ COMMENT=	Circle effect XMMS plugin
 
 GNU_CONFIGURE=	yes
 USE_BUILDLINK_ONLY=	yes
-USE_X11=	yes
 USE_LIBTOOL=	yes
 USE_GMAKE=	yes
 LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
@@ -33,4 +32,5 @@ post-extract:
 		${MAKE} distclean
 
 .include "../../audio/xmms/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms-vismsa/Makefile b/audio/xmms-vismsa/Makefile
index cc2c79fe4d5..162721ee686 100644
--- a/audio/xmms-vismsa/Makefile
+++ b/audio/xmms-vismsa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/08/18 02:52:20 hubertf Exp $
+# $NetBSD: Makefile,v 1.2 2001/08/29 22:41:04 jlam Exp $
 #
 
 DISTNAME=	vismsa-xmms-plugin-0.2
@@ -11,11 +11,11 @@ HOMEPAGE=	http://a.godau.org/
 COMMENT=	vis plugin similar to the Spectrum Analyser from Open Cubic Player
 
 USE_BUILDLINK_ONLY=	YES
-USE_X11=	yes
-USE_LIBTOOL=	yes
+USE_LIBTOOL=		YES
 
 pre-build:
 		cd ${WRKSRC} ; ${MAKE} clean
 
 .include "../../audio/xmms/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms/distinfo b/audio/xmms/distinfo
index 2871493d25a..f4d82d0c42b 100644
--- a/audio/xmms/distinfo
+++ b/audio/xmms/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2001/08/11 20:51:24 fredb Exp $
+$NetBSD: distinfo,v 1.7 2001/08/29 22:41:02 jlam Exp $
 
 SHA1 (xmms-1.2.5.tar.gz) = 64d64a6db0b08ba91a135229437c384da7dba1e5
 Size (xmms-1.2.5.tar.gz) = 2414840 bytes
@@ -12,8 +12,8 @@ SHA1 (patch-ai) = d05ba576dc40dd29d59c571fbab369d83fbe0b06
 SHA1 (patch-aj) = 95e965c5033dea5d2b0be2a22058f19504da0031
 SHA1 (patch-ak) = 9c89fc3014c1109b14f56c4bdaae7782f2531529
 SHA1 (patch-al) = 3150ee9972911c5152f14a0771d9e9a2cbcb107f
-SHA1 (patch-am) = 3f44eb6ea71c47133482142f4d18ff60c230763c
-SHA1 (patch-an) = 9055b76be68766955311b8f388afd60c604c0c34
+SHA1 (patch-am) = 0de11b998fcf90f64c2e8442edc427e3bc49653c
+SHA1 (patch-an) = 2a622693d825c631e36f73bc35a9639c40071564
 SHA1 (patch-ao) = 428e1083a104358d752ddc483310a97764cb6979
 SHA1 (patch-ap) = 493a4d81960b4d11548b8f277c00b8315339ac02
 SHA1 (patch-aq) = 3eb19fbebfc0ea68cd6703b6b3d1a706406b1aee
diff --git a/audio/xmms/patches/patch-am b/audio/xmms/patches/patch-am
index 9d5f03c5cfe..a084ab3823d 100644
--- a/audio/xmms/patches/patch-am
+++ b/audio/xmms/patches/patch-am
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.2 2001/05/20 20:52:24 rh Exp $
+$NetBSD: patch-am,v 1.3 2001/08/29 22:41:02 jlam Exp $
 
 --- Output/OSS/Makefile.in.orig	Tue Nov 28 01:56:02 2000
 +++ Output/OSS/Makefile.in
@@ -7,7 +7,7 @@ $NetBSD: patch-am,v 1.2 2001/05/20 20:52:24 rh Exp $
  
  libOSS_la_LDFLAGS = $(ossldflags)
 -libOSS_la_LIBADD = @GTK_LIBS@ @PTHREAD_LIBS@
-+libOSS_la_LIBADD = @GTK_LIBS@ @PTHREAD_LIBS@ -lossaudio
++libOSS_la_LIBADD = @GTK_LIBS@ @PTHREAD_LIBS@ ${LIBOSSAUDIO}
  libOSS_la_SOURCES = $(osssources)
  INCLUDES = @GTK_CFLAGS@ @OSS_CFLAGS@ -I$(top_builddir)/intl
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/audio/xmms/patches/patch-an b/audio/xmms/patches/patch-an
index e5e0dd06eb9..e17529159d3 100644
--- a/audio/xmms/patches/patch-an
+++ b/audio/xmms/patches/patch-an
@@ -1,4 +1,4 @@
-$NetBSD: patch-an,v 1.3 2001/06/21 16:38:34 rh Exp $
+$NetBSD: patch-an,v 1.4 2001/08/29 22:41:02 jlam Exp $
 
 --- Input/cdaudio/Makefile.in.orig	Mon Jun 18 21:55:46 2001
 +++ Input/cdaudio/Makefile.in
@@ -7,7 +7,7 @@ $NetBSD: patch-an,v 1.3 2001/06/21 16:38:34 rh Exp $
  INCLUDES = @GTK_CFLAGS@ @XML_CFLAGS@ -I$(top_buiddir)/intl
  libcdaudio_la_LDFLAGS = $(cdaudioldflags)
 -libcdaudio_la_LIBADD = @GTK_LIBS@ @XML_LIBS@
-+libcdaudio_la_LIBADD = @GTK_LIBS@ @XML_LIBS@ -lossaudio
++libcdaudio_la_LIBADD = @GTK_LIBS@ @XML_LIBS@ ${LIBOSSAUDIO}
  libcdaudio_la_SOURCES = $(cdaudiosources)
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = ../../config.h ../../xmms/i18n.h
diff --git a/audio/xsidplay/Makefile b/audio/xsidplay/Makefile
index 815cac61a3a..821f6e5776f 100644
--- a/audio/xsidplay/Makefile
+++ b/audio/xsidplay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2001/06/26 18:32:26 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2001/08/29 22:41:04 jlam Exp $
 #
 
 DISTNAME=	xsidplay-1_5_4
@@ -27,4 +27,5 @@ do-install:
 
 .include "../../audio/libsidplay/buildlink.mk"
 .include "../../x11/qt2-libs/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"