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/wm/afterstep/Makefile b/wm/afterstep/Makefile
index 7b57e495748..5f5e64cb7dc 100644
--- a/wm/afterstep/Makefile
+++ b/wm/afterstep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2001/10/23 13:15:04 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2001/10/24 22:11:08 jlam Exp $
 
 DISTNAME=	AfterStep-1.8.9
 PKGNAME=	afterstep-1.8.9
@@ -40,9 +40,9 @@ pre-configure:
 	  ${CHMOD} 755 configure; \
 	  autoheader --localdir=autoconf autoconf/configure.in > autoconf/config.h.in;
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../audio/rplay/buildlink.mk"
 .include "../../graphics/jpeg/buildlink.mk"
 .include "../../graphics/png/buildlink.mk"
 .include "../../graphics/xpm/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/amaterus/Makefile b/wm/amaterus/Makefile
index 0be2f9ddaeb..740d4ecf651 100644
--- a/wm/amaterus/Makefile
+++ b/wm/amaterus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/10/23 13:15:04 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2001/10/24 22:11:08 jlam Exp $
 
 DISTNAME=	amaterus-0.34.1
 CATEGORIES=	wm
@@ -16,7 +16,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/amaterus
 	${INSTALL_DATA} ${WRKSRC}/README.en ${PREFIX}/share/doc/amaterus
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../textproc/libxml/buildlink.mk"
 .include "../../x11/gtk/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/enlightenment/Makefile b/wm/enlightenment/Makefile
index 505c57789d7..63be6ffa60b 100644
--- a/wm/enlightenment/Makefile
+++ b/wm/enlightenment/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/10/23 13:15:04 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2001/10/24 22:11:09 jlam Exp $
 
 DISTNAME=		enlightenment-0.16.4
 CATEGORIES=		x11 gnome wm
@@ -38,10 +38,10 @@ post-install:
 	${FIND} ${PREFIX}/share/enlightenment/themes -type f | \
 	${XARGS} ${CHMOD} ${NONBINMODE}
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../audio/esound/buildlink.mk"
 .include "../../graphics/imlib/buildlink.mk"
 .include "../../graphics/fnlib/buildlink.mk"
 .include "../../graphics/freetype-lib/buildlink.mk"
 .include "../../www/libghttp/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/flwm/Makefile b/wm/flwm/Makefile
index 0d99213360f..92db899190a 100644
--- a/wm/flwm/Makefile
+++ b/wm/flwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/10/23 13:15:05 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2001/10/24 22:11:09 jlam Exp $
 #
 
 DISTNAME=	flwm-1.00
@@ -16,6 +16,6 @@ USE_X11BASE=	# defined
 GNU_CONFIGURE=	# defined
 CONFIGURE_ENV+=	X_LIBS="-lGL"
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../x11/fltk/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/icewm-gnome/Makefile b/wm/icewm-gnome/Makefile
index e080e0873ed..3aa46418062 100644
--- a/wm/icewm-gnome/Makefile
+++ b/wm/icewm-gnome/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/10/23 13:15:05 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2001/10/24 22:11:09 jlam Exp $
 
 PKGNAME=		${DISTNAME:S/-/-gnome-/}
 COMMENT=		small, fast and light-weight window manager (GNOME version)
@@ -12,6 +12,6 @@ USE_BUILDLINK_ONLY=	# defined
 CONFIGURE_ARGS+=	--with-gnome-menus="${GNOME_CONFIG}"
 CONFIGURE_ARGS+=	--with-imlib
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../x11/gnome-libs/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/icewm/Makefile b/wm/icewm/Makefile
index 54d60a0f16c..8b74bd2ec9e 100644
--- a/wm/icewm/Makefile
+++ b/wm/icewm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/10/23 13:15:05 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2001/10/24 22:11:09 jlam Exp $
 #
 
 COMMENT=		small, fast and light-weight window manager
@@ -8,6 +8,6 @@ CONFLICTS+=		icewm-gnome-[0-9]*
 USE_BUILDLINK_ONLY=	# defined
 
 .include "Makefile.common"
-.include "../../mk/x11.buildlink.mk"
 .include "../../graphics/xpm/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/windowmaker/Makefile b/wm/windowmaker/Makefile
index dfa8220189b..fbe51506501 100644
--- a/wm/windowmaker/Makefile
+++ b/wm/windowmaker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2001/10/23 13:15:05 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2001/10/24 22:11:09 jlam Exp $
 
 DISTNAME=		WindowMaker-0.70.0
 PKGNAME=		windowmaker-0.70.0
@@ -79,7 +79,6 @@ post-install:
 		FAQ FAQ.I18N \
 		${PREFIX}/share/doc/WindowMaker
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../devel/gettext-lib/buildlink.mk"
 .include "../../graphics/hermes/buildlink.mk"
 .include "../../graphics/libungif/buildlink.mk"
@@ -87,4 +86,5 @@ post-install:
 .include "../../graphics/png/buildlink.mk"
 .include "../../graphics/tiff/buildlink.mk"
 .include "../../graphics/xpm/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/wmakerconf/Makefile b/wm/wmakerconf/Makefile
index 0359fd6d96d..434d8511ac4 100644
--- a/wm/wmakerconf/Makefile
+++ b/wm/wmakerconf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/10/23 13:15:06 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2001/10/24 22:11:10 jlam Exp $
 #
 
 DISTNAME=	wmakerconf-2.8.1
@@ -15,10 +15,10 @@ USE_X11BASE=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ENV+=		wraster="${GET_WRASTER_FLAGS}"
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../devel/gettext-lib/buildlink.mk"
 .include "../../devel/libproplist/buildlink.mk"
 .include "../../graphics/imlib/buildlink.mk"
 .include "../../wm/windowmaker/buildlink.mk"
 .include "../../x11/gtk/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"