I am a triple idiot. The only relevant variable that x11.buildlink.mk

redefines about which buildlink.mk files would care is BUILDLINK_X11_DIR,
which points to the location of the X11R6 hierarchy used during building.
If x11.buildlink.mk isn't included, then BUILDLINK_X11_DIR defaults to
${X11BASE} (set in bsd.pkg.mk), so its value is always safe to use.  Remove
the ifdefs surrounding the use of BUILDLINK_X11_DIR in tk/buildlink.mk and
revert changes to move x11.buildlink.mk before the other buildlink.mk files.

13 files changed, 26 insertions, 26 deletions

diff --git a/audio/gmp3info/Makefile b/audio/gmp3info/Makefile
index a10857ad012..c28e6f846e7 100644
--- a/audio/gmp3info/Makefile
+++ b/audio/gmp3info/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/10/23 13:14:43 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2001/10/24 22:10: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 b0cb59d0846..24cee3c1adc 100644
--- a/audio/gqmpeg/Makefile
+++ b/audio/gqmpeg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2001/10/23 13:14:43 jlam Exp $
+# $NetBSD: Makefile,v 1.44 2001/10/24 22:10:44 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 72874bea29c..1d0de9e8572 100644
--- a/audio/snd/Makefile
+++ b/audio/snd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2001/10/23 13:14:43 jlam Exp $
+# $NetBSD: Makefile,v 1.27 2001/10/24 22:10:44 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 d0f16b1b797..93f361d4752 100644
--- a/audio/wsoundserver/Makefile
+++ b/audio/wsoundserver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/10/23 13:14:44 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2001/10/24 22:10: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 e9da0fc274f..e6fa77026d8 100644
--- a/audio/xmms-crossfade/Makefile
+++ b/audio/xmms-crossfade/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/10/23 13:14:44 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2001/10/24 22:10: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 277d2575570..4b79da20837 100644
--- a/audio/xmms-dflowers/Makefile
+++ b/audio/xmms-dflowers/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/10/23 13:14:44 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2001/10/24 22:10:45 jlam Exp $
 #
 
 DISTNAME=	dflowers-1.2
@@ -14,6 +14,6 @@ USE_BUILDLINK_ONLY=	YES
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
-.include "../../mk/x11.buildlink.mk"
 .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 cfbb302a75a..0964440227b 100644
--- a/audio/xmms-dscope/Makefile
+++ b/audio/xmms-dscope/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/10/23 13:14:44 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2001/10/24 22:10:45 jlam Exp $
 #
 
 DISTNAME=	dscope-1.2
@@ -16,6 +16,6 @@ USE_LIBTOOL=		YES
 pre-build:
 		cd ${WRKSRC} ; ${MAKE} clean
 
-.include "../../mk/x11.buildlink.mk"
 .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 a68f40274bf..64fca03603a 100644
--- a/audio/xmms-dspectogram/Makefile
+++ b/audio/xmms-dspectogram/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/10/23 13:14:44 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2001/10/24 22:10:45 jlam Exp $
 #
 
 DISTNAME=	dspectogram-1.2
@@ -16,6 +16,6 @@ USE_LIBTOOL=		YES
 pre-build:
 		cd ${WRKSRC} ; ${MAKE} clean
 
-.include "../../mk/x11.buildlink.mk"
 .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 1dc5267377d..68688d0eb5a 100644
--- a/audio/xmms-dspectralizer/Makefile
+++ b/audio/xmms-dspectralizer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/10/23 13:14:45 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2001/10/24 22:10:45 jlam Exp $
 #
 
 DISTNAME=	dspectral-1.2
@@ -16,6 +16,6 @@ USE_LIBTOOL=		YES
 pre-build:
 		cd ${WRKSRC} ; ${MAKE} clean
 
-.include "../../mk/x11.buildlink.mk"
 .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 41f76fe05e5..9e2dc35e62e 100644
--- a/audio/xmms-gdancer/Makefile
+++ b/audio/xmms-gdancer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/10/23 13:14:45 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2001/10/24 22:10:46 jlam Exp $
 #
 
 DISTNAME=	gdancer-0.4.3
@@ -15,6 +15,6 @@ GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
-.include "../../mk/x11.buildlink.mk"
 .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 420793906e2..5bb15f8f36f 100644
--- a/audio/xmms-neato/Makefile
+++ b/audio/xmms-neato/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/10/23 13:14:45 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2001/10/24 22:10:46 jlam Exp $
 #
 
 DISTNAME=	neato
@@ -31,6 +31,6 @@ post-extract:
 		${CHMOD} +x install-sh ; \
 		${MAKE} distclean
 
-.include "../../mk/x11.buildlink.mk"
 .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 fce48543c89..c128f32e005 100644
--- a/audio/xmms-vismsa/Makefile
+++ b/audio/xmms-vismsa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/10/23 13:14:45 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2001/10/24 22:10:46 jlam Exp $
 #
 
 DISTNAME=	vismsa-xmms-plugin-0.2
@@ -16,6 +16,6 @@ USE_LIBTOOL=		YES
 pre-build:
 		cd ${WRKSRC} ; ${MAKE} clean
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../audio/xmms/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/xsidplay/Makefile b/audio/xsidplay/Makefile
index 9cf8cd2d11c..7a1587c5e1b 100644
--- a/audio/xsidplay/Makefile
+++ b/audio/xsidplay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2001/10/23 13:14:45 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2001/10/24 22:10:46 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"