x11.buildlink.mk needs to be included before any buildlink.mk files that

use X11_BUILDLINK_MK as a test value.  Generally just reordering the
inclusions so that x11.buildlink.mk comes before the other buildlink.mk
files will make everthing work.

13 files changed, 26 insertions, 26 deletions

diff --git a/audio/gmp3info/Makefile b/audio/gmp3info/Makefile
index 2354429cfca..a10857ad012 100644
--- a/audio/gmp3info/Makefile
+++ b/audio/gmp3info/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/10/18 05:33:34 tron Exp $
+# $NetBSD: Makefile,v 1.7 2001/10/23 13:14:43 jlam Exp $
 
 DISTNAME=	mp3info-0.8.2
 PKGNAME=	g${DISTNAME}
@@ -24,7 +24,7 @@ HAVE_WGETNSTR!=		${GREP} -cw wgetnstr /usr/include/curses.h || ${TRUE}
 USE_NCURSES=		YES
 .endif
 
+.include "../../mk/x11.buildlink.mk"
 .include "../../devel/ncurses/buildlink.mk"
 .include "../../x11/gtk/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/gqmpeg/Makefile b/audio/gqmpeg/Makefile
index 33c0613e2d2..b0cb59d0846 100644
--- a/audio/gqmpeg/Makefile
+++ b/audio/gqmpeg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2001/08/29 22:41:00 jlam Exp $
+# $NetBSD: Makefile,v 1.43 2001/10/23 13:14:43 jlam Exp $
 # FreeBSD Id: Makefile,v 1.6 1998/12/28 01:02:05 vanilla Exp
 
 DISTNAME=		gqmpeg-0.9.0
@@ -27,8 +27,8 @@ pre-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/gnome/apps/Multimedia
 	${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps
 
+.include "../../mk/x11.buildlink.mk"
 .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 d97711e735c..72874bea29c 100644
--- a/audio/snd/Makefile
+++ b/audio/snd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2001/09/09 20:36:13 agc Exp $
+# $NetBSD: Makefile,v 1.26 2001/10/23 13:14:43 jlam Exp $
 #
 
 DISTNAME=		snd
@@ -25,7 +25,7 @@ do-install:
 	${INSTALL_DATA_DIR} ${HTMLDIR}
 	cd ${WRKSRC} ; ${INSTALL_DATA} *.gif *.html *.txt README.Snd ${HTMLDIR}
 
+.include "../../mk/x11.buildlink.mk"
 .include "../../graphics/xpm/buildlink.mk"
 .include "../../mk/motif.buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/wsoundserver/Makefile b/audio/wsoundserver/Makefile
index b7cece28db6..d0f16b1b797 100644
--- a/audio/wsoundserver/Makefile
+++ b/audio/wsoundserver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/10/05 13:23:28 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2001/10/23 13:14:44 jlam Exp $
 #
 
 DISTNAME=	WSoundServer-0.4.0
@@ -33,10 +33,10 @@ post-patch:
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/WMSound ${PREFIX}/etc/WindowMaker
 
+.include "../../mk/x11.buildlink.mk"
 .include "../../audio/libaudiofile/buildlink.mk"
 .include "../../devel/libdockapp/buildlink.mk"
 .include "../../devel/libproplist/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/xmms-crossfade/Makefile b/audio/xmms-crossfade/Makefile
index d94c399d064..e9da0fc274f 100644
--- a/audio/xmms-crossfade/Makefile
+++ b/audio/xmms-crossfade/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/08/29 22:41:03 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2001/10/23 13:14:44 jlam Exp $
 #
 
 DISTNAME=		xmms-crossfade-0.2.9
@@ -18,7 +18,7 @@ LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 LDFLAGS+=		${LIBOSSAUDIO}
 CPPFLAGS+=		-D_POSIX_THREAD_SYSCALL_SOFT=1
 
+.include "../../mk/x11.buildlink.mk"
 .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 1553548a853..277d2575570 100644
--- a/audio/xmms-dflowers/Makefile
+++ b/audio/xmms-dflowers/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/08/29 22:41:03 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2001/10/23 13:14:44 jlam Exp $
 #
 
 DISTNAME=	dflowers-1.2
@@ -14,6 +14,6 @@ USE_BUILDLINK_ONLY=	YES
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
-.include "../../audio/xmms/buildlink.mk"
 .include "../../mk/x11.buildlink.mk"
+.include "../../audio/xmms/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms-dscope/Makefile b/audio/xmms-dscope/Makefile
index 1ddf744480a..cfbb302a75a 100644
--- a/audio/xmms-dscope/Makefile
+++ b/audio/xmms-dscope/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/08/29 22:41:03 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2001/10/23 13:14:44 jlam Exp $
 #
 
 DISTNAME=	dscope-1.2
@@ -16,6 +16,6 @@ USE_LIBTOOL=		YES
 pre-build:
 		cd ${WRKSRC} ; ${MAKE} clean
 
-.include "../../audio/xmms/buildlink.mk"
 .include "../../mk/x11.buildlink.mk"
+.include "../../audio/xmms/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms-dspectogram/Makefile b/audio/xmms-dspectogram/Makefile
index d75b1ed34cf..a68f40274bf 100644
--- a/audio/xmms-dspectogram/Makefile
+++ b/audio/xmms-dspectogram/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/08/29 22:41:03 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2001/10/23 13:14:44 jlam Exp $
 #
 
 DISTNAME=	dspectogram-1.2
@@ -16,6 +16,6 @@ USE_LIBTOOL=		YES
 pre-build:
 		cd ${WRKSRC} ; ${MAKE} clean
 
-.include "../../audio/xmms/buildlink.mk"
 .include "../../mk/x11.buildlink.mk"
+.include "../../audio/xmms/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms-dspectralizer/Makefile b/audio/xmms-dspectralizer/Makefile
index 79852adb425..1dc5267377d 100644
--- a/audio/xmms-dspectralizer/Makefile
+++ b/audio/xmms-dspectralizer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/08/29 22:41:03 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2001/10/23 13:14:45 jlam Exp $
 #
 
 DISTNAME=	dspectral-1.2
@@ -16,6 +16,6 @@ USE_LIBTOOL=		YES
 pre-build:
 		cd ${WRKSRC} ; ${MAKE} clean
 
-.include "../../audio/xmms/buildlink.mk"
 .include "../../mk/x11.buildlink.mk"
+.include "../../audio/xmms/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms-gdancer/Makefile b/audio/xmms-gdancer/Makefile
index 6539f987c5a..41f76fe05e5 100644
--- a/audio/xmms-gdancer/Makefile
+++ b/audio/xmms-gdancer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/08/29 22:41:04 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2001/10/23 13:14:45 jlam Exp $
 #
 
 DISTNAME=	gdancer-0.4.3
@@ -15,6 +15,6 @@ GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
-.include "../../audio/xmms/buildlink.mk"
 .include "../../mk/x11.buildlink.mk"
+.include "../../audio/xmms/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms-neato/Makefile b/audio/xmms-neato/Makefile
index 22404578f0c..420793906e2 100644
--- a/audio/xmms-neato/Makefile
+++ b/audio/xmms-neato/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/08/29 22:41:04 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2001/10/23 13:14:45 jlam Exp $
 #
 
 DISTNAME=	neato
@@ -31,6 +31,6 @@ post-extract:
 		${CHMOD} +x install-sh ; \
 		${MAKE} distclean
 
-.include "../../audio/xmms/buildlink.mk"
 .include "../../mk/x11.buildlink.mk"
+.include "../../audio/xmms/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms-vismsa/Makefile b/audio/xmms-vismsa/Makefile
index 162721ee686..fce48543c89 100644
--- a/audio/xmms-vismsa/Makefile
+++ b/audio/xmms-vismsa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/08/29 22:41:04 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2001/10/23 13:14:45 jlam Exp $
 #
 
 DISTNAME=	vismsa-xmms-plugin-0.2
@@ -16,6 +16,6 @@ USE_LIBTOOL=		YES
 pre-build:
 		cd ${WRKSRC} ; ${MAKE} clean
 
-.include "../../audio/xmms/buildlink.mk"
 .include "../../mk/x11.buildlink.mk"
+.include "../../audio/xmms/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/xsidplay/Makefile b/audio/xsidplay/Makefile
index 821f6e5776f..9cf8cd2d11c 100644
--- a/audio/xsidplay/Makefile
+++ b/audio/xsidplay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2001/08/29 22:41:04 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2001/10/23 13:14:45 jlam Exp $
 #
 
 DISTNAME=	xsidplay-1_5_4
@@ -25,7 +25,7 @@ CONFIGURE_ARGS+=	--with-qt-dir=${BUILDLINK_QTDIR}
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/src/xsidplay ${PREFIX}/bin
 
+.include "../../mk/x11.buildlink.mk"
 .include "../../audio/libsidplay/buildlink.mk"
 .include "../../x11/qt2-libs/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"