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.

4 files changed, 8 insertions, 8 deletions

diff --git a/print/gnome-print/Makefile b/print/gnome-print/Makefile
index 40b7ef15e62..574fa8f1334 100644
--- a/print/gnome-print/Makefile
+++ b/print/gnome-print/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2001/10/23 13:15:01 jlam Exp $
+# $NetBSD: Makefile,v 1.43 2001/10/24 22:11:05 jlam Exp $
 #
 
 DISTNAME=		gnome-print-0.29
@@ -23,8 +23,8 @@ MAKE_ENV+=		HOME=${WRKSRC}
 CPPFLAGS+=		-I${LOCALBASE}/include
 LDFLAGS+=		-L${LOCALBASE}/lib
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../graphics/gdk-pixbuf-gnome/buildlink.mk"
 .include "../../textproc/libunicode/buildlink.mk"
 .include "../../textproc/libxml/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/mgv/Makefile b/print/mgv/Makefile
index 7a339efb041..e790b823652 100644
--- a/print/mgv/Makefile
+++ b/print/mgv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/10/23 13:15:01 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2001/10/24 22:11:06 jlam Exp $
 
 DISTNAME=		mgv-3.1.5
 CATEGORIES=		print
@@ -21,7 +21,7 @@ post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html
 	${LN} -fs ${PREFIX}/share/mgv/3.1.5/help ${PREFIX}/share/doc/html/mgv
 
-.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/print/xpdf/Makefile b/print/xpdf/Makefile
index 46175962371..36f576855f3 100644
--- a/print/xpdf/Makefile
+++ b/print/xpdf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/10/23 13:15:01 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2001/10/24 22:11:06 jlam Exp $
 # 
 
 DISTNAME=	xpdf-0.92
@@ -37,8 +37,8 @@ post-install:
 		${FILESDIR}/xpdf-app-defaults				\
 		> ${X11PREFIX}/lib/X11/app-defaults/Xpdf
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../graphics/freetype-lib/buildlink.mk"
 .include "../../graphics/xpm/buildlink.mk"
 .include "../../textproc/t1lib/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/xpp/Makefile b/print/xpp/Makefile
index d2e2ee114cf..3d6b843e715 100644
--- a/print/xpp/Makefile
+++ b/print/xpp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/10/23 13:15:02 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2001/10/24 22:11:06 jlam Exp $
 
 DISTNAME=	xpp-1.0
 CATEGORIES=	print x11
@@ -21,7 +21,7 @@ post-install:
 	${INSTALL_DATA_DIR} ${DOCDIR}
 	cd ${WRKSRC}; ${INSTALL_DATA} LICENSE README ${DOCDIR}
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../print/cups/buildlink.mk"
 .include "../../x11/fltk/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"