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.

8 files changed, 16 insertions, 16 deletions

diff --git a/devel/GConf/Makefile b/devel/GConf/Makefile
index d8557979ee2..756a40d59dc 100644
--- a/devel/GConf/Makefile
+++ b/devel/GConf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2001/10/23 13:14:49 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2001/10/24 22:10:50 jlam Exp $
 #
 
 DISTNAME=		GConf-1.0.4
@@ -30,8 +30,8 @@ post-install:
 	    ${CP} -p ${PREFIX}/etc/gconf/1/path.example \
 	    ${PREFIX}/etc/gconf/1/path
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../devel/gettext-lib/buildlink.mk"
 .include "../../databases/db3/buildlink.mk"
 .include "../../devel/oaf/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/SDL/Makefile b/devel/SDL/Makefile
index dc63ef6b96e..231d1771520 100644
--- a/devel/SDL/Makefile
+++ b/devel/SDL/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2001/10/23 13:14:49 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2001/10/24 22:10:51 jlam Exp $
 #
 
 DISTNAME=	SDL-1.2.2
@@ -50,9 +50,9 @@ pre-configure:
 post-configure:
 	cd ${WRKSRC}/src/audio && ${CP} *.[ch] netbsd/
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../audio/esound/buildlink.mk"
 .include "../../devel/pth/buildlink.mk"
 .include "../../graphics/Mesa/buildlink.mk"
 .include "../../mk/ossaudio.buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile
index 5b994e94d10..322e162ee86 100644
--- a/devel/bonobo/Makefile
+++ b/devel/bonobo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2001/10/23 13:14:49 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2001/10/24 22:10:51 jlam Exp $
 #
 
 DISTNAME=		bonobo-1.0.9
@@ -26,10 +26,10 @@ LDFLAGS+=		-Wl,-R${LOCALBASE}/lib
 
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../graphics/gdk-pixbuf-gnome/buildlink.mk"
 .include "../../print/gnome-print/buildlink.mk"
 .include "../../textproc/libxml/buildlink.mk"
 .include "../../devel/popt/buildlink.mk"
 .include "../../devel/oaf/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/ddd/Makefile b/devel/ddd/Makefile
index c4802a4b409..fb2c1b22d8c 100644
--- a/devel/ddd/Makefile
+++ b/devel/ddd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2001/10/23 13:14:49 jlam Exp $
+# $NetBSD: Makefile,v 1.38 2001/10/24 22:10:51 jlam Exp $
 #
 
 DISTNAME=	ddd-3.3
@@ -46,7 +46,7 @@ post-install:
 test:
 	(cd ${WRKSRC} ; ${MAKE_PROGRAM} check)
 
-.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/devel/gcvs/Makefile b/devel/gcvs/Makefile
index 43e6206c2b3..74f545a5ed1 100644
--- a/devel/gcvs/Makefile
+++ b/devel/gcvs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/10/23 13:14:50 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2001/10/24 22:10:52 jlam Exp $
 
 DISTNAME=		gcvs-1.0a7
 CATEGORIES=		devel
@@ -22,7 +22,7 @@ post-patch:
 	${MV} -f ${WRKSRC}/configure.done ${WRKSRC}/configure
 	${CHMOD} +x ${WRKSRC}/configure
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../lang/tcl/buildlink.mk"
 .include "../../x11/gtk/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libdockapp/Makefile b/devel/libdockapp/Makefile
index 0a2436a37aa..6967fb2e817 100644
--- a/devel/libdockapp/Makefile
+++ b/devel/libdockapp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/10/23 13:14:50 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2001/10/24 22:10:52 jlam Exp $
 #
 
 DISTNAME=	libdockapp-0.4.0
@@ -18,6 +18,6 @@ post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/libdockapp
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/libdockapp
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../graphics/xpm/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libglade/Makefile b/devel/libglade/Makefile
index f5921e05765..ebf469b2f54 100644
--- a/devel/libglade/Makefile
+++ b/devel/libglade/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2001/10/23 13:14:50 jlam Exp $
+# $NetBSD: Makefile,v 1.34 2001/10/24 22:10:53 jlam Exp $
 #
 
 DISTNAME=		libglade-0.17
@@ -23,9 +23,9 @@ LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 pre-configure:
 	${RM} ${WRKSRC}/libgladeConf.sh
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../devel/gettext-lib/buildlink.mk"
 .include "../../textproc/libxml/buildlink.mk"
 .include "../../x11/gnome-libs/buildlink.mk"
 .include "../../audio/esound/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/maketool/Makefile b/devel/maketool/Makefile
index 7f2a786cc48..645687b5c14 100644
--- a/devel/maketool/Makefile
+++ b/devel/maketool/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2001/10/23 13:14:50 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2001/10/24 22:10:53 jlam Exp $
 #
 
 DISTNAME=	maketool-0.6.1
@@ -16,7 +16,7 @@ BUILD_USES_MSGFMT=	YES
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
-.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"