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.

20 files changed, 40 insertions, 40 deletions

diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 687f34324a6..47c00a49efd 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.79 2001/10/23 13:14:55 jlam Exp $
+# $NetBSD: Makefile,v 1.80 2001/10/24 22:10:58 jlam Exp $
 
 DISTNAME=		ImageMagick-5.3.9
 CATEGORIES=		graphics
@@ -39,9 +39,9 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/Copyright.txt ${WRKSRC}/QuickStart.txt \
 		${PREFIX}/share/ImageMagick
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../archivers/bzip2/buildlink.mk"
 .include "../../graphics/jpeg/buildlink.mk"
 .include "../../graphics/png/buildlink.mk"
 .include "../../graphics/tiff/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/Ngraph/Makefile b/graphics/Ngraph/Makefile
index 5e59f419b06..19b84a5795e 100644
--- a/graphics/Ngraph/Makefile
+++ b/graphics/Ngraph/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/10/23 13:14:55 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2001/10/24 22:10:59 jlam Exp $
 #
 
 DISTNAME=	Ngraph-6.3.06-src
@@ -24,6 +24,6 @@ post-extract:
 post-install:
 	${GTAR} -C ${PREFIX}/libexec/Ngraph -xzf ${DISTDIR}/Ngraph-6.3-doc.tar.gz
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../mk/motif.buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/SDL-image/Makefile b/graphics/SDL-image/Makefile
index 434ce9dd42a..608ec7994f6 100644
--- a/graphics/SDL-image/Makefile
+++ b/graphics/SDL-image/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/10/23 13:14:55 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2001/10/24 22:10:59 jlam Exp $
 #
 
 DISTNAME=		SDL_image-1.2.0
@@ -16,8 +16,8 @@ LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
 USE_BUILDLINK_ONLY=	YES
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../graphics/jpeg/buildlink.mk"
 .include "../../graphics/png/buildlink.mk"
 .include "../../devel/SDL/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/autotrace/Makefile b/graphics/autotrace/Makefile
index d0fb05cf78c..03d80742de6 100644
--- a/graphics/autotrace/Makefile
+++ b/graphics/autotrace/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/10/23 13:14:56 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2001/10/24 22:10:59 jlam Exp $
 #
 
 DISTNAME=	autotrace-0.26
@@ -13,6 +13,6 @@ COMMENT=	convert bitmap to vector graphics
 USE_BUILDLINK_ONLY=	YES
 GNU_CONFIGURE=		YES
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../graphics/ImageMagick/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/avifile-devel/Makefile b/graphics/avifile-devel/Makefile
index 7551e3948fc..5d0fc09fbc5 100644
--- a/graphics/avifile-devel/Makefile
+++ b/graphics/avifile-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2001/10/23 13:14:56 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2001/10/24 22:10:59 jlam Exp $
 #
 
 DISTNAME=	avifile-0.6.20010814
@@ -62,6 +62,6 @@ CONFIGURE_ARGS+=	--with-qt-dir="${BUILDLINK_DIR}/qt2"
 pre-configure:
 	cd ${WRKSRC} && ${SH} autogen.sh
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../devel/SDL/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/clanlib/Makefile b/graphics/clanlib/Makefile
index 5d21b9abe14..be24fc3249a 100644
--- a/graphics/clanlib/Makefile
+++ b/graphics/clanlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2001/10/23 13:14:56 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2001/10/24 22:10:59 jlam Exp $
 
 DISTNAME=		ClanLib-0.4.4
 CATEGORIES=		graphics games devel x11
@@ -34,12 +34,12 @@ post-patch:
 
 .include "../../mk/bsd.prefs.mk"
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../graphics/hermes/buildlink.mk"
 .include "../../graphics/png/buildlink.mk"
 .include "../../graphics/Mesa/buildlink.mk"
 .include "../../devel/pth/buildlink.mk"
 .include "../../mk/ossaudio.buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
 
 .if ${OPSYS} == "NetBSD"
diff --git a/graphics/dx/Makefile b/graphics/dx/Makefile
index 390c29454eb..0050d52f677 100644
--- a/graphics/dx/Makefile
+++ b/graphics/dx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/10/23 13:14:56 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2001/10/24 22:11:00 jlam Exp $
 
 DISTNAME=	dx-4.1.0
 CATEGORIES=	graphics
@@ -36,7 +36,6 @@ post-patch:
 		${MV} -f $${file}.fixed $${file};			\
 	done
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../devel/netcdf/buildlink.mk"
 .include "../../graphics/Mesa/buildlink.mk"
 .include "../../graphics/freetype-lib/buildlink.mk"
@@ -44,4 +43,5 @@ post-patch:
 .include "../../graphics/png/buildlink.mk"
 .include "../../graphics/tiff/buildlink.mk"
 .include "../../mk/motif.buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/fnlib/Makefile b/graphics/fnlib/Makefile
index 097e52204d6..886bed2d365 100644
--- a/graphics/fnlib/Makefile
+++ b/graphics/fnlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/10/23 13:14:56 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2001/10/24 22:11:00 jlam Exp $
 
 DISTNAME=		fnlib-0.5
 CATEGORIES=		x11 graphics
@@ -31,6 +31,6 @@ post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/fnlib
 	${INSTALL_DATA} ${WRKSRC}/doc/fontinfo.README ${PREFIX}/share/doc/fnlib
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../graphics/imlib/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/freetype-utils/Makefile b/graphics/freetype-utils/Makefile
index 86a202ae7a2..a8c441ac423 100644
--- a/graphics/freetype-utils/Makefile
+++ b/graphics/freetype-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/10/23 13:14:57 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2001/10/24 22:11:00 jlam Exp $
 
 PKGNAME=		freetype-utils-${FT_VERS}
 COMMENT=		Utilities for manipulating TrueType fonts
@@ -12,6 +12,6 @@ CONFIGURE_ARGS+=	--with-x
 ALL_TARGET=		tttest
 INSTALL_TARGET=		install-tttest
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../graphics/freetype-lib/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile
index ba99acb7ebf..bd0966de6dc 100644
--- a/graphics/gd/Makefile
+++ b/graphics/gd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2001/10/23 13:14:57 jlam Exp $
+# $NetBSD: Makefile,v 1.33 2001/10/24 22:11:00 jlam Exp $
 # FreeBSD Id: Makefile,v 1.2 1997/02/14 07:55:45 asami Exp
 #
 
@@ -31,10 +31,10 @@ GD_MAJOR=	1
 GD_MINOR=	9
 MAKE_ENV+=	GD_MAJOR="${GD_MAJOR}" GD_MINOR="${GD_MINOR}" COMPILER="${CC}"
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../devel/zlib/buildlink.mk"
 .include "../../graphics/freetype-lib/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/graphics/geomview/Makefile b/graphics/geomview/Makefile
index d6351c06378..a9c1cb86c55 100644
--- a/graphics/geomview/Makefile
+++ b/graphics/geomview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2001/10/23 13:14:58 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2001/10/24 22:11:00 jlam Exp $
 
 DISTNAME=		geomview-1.8.1
 CATEGORIES=		graphics math
@@ -40,7 +40,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/html/pix/*			\
 	${PREFIX}/share/doc/html/geomview/pix
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../graphics/Mesa/buildlink.mk"
 .include "../../mk/motif.buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gfract/Makefile b/graphics/gfract/Makefile
index 2cfb9f33dc2..d5434d1a36d 100644
--- a/graphics/gfract/Makefile
+++ b/graphics/gfract/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/10/23 13:14:58 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2001/10/24 22:11:01 jlam Exp $
 #
 
 DISTNAME=	gfract-0.21
@@ -35,7 +35,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/gfract.xpm ${PREFIX}/share/gfract/
 	${INSTALL_PROGRAM} ${WRKSRC}/gfract ${PREFIX}/bin/
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../graphics/png/buildlink.mk"
 .include "../../x11/gtk/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index 650aa42f9be..524661a8f94 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.74 2001/10/23 13:14:58 jlam Exp $
+# $NetBSD: Makefile,v 1.75 2001/10/24 22:11:01 jlam Exp $
 
 DISTNAME=		gimp-1.2.2
 CATEGORIES=		graphics
@@ -66,8 +66,8 @@ post-install:
 		${LN} -fs ${PREFIX}/share/aclocal/gimp.m4		\
 			${LOCALBASE}/share/aclocal/gimp.m4
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../devel/gettext-lib/buildlink.mk"
 .include "../../graphics/mpeg-lib/buildlink.mk"
 .include "../../x11/gnome-libs/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gle/Makefile b/graphics/gle/Makefile
index 5802d757ac4..e0cfdb0806f 100644
--- a/graphics/gle/Makefile
+++ b/graphics/gle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/10/23 13:14:58 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2001/10/24 22:11:01 jlam Exp $
 #
 
 DISTNAME=		gle-3.0.3
@@ -18,6 +18,6 @@ USE_BUILDLINK_ONLY=	YES
 
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../graphics/Mesa/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gqview/Makefile b/graphics/gqview/Makefile
index 46a0015376d..22eaaffc8e6 100644
--- a/graphics/gqview/Makefile
+++ b/graphics/gqview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2001/10/23 13:14:58 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2001/10/24 22:11:01 jlam Exp $
 #
 
 DISTNAME=	gqview-0.12.0
@@ -19,8 +19,8 @@ CONFIGURE_ENV+=	PKGLOCALEDIR="${PKGLOCALEDIR}"
 
 BUILDLINK_DEPENDS.gdk-pixbuf=	gdk-pixbuf>=0.9.0
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../devel/gettext-lib/buildlink.mk"
 .include "../../graphics/gdk-pixbuf/buildlink.mk"
 .include "../../x11/gtk/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index 570dd32ffed..ceffdc47018 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2001/10/23 13:14:59 jlam Exp $
+# $NetBSD: Makefile,v 1.60 2001/10/24 22:11:02 jlam Exp $
 #
 
 DISTNAME=		imlib-1.9.11
@@ -42,7 +42,6 @@ post-install:
 	${LN} -fs ${PREFIX}/share/aclocal/imlib.m4 \
 		${LOCALBASE}/share/aclocal/imlib.m4
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../devel/gettext-lib/buildlink.mk"
 .include "../../graphics/jpeg/buildlink.mk"
 .include "../../graphics/libungif/buildlink.mk"
@@ -50,4 +49,5 @@ post-install:
 .include "../../graphics/png/buildlink.mk"
 .include "../../graphics/tiff/buildlink.mk"
 .include "../../x11/gtk/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/libwmf/Makefile b/graphics/libwmf/Makefile
index 1928c3209cb..a3835d7c588 100644
--- a/graphics/libwmf/Makefile
+++ b/graphics/libwmf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2001/10/23 13:14:59 jlam Exp $
+# $NetBSD: Makefile,v 1.27 2001/10/24 22:11:02 jlam Exp $
 #
 
 DISTNAME=		libwmf-0.2.1
@@ -20,9 +20,9 @@ LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 INCLUDEDIR=		${PREFIX}/include/libwmf
 HTMLDIR=		${PREFIX}/share/doc/html/libwmf
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../graphics/freetype2/buildlink.mk"
 .include "../../graphics/png/buildlink.mk"
 .include "../../graphics/xpm/buildlink.mk"
 .include "../../textproc/libxml2/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/php4-gd/Makefile b/graphics/php4-gd/Makefile
index 08ec7d4f7c2..d6766896ef1 100644
--- a/graphics/php4-gd/Makefile
+++ b/graphics/php4-gd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/10/23 13:14:59 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2001/10/24 22:11:02 jlam Exp $
 
 .include "../../www/php4/Makefile.module"
 
@@ -18,6 +18,6 @@ CONFIGURE_ARGS+=	--with-ttf=shared,${BUILDLINK_DIR}
 CONFIGURE_ARGS+=	--enable-${MODNAME}-native-ttf
 CONFIGURE_ARGS+=	--without-t1lib
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../graphics/gd/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/tcm/Makefile b/graphics/tcm/Makefile
index f6b761c1499..1387e5981dc 100644
--- a/graphics/tcm/Makefile
+++ b/graphics/tcm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/10/23 13:14:59 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2001/10/24 22:11:02 jlam Exp $
 
 DISTNAME=		tcm-2.01.src
 PKGNAME=		tcm-2.01
@@ -84,8 +84,8 @@ do-install:
 	${INSTALL_DATA} ${TCM_SRC}/doc/wishlist/* 			\
 		${PREFIX}/share/doc/html/tcm/wishlist/
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../mk/motif.buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
 
 .if defined(MOTIF_TYPE) && (${MOTIF_TYPE} == "lesstif")
diff --git a/graphics/xzgv/Makefile b/graphics/xzgv/Makefile
index 35a34dfc6bd..200a89e30db 100644
--- a/graphics/xzgv/Makefile
+++ b/graphics/xzgv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/10/23 13:14:59 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2001/10/24 22:11:03 jlam Exp $
 
 DISTNAME=	xzgv-0.7
 CATEGORIES=	graphics
@@ -22,6 +22,6 @@ do-install:
 	@for f in xzgv xzgv-1 xzgv-2 xzgv-3 ; do \
 	${INSTALL_DATA} ${WRKSRC}/doc/$$f ${PREFIX}/info ; done
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../graphics/imlib/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"