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.

5 files changed, 10 insertions, 10 deletions

diff --git a/cad/dinotrace/Makefile b/cad/dinotrace/Makefile
index 96ea094297f..0f8f1679c2d 100644
--- a/cad/dinotrace/Makefile
+++ b/cad/dinotrace/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2001/10/23 13:14:46 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2001/10/24 22:10:46 jlam Exp $
 #
 
 DISTNAME=	dinotrace-9.1d
@@ -16,6 +16,6 @@ INFO_FILES=	dinotrace.info
 USE_BUILDLINK_ONLY=	YES
 GNU_CONFIGURE=		YES
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../mk/motif.buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/felt/Makefile b/cad/felt/Makefile
index 3ecd75ca7f3..332b1f3bb2e 100644
--- a/cad/felt/Makefile
+++ b/cad/felt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2001/10/23 13:14:46 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2001/10/24 22:10:47 jlam Exp $
 
 DISTNAME=		felt-3.05.src
 PKGNAME=		felt-3.05
@@ -36,7 +36,7 @@ post-install:
 		COPYING CHANGELOG TODO ${PREFIX}/share/doc/felt
 	${INSTALL_DATA} ${WRKSRC}/examples/* ${PREFIX}/share/examples/felt
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../devel/readline/buildlink.mk"
 .include "../../mk/xaw.buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/ng-spice/Makefile b/cad/ng-spice/Makefile
index 2bc6a491715..7506e8d53da 100644
--- a/cad/ng-spice/Makefile
+++ b/cad/ng-spice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/10/23 13:14:46 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2001/10/24 22:10:47 jlam Exp $
 #
 
 DISTNAME=	ng-spice-rework-13
@@ -21,7 +21,7 @@ LIBS+=			${LIBGETOPT}
 
 USE_BUILDLINK_ONLY=	YES
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../devel/libgetopt/buildlink.mk"
 .include "../../devel/ncurses/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/qcad/Makefile b/cad/qcad/Makefile
index 5170f77b1cb..d786a5b8981 100644
--- a/cad/qcad/Makefile
+++ b/cad/qcad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/10/23 13:14:46 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2001/10/24 22:10:47 jlam Exp $
 
 DISTNAME=		qcad-1.4.7-src
 PKGNAME=		qcad-1.4.7
@@ -33,6 +33,6 @@ do-install:
 	TODO cur doc examples fonts hatches libraries messages xpm) |	\
 	(cd ${PREFIX}/share/qcad; ${GTAR} vxf - )
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../x11/qt2-libs/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/vipec/Makefile b/cad/vipec/Makefile
index 118b1abc59b..2c5d3e8bdd0 100644
--- a/cad/vipec/Makefile
+++ b/cad/vipec/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2001/10/23 13:14:46 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2001/10/24 22:10:47 jlam Exp $
 #
 
 DISTNAME=	vipec-2.0.4
@@ -34,6 +34,6 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/vipec/help/models/*.html ${PREFIX}/share/doc/vipec/models
 	${INSTALL_DATA} ${WRKSRC}/vipec/help/models/*.png ${PREFIX}/share/doc/vipec/models
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../x11/qt2-libs/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"