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.

16 files changed, 32 insertions, 32 deletions

diff --git a/games/baduki/Makefile b/games/baduki/Makefile
index d29bc41ba37..07b30ead3d5 100644
--- a/games/baduki/Makefile
+++ b/games/baduki/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2001/10/23 13:14:52 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2001/10/24 22:10:55 jlam Exp $
 
 DISTNAME=	baduki-0.2.9
 CATEGORIES=	games
@@ -14,7 +14,7 @@ BUILD_USES_MSGFMT=	YES
 
 CONFIGURE_ARGS+=	--without-included-gettext
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../devel/gettext-lib/buildlink.mk"
 .include "../../x11/gtk/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/clanbomber/Makefile b/games/clanbomber/Makefile
index 5dcb1c99893..7e605265487 100644
--- a/games/clanbomber/Makefile
+++ b/games/clanbomber/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/10/23 13:14:52 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2001/10/24 22:10:55 jlam Exp $
 
 DISTNAME=		clanbomber-1.01
 PKGNAME=		${DISTNAME}nb1
@@ -30,6 +30,6 @@ pre-build:
 		exit 1;							    \
 	fi;
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../graphics/clanlib/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/fire/Makefile b/games/fire/Makefile
index 748c2422480..2ae12a2a3f0 100644
--- a/games/fire/Makefile
+++ b/games/fire/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/10/23 13:14:52 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2001/10/24 22:10:55 jlam Exp $
 #
 
 DISTNAME=	fire-1.0
@@ -12,6 +12,6 @@ COMMENT=	organic fireworks demo
 USE_BUILDLINK_ONLY=	YES
 GNU_CONFIGURE=		YES
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../devel/SDL/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/freeciv-client-gtk/Makefile b/games/freeciv-client-gtk/Makefile
index e8455dfe463..a5f7ebaf14e 100644
--- a/games/freeciv-client-gtk/Makefile
+++ b/games/freeciv-client-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2001/10/23 13:14:52 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2001/10/24 22:10:55 jlam Exp $
 
 PKGNAME=		${DISTNAME:S/-/-client-gtk-/}
 COMMENT=		Freeciv client with GTK+ interface
@@ -18,8 +18,8 @@ do-install:
 	cd ${WRKSRC}/client; ${SETENV} ${MAKE_ENV} \
 		${MAKE_PROGRAM} ${MAKE_FLAGS} ${INSTALL_TARGET}
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../devel/zlib/buildlink.mk"
 .include "../../graphics/imlib/buildlink.mk"
 .include "../../x11/gtk/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/freeciv-client/Makefile b/games/freeciv-client/Makefile
index 6f6e3b7042c..9cd58d6031f 100644
--- a/games/freeciv-client/Makefile
+++ b/games/freeciv-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/10/23 13:14:52 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2001/10/24 22:10:56 jlam Exp $
 
 PKGNAME=		${DISTNAME:S/-/-client-/}
 COMMENT=		Freeciv client with Xaw interface
@@ -25,8 +25,8 @@ do-install:
 	cd ${WRKSRC}/client; ${SETENV} ${MAKE_ENV} \
 		${MAKE_PROGRAM} ${MAKE_FLAGS} ${INSTALL_TARGET}
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../devel/zlib/buildlink.mk"
 .include "../../graphics/xpm/buildlink.mk"
 .include "../../mk/xaw.buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/gnome-chess/Makefile b/games/gnome-chess/Makefile
index 71266155379..5a7c37c082c 100644
--- a/games/gnome-chess/Makefile
+++ b/games/gnome-chess/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/10/23 13:14:53 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2001/10/24 22:10:56 jlam Exp $
 
 DISTNAME=	gnome-chess-0.3.3
 CATEGORIES=	games gnome
@@ -11,6 +11,6 @@ COMMENT=	GNOME's graphical interface for playing chess
 GNU_CONFIGURE=	yes
 USE_X11BASE=	yes
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../x11/gnome-core/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/imaze/Makefile b/games/imaze/Makefile
index 9b76d2e9b97..62850ea09e8 100644
--- a/games/imaze/Makefile
+++ b/games/imaze/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2001/10/23 13:14:53 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2001/10/24 22:10:56 jlam Exp $
 
 DISTNAME=		imaze1.3
 PKGNAME=		imaze-1.3
@@ -19,6 +19,6 @@ USE_X11BASE=		yes
 post-build:
 	cd ${WRKSRC} && ${PAX} -rf ${DISTDIR}/imaze-sounds.tar
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../mk/motif.buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/kulki/Makefile b/games/kulki/Makefile
index 42e56958db7..035b08473e1 100644
--- a/games/kulki/Makefile
+++ b/games/kulki/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/10/23 13:14:53 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2001/10/24 22:10:56 jlam Exp $
 #
 
 DISTNAME=	kulki-1.01
@@ -29,6 +29,6 @@ do-install:
 	cd ${PREFIX}/share/kulki &&				\
 		( ${GUNZIP_CMD} -c ${WRKSRC}/images.tgz | ${GTAR} xf - )
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../x11/qt2-libs/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/lbreakout/Makefile b/games/lbreakout/Makefile
index f8a091c751a..35a2f1723c7 100644
--- a/games/lbreakout/Makefile
+++ b/games/lbreakout/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/10/23 13:14:54 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2001/10/24 22:10:56 jlam Exp $
 #
 
 DISTNAME=	lbreakout-010315
@@ -13,6 +13,6 @@ USE_BUILDLINK_ONLY=	YES
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--disable-sound
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../devel/SDL/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/nethack-qt/Makefile b/games/nethack-qt/Makefile
index ed7500a5340..68e0f05e0ef 100644
--- a/games/nethack-qt/Makefile
+++ b/games/nethack-qt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2001/10/23 13:14:54 jlam Exp $
+# $NetBSD: Makefile,v 1.29 2001/10/24 22:10:57 jlam Exp $
 #
 
 .include		"../nethack-lib/Makefile.common"
@@ -23,7 +23,7 @@ post-install:
 	@${CP} -f ${WRKSRC}/dat/x11tiles ${WRKSRC}/dat/tiles.xpm
 	@${INSTALL_DATA} ${WRKSRC}/dat/tiles.xpm ${PREFIX}/share/nethackdir
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../graphics/xpm/buildlink.mk"
 .include "../../x11/qt2-libs/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/nethack-x11/Makefile b/games/nethack-x11/Makefile
index 7aa380283e3..4934cbb0ce1 100644
--- a/games/nethack-x11/Makefile
+++ b/games/nethack-x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/10/23 13:14:54 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2001/10/24 22:10:57 jlam Exp $
 #
 
 .include		"../nethack-lib/Makefile.common"
@@ -22,6 +22,6 @@ ALLFILES=		${DISTFILES}	# don't checksum shared patches
 post-install:
 	@${INSTALL_DATA} ${WRKSRC}/dat/x11tiles ${PREFIX}/share/nethackdir
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../graphics/xpm/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/newvox/Makefile b/games/newvox/Makefile
index 9a35f89e607..6e755ff77b8 100644
--- a/games/newvox/Makefile
+++ b/games/newvox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/10/23 13:14:54 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2001/10/24 22:10:57 jlam Exp $
 #
 
 DISTNAME=	newvox-1.0
@@ -12,6 +12,6 @@ COMMENT=	voxel-style landscape rendering fly-by
 USE_BUILDLINK_ONLY=	YES
 GNU_CONFIGURE=		YES
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../devel/SDL/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/pacman/Makefile b/games/pacman/Makefile
index 87d2ae7cdf0..3267db00b12 100644
--- a/games/pacman/Makefile
+++ b/games/pacman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/10/23 13:14:54 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2001/10/24 22:10:57 jlam Exp $
 
 DISTNAME=		Pacman-0.3-CVS-00-11-17
 PKGNAME=		Pacman-0.3
@@ -33,6 +33,6 @@ pre-build:
 		exit 1;							    \
 	fi;
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../graphics/clanlib/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/xboard/Makefile b/games/xboard/Makefile
index 2b067f70f35..613fd31425f 100644
--- a/games/xboard/Makefile
+++ b/games/xboard/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/10/23 13:14:55 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2001/10/24 22:10:58 jlam Exp $
 
 DISTNAME=		xboard-4.2.3
 CATEGORIES=		games
@@ -22,7 +22,7 @@ CONFIGURE_ARGS+=	--enable-zippy	# interface to ICS
 CONFIGURE_ARGS+=	--with-Xaw3d
 .endif
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../graphics/xpm/buildlink.mk"
 .include "../../mk/xaw.buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/xconq/Makefile b/games/xconq/Makefile
index 89a3e2fbbdf..d59e0d229d4 100644
--- a/games/xconq/Makefile
+++ b/games/xconq/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/10/23 13:25:30 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2001/10/24 22:10:58 jlam Exp $
 
 DISTNAME=		xconq-7.4.1
 CATEGORIES=		games x11
@@ -26,6 +26,6 @@ post-build:
 post-install:
 	cd ${WRKSRC}/doc && ${MAKE_PROGRAM} install-info
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../x11/tk/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/xracer/Makefile b/games/xracer/Makefile
index f607437ca31..891a77e66da 100644
--- a/games/xracer/Makefile
+++ b/games/xracer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2001/10/23 13:14:55 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2001/10/24 22:10:58 jlam Exp $
 #
 
 DISTNAME=		xracer-0.96.9
@@ -39,8 +39,8 @@ pre-patch:
 	@${RM} ${WRKSRC}/tools/${perlfile}.BAK
 .endfor
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../devel/gettext-lib/buildlink.mk"
 .include "../../graphics/Mesa/buildlink.mk"
 .include "../../graphics/jpeg/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"