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/comms/jpilot-expense/Makefile b/comms/jpilot-expense/Makefile
index 5270f8e5b1e..c0a495be472 100644
--- a/comms/jpilot-expense/Makefile
+++ b/comms/jpilot-expense/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/10/23 13:14:47 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2001/10/24 22:10:48 jlam Exp $
 
 DISTNAME=		jpilot-0.99
 PKGNAME=		jpilot-expense-0.99
@@ -26,7 +26,7 @@ post-extract:
 	${RM} -f ${WRKSRC}/../libtool
 	${LN} -sf ${LIBTOOL} ${WRKSRC}/../libtool
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../comms/jpilot/buildlink.mk"
 .include "../../comms/pilot-link-libs/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/jpilot-syncmal/Makefile b/comms/jpilot-syncmal/Makefile
index 4501f8e4eeb..78c862d852b 100644
--- a/comms/jpilot-syncmal/Makefile
+++ b/comms/jpilot-syncmal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/10/23 13:14:47 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2001/10/24 22:10:48 jlam Exp $
 
 DISTNAME=		jpilot-syncmal_0.60
 PKGNAME=		jpilot-syncmal-0.60
@@ -32,7 +32,7 @@ CFLAGS+=		-D__unix__=1
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/.libs/libsyncmal.so ${PLUGINSDIR}
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../comms/jpilot/buildlink.mk"
 .include "../../comms/pilot-link-libs/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/jpilot-synctime/Makefile b/comms/jpilot-synctime/Makefile
index b83206813d8..bbd9155ec32 100644
--- a/comms/jpilot-synctime/Makefile
+++ b/comms/jpilot-synctime/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/10/23 13:14:48 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2001/10/24 22:10:49 jlam Exp $
 
 DISTNAME=		jpilot-0.99
 PKGNAME=		jpilot-synctime-0.99
@@ -26,7 +26,7 @@ post-extract:
 	${RM} -f ${WRKSRC}/../libtool
 	${LN} -sf ${LIBTOOL} ${WRKSRC}/../libtool
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../comms/jpilot/buildlink.mk"
 .include "../../comms/pilot-link-libs/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/jpilot/Makefile b/comms/jpilot/Makefile
index c55150f2604..45cccf6020e 100644
--- a/comms/jpilot/Makefile
+++ b/comms/jpilot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2001/10/23 13:14:48 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2001/10/24 22:10:49 jlam Exp $
 #
 
 DISTNAME=		jpilot-0.99
@@ -41,8 +41,8 @@ post-install:
 	cd ${WRKSRC}/docs; ${INSTALL_MAN} *.1 ${MAN1DIR}
 	${TOUCH} ${PLUGINSDIR}/.directory
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../comms/pilot-link-libs/buildlink.mk"
 .include "../../devel/gettext-lib/buildlink.mk"
 .include "../../x11/gtk/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/pilot-link/Makefile b/comms/pilot-link/Makefile
index 6dd64cd53f0..735e9f97f21 100644
--- a/comms/pilot-link/Makefile
+++ b/comms/pilot-link/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2001/10/23 20:46:46 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2001/10/24 22:10:49 jlam Exp $
 #
 
 .include "../../comms/pilot-link/Makefile.common"
@@ -21,9 +21,9 @@ LIBS+=			-lpisock -liconv
 
 INSTALL_TARGET=		install-execs install-man
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../comms/pilot-link-libs/buildlink.mk"
 .include "../../devel/readline/buildlink.mk"
 .include "../../lang/tcl/buildlink.mk"
 .include "../../x11/tk/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"