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.

6 files changed, 12 insertions, 12 deletions

diff --git a/sysutils/asapm/Makefile b/sysutils/asapm/Makefile
index d959e51e4f6..e242393645f 100644
--- a/sysutils/asapm/Makefile
+++ b/sysutils/asapm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2001/10/23 13:15:02 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2001/10/24 22:11:06 jlam Exp $
 # FreeBSD Id: Makefile,v 1.5 1998/11/29 12:43:12 asami Exp
 #
 
@@ -23,6 +23,6 @@ CONFIGURE_ARGS+=	--with-xpm
 CONFIGURE_ARGS+=	--with-xpm-includes=${BUILDLINK_DIR}/include
 CONFIGURE_ARGS+=	--with-xpm-library=${BUILDLINK_DIR}/lib
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../graphics/xpm/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/fsviewer/Makefile b/sysutils/fsviewer/Makefile
index 1f5fedcc051..00bbb93b697 100644
--- a/sysutils/fsviewer/Makefile
+++ b/sysutils/fsviewer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/10/23 13:15:02 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2001/10/24 22:11:06 jlam Exp $
 #
 
 DISTNAME=	FSViewer.app-0.2.3
@@ -26,6 +26,6 @@ post-install:
 	cd ${PREFIX}/GNUstep/Apps/FSViewer.app && \
 		${PAX} -zrf ${_DISTDIR}${DISTSUBDIR}/icons.tar.gz *.xpm *.tif
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../wm/windowmaker/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/gkrellm/Makefile b/sysutils/gkrellm/Makefile
index b2d4664cc22..1ca24111942 100644
--- a/sysutils/gkrellm/Makefile
+++ b/sysutils/gkrellm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/10/23 13:15:02 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2001/10/24 22:11:07 jlam Exp $
 #
 
 DISTNAME=	gkrellm-1.2.2
@@ -21,8 +21,8 @@ post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/gkrellm
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/gkrellm/plugins
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../devel/pth/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/sysutils/xnc/Makefile b/sysutils/xnc/Makefile
index 0408b20413e..6c9a3d22415 100644
--- a/sysutils/xnc/Makefile
+++ b/sysutils/xnc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/10/23 13:15:02 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2001/10/24 22:11:07 jlam Exp $
 
 DISTNAME=	xnc-4.4.5.src
 PKGNAME=	xnc-4.4.5
@@ -18,7 +18,7 @@ post-install:
 		${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xnc
 		${INSTALL_DATA} ${WRKSRC}/Docs/* ${PREFIX}/share/doc/xnc
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../graphics/jpeg/buildlink.mk"
 .include "../../graphics/png/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xosview/Makefile b/sysutils/xosview/Makefile
index 8d313e6ea2a..9f47e06dd0e 100644
--- a/sysutils/xosview/Makefile
+++ b/sysutils/xosview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2001/10/23 13:15:03 jlam Exp $
+# $NetBSD: Makefile,v 1.38 2001/10/24 22:11:07 jlam Exp $
 #
 
 DISTNAME=       xosview-1.7.0.b
@@ -31,6 +31,6 @@ LIBS+=		-lsocket -lnsl
 USE_GMAKE=	YES
 .endif
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../graphics/xpm/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xps/Makefile b/sysutils/xps/Makefile
index 4cd831821a5..0d3db08aea1 100644
--- a/sysutils/xps/Makefile
+++ b/sysutils/xps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2001/10/23 13:15:03 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2001/10/24 22:11:07 jlam Exp $
 
 DISTNAME=	xps-3.14
 CATEGORIES=	sysutils
@@ -17,6 +17,6 @@ USE_BUILDLINK_ONLY=	# defined
 GNU_CONFIGURE=		# defined
 CONFIGURE_ENV+=		XINCLUDES="-I${BUILDLINK_X11_DIR}/include"
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../mk/motif.buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"