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.

25 files changed, 54 insertions, 56 deletions

diff --git a/x11/Xbae/Makefile b/x11/Xbae/Makefile
index 02be864c87c..d9de519736f 100644
--- a/x11/Xbae/Makefile
+++ b/x11/Xbae/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/10/23 13:15:06 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2001/10/24 22:11:11 jlam Exp $
 #
 
 DISTNAME=	Xbae-4.9.1
@@ -25,6 +25,6 @@ post-install:
 	${LN} -fs ${PREFIX}/share/aclocal/ac_find_xbae.m4 \
 		${LOCALBASE}/share/aclocal/ac_find_xbae.m4
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../mk/motif.buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/XmHTML/Makefile b/x11/XmHTML/Makefile
index f764b733a51..29ba6b436f2 100644
--- a/x11/XmHTML/Makefile
+++ b/x11/XmHTML/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2001/10/23 13:15:07 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2001/10/24 22:11:11 jlam Exp $
 #
 
 DISTNAME=       XmHTML-1.1.7
@@ -21,9 +21,9 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/include/XmHTML
 	${INSTALL_DATA} ${WRKSRC}/include/XmHTML/*.h ${PREFIX}/include/XmHTML
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../graphics/jpeg/buildlink.mk"
 .include "../../graphics/png/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/x11/controlcenter/Makefile b/x11/controlcenter/Makefile
index bee0e541e7e..e2abcb618cb 100644
--- a/x11/controlcenter/Makefile
+++ b/x11/controlcenter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2001/10/23 13:15:07 jlam Exp $
+# $NetBSD: Makefile,v 1.34 2001/10/24 22:11:11 jlam Exp $
 
 DISTNAME=		control-center-1.4.0.1
 CATEGORIES=		x11 gnome
@@ -27,10 +27,10 @@ CONFIGURE_ARGS+=	--localstatedir=${LOCALSTATEDIR}
 post-patch:
 	@${ECHO} >>${WRKSRC}/control-center/cappletConf.sh.in ""
 
-.include "../../mk/x11.buildlink.mk"
-.include "../../graphics/gdk-pixbuf/buildlink.mk"
+.include "../../devel/popt/buildlink.mk"
 .include "../../devel/gettext-lib/buildlink.mk"
+.include "../../graphics/gdk-pixbuf/buildlink.mk"
 .include "../../sysutils/gnome-vfs/buildlink.mk"
 .include "../../x11/gnome-libs/buildlink.mk"
-.include "../../devel/popt/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/ebuilder/Makefile b/x11/ebuilder/Makefile
index 2449ad55f67..e0b5548408c 100644
--- a/x11/ebuilder/Makefile
+++ b/x11/ebuilder/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/10/23 13:15:07 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2001/10/24 22:11:11 jlam Exp $
 #
 
 DISTNAME=	ebuilder-0.56d
@@ -19,6 +19,6 @@ MAKE_ENV+=		CXXFLAGS="${CXXFLAGS}"
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/ebuilder ${PREFIX}/bin
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../x11/qt2-libs/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile
index 58c28b8d5d3..d25af5094b0 100644
--- a/x11/eterm/Makefile
+++ b/x11/eterm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2001/10/23 13:15:07 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2001/10/24 22:11:11 jlam Exp $
 
 DISTNAME=		Eterm-0.8.10
 PKGNAME=		eterm-0.8.10
@@ -41,6 +41,6 @@ post-install:
 	${CHMOD} 4711 ${PREFIX}/bin/Eterm
 .endif
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../graphics/imlib/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/fltk/Makefile b/x11/fltk/Makefile
index e56125fe157..03202b2d027 100644
--- a/x11/fltk/Makefile
+++ b/x11/fltk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2001/10/23 13:15:07 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2001/10/24 22:11:12 jlam Exp $
 #
 
 DISTNAME=	${PKGNAME}-source
@@ -30,6 +30,6 @@ test:
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV}				\
 		${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} test
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../graphics/Mesa/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gnome-core/Makefile b/x11/gnome-core/Makefile
index 93e01b1bc01..6b20d6bbf01 100644
--- a/x11/gnome-core/Makefile
+++ b/x11/gnome-core/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.71 2001/10/23 13:15:08 jlam Exp $
+# $NetBSD: Makefile,v 1.72 2001/10/24 22:11:12 jlam Exp $
 
 DISTNAME=		gnome-core-1.4.0.4
 CATEGORIES=		x11 gnome
@@ -42,12 +42,12 @@ post-install:
 .endfor
 .endfor
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../archivers/bzip2/buildlink.mk"
+.include "../../devel/gettext-lib/buildlink.mk"
+.include "../../devel/libglade/buildlink.mk"
 .include "../../graphics/gdk-pixbuf-gnome/buildlink.mk"
-.include "../../www/libghttp/buildlink.mk"
 .include "../../textproc/libxml/buildlink.mk"
-.include "../../devel/libglade/buildlink.mk"
 .include "../../www/gtkhtml/buildlink.mk"
-.include "../../devel/gettext-lib/buildlink.mk"
+.include "../../www/libghttp/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index 7a556656265..7349acfd8d2 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2001/10/23 13:15:08 jlam Exp $
+# $NetBSD: Makefile,v 1.73 2001/10/24 22:11:12 jlam Exp $
 
 DISTNAME=		gnome-libs-1.4.1.2
 CATEGORIES=		x11 gnome
@@ -63,11 +63,11 @@ post-install:
 	${LN} -fs ${PREFIX}/share/aclocal/libart.m4 \
 		${LOCALBASE}/share/aclocal/libart.m4
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../audio/esound/buildlink.mk"
 .include "../../devel/gettext-lib/buildlink.mk"
 .include "../../graphics/imlib/buildlink.mk"
 .include "../../graphics/xpm/buildlink.mk"
 .include "../../net/ORBit/buildlink.mk"
 .include "../../x11/gtk/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gtk--/Makefile b/x11/gtk--/Makefile
index 7405d4dc9d4..b87668122ab 100644
--- a/x11/gtk--/Makefile
+++ b/x11/gtk--/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2001/10/23 13:15:08 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2001/10/24 22:11:12 jlam Exp $
 # FreeBSD Id: Makefile,v 1.6 1999/01/12 16:50:43 vanilla Exp
 #
 
@@ -31,7 +31,7 @@ post-install:
 	${LN} -fs ${PREFIX}/share/aclocal/gtk--.m4 \
 		${LOCALBASE}/share/aclocal/gtk--.m4
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../devel/libsigc++/buildlink.mk"
 .include "../../x11/gtk/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile
index 334acf56a7b..e6f0316b899 100644
--- a/x11/gtk/Makefile
+++ b/x11/gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2001/10/23 13:15:08 jlam Exp $
+# $NetBSD: Makefile,v 1.68 2001/10/24 22:11:13 jlam Exp $
 
 DISTNAME=		gtk+-1.2.10
 CATEGORIES=		x11
@@ -62,7 +62,7 @@ post-install:
 	${LN} -fs ${PREFIX}/share/aclocal/gtk.m4 \
 	  ${LOCALBASE}/share/aclocal/gtk.m4
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../devel/gettext-lib/buildlink.mk"
 .include "../../devel/glib/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/p5-Tk/Makefile b/x11/p5-Tk/Makefile
index ef66c803235..407907509ca 100644
--- a/x11/p5-Tk/Makefile
+++ b/x11/p5-Tk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2001/10/23 21:02:17 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2001/10/24 22:11:13 jlam Exp $
 # FreeBSD Id: Makefile,v 1.14 1997/09/14 04:00:00 jfitz Exp
 #
 
@@ -22,6 +22,6 @@ MAKE_PARAMS=		X11=${BUILDLINK_X11_DIR}
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL ${MAKE_PARAMS}
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../x11/tk/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/qt2-designer-kde/Makefile b/x11/qt2-designer-kde/Makefile
index 7f87841a90b..a50a2a97090 100644
--- a/x11/qt2-designer-kde/Makefile
+++ b/x11/qt2-designer-kde/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/10/23 13:15:08 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2001/10/24 22:11:13 jlam Exp $
 #
 
 .include "../qt2-libs/Makefile.common"
@@ -24,7 +24,7 @@ do-install:
 	${LIBTOOL} ${INSTALL_PROGRAM} ${WRKSRC}/tools/designer/uic/uic ${QTPREFIX}/bin
 	${LIBTOOL} ${INSTALL_PROGRAM} ${WRKSRC}/tools/designer/designer/designer ${QTPREFIX}/bin
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../x11/kdelibs2/buildlink.mk"
 .include "../../x11/qt2-libs/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/qt2-libs/Makefile b/x11/qt2-libs/Makefile
index 411355aab5b..6e9f31e2b05 100644
--- a/x11/qt2-libs/Makefile
+++ b/x11/qt2-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/10/23 13:15:09 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2001/10/24 22:11:14 jlam Exp $
 #
 #USE_MESA=		yes
 
@@ -25,10 +25,10 @@ do-install:
 	${INSTALL_DATA_DIR} ${QTPREFIX}/include
 	${INSTALL_DATA} ${WRKSRC}/include/* ${QTPREFIX}/include
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../devel/zlib/buildlink.mk"
 .include "../../graphics/jpeg/buildlink.mk"
 .include "../../graphics/Mesa/buildlink.mk"
 .include "../../graphics/mng/buildlink.mk"
 .include "../../graphics/png/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/qwt/Makefile b/x11/qwt/Makefile
index d93a3501fe8..3870782c9dd 100644
--- a/x11/qwt/Makefile
+++ b/x11/qwt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2001/10/23 13:15:09 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2001/10/24 22:11:14 jlam Exp $
 
 DISTNAME=	qwt-0.3.0
 CATEGORIES=	x11
@@ -30,6 +30,6 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/include/*.h ${PREFIX}/include/qwt
 	${INSTALL_DATA} ${WRKSRC}/doc/man/man3/* ${PREFIX}/man/man3
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../x11/qt2-libs/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/rxvt/Makefile b/x11/rxvt/Makefile
index f341924e444..92ee22d6540 100644
--- a/x11/rxvt/Makefile
+++ b/x11/rxvt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2001/10/23 13:15:09 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2001/10/24 22:11:15 jlam Exp $
 # FreeBSD Id: Makefile,v 1.13 1997/03/07 12:29:49 obrien Exp
 #
 
@@ -53,6 +53,6 @@ pre-install:
 		${INSTALL_DATA} ${FILESDIR}/Rxvt ${X11PREFIX}/lib/X11/app-defaults; \
 	fi
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../graphics/xpm/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/tk/Makefile b/x11/tk/Makefile
index dd96ddbb0d4..3fa3583c527 100644
--- a/x11/tk/Makefile
+++ b/x11/tk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/10/23 13:15:09 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2001/10/24 22:11:15 jlam Exp $
 
 DISTNAME=	tk8.3.2
 PKGNAME=	tk-8.3.2nb1
@@ -79,6 +79,6 @@ post-install:
 test:
 	cd ${WRKSRC}; ${SETENV} LIBTOOL=${LIBTOOL} PREFIX=${PREFIX} ${MAKE} test
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../lang/tcl/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/tk/buildlink.mk b/x11/tk/buildlink.mk
index 2fb822da952..49b40954a3d 100644
--- a/x11/tk/buildlink.mk
+++ b/x11/tk/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.7 2001/10/23 13:02:11 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.8 2001/10/24 22:11:15 jlam Exp $
 #
 # This Makefile fragment is included by packages that use tk.
 #
@@ -42,10 +42,8 @@ tk-buildlink: _BUILDLINK_USE
 _TKCONFIG_SED=	-e "/^TK_PREFIX/s|${BUILDLINK_PREFIX.tcl}|${BUILDLINK_DIR}|g"
 _TKCONFIG_SED+=	-e "s|-L${BUILDLINK_PREFIX.tk}/lib|-L${BUILDLINK_DIR}/lib|g"
 _TKCONFIG_SED+=	-e "s|${BUILDLINK_PREFIX.tk}/lib/libtkstub|-L${BUILDLINK_DIR}/lib/libtkstub|g"
-.if defined(X11_BUILDLINK_MK)
 _TKCONFIG_SED+=	-e "s|-I${X11BASE}/|-I${BUILDLINK_X11_DIR}/|g"
 _TKCONFIG_SED+=	-e "s|-L${X11BASE}/|-L${BUILDLINK_X11_DIR}/|g"
-.endif
 
 tkConfig-buildlink:
 	${_PKG_SILENT}${_PKG_DEBUG}					\
diff --git a/x11/wmessage/Makefile b/x11/wmessage/Makefile
index 57fa668c7ed..80f0916cadd 100644
--- a/x11/wmessage/Makefile
+++ b/x11/wmessage/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/10/23 13:15:09 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2001/10/24 22:11:15 jlam Exp $
 
 DISTNAME=	wmessage-0.10
 CATEGORIES=	x11
@@ -10,7 +10,7 @@ COMMENT=	WINGs based message viewer similar to xmessage
 
 USE_BUILDLINK_ONLY=	yes
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../devel/libproplist/buildlink.mk"
 .include "../../wm/windowmaker/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/wmfire/Makefile b/x11/wmfire/Makefile
index 5cb88b18a25..23cc590ec68 100644
--- a/x11/wmfire/Makefile
+++ b/x11/wmfire/Makefile
@@ -1,4 +1,4 @@
-#$NetBSD: Makefile,v 1.9 2001/10/23 13:15:10 jlam Exp $
+#$NetBSD: Makefile,v 1.10 2001/10/24 22:11:15 jlam Exp $
 #
 
 DISTNAME=	wmfire-0.0.3.8
@@ -19,6 +19,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/CREDITS ${PREFIX}/share/doc/wmfire
 	${INSTALL_DATA} ${WRKSRC}/INSTALL ${PREFIX}/share/doc/wmfire
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../graphics/xpm/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/wmweather/Makefile b/x11/wmweather/Makefile
index ed35ee58646..6130499ff4e 100644
--- a/x11/wmweather/Makefile
+++ b/x11/wmweather/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/10/23 13:15:10 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2001/10/24 22:11:16 jlam Exp $
 #
 
 DISTNAME=	wmWeather-1.31
@@ -17,6 +17,6 @@ REPLACE_PERL=		GrabWeather
 
 CPPFLAGS+=		-I${X11BASE}/include
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../graphics/xpm/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/wterm/Makefile b/x11/wterm/Makefile
index 4defe8cf5bb..8094d7a91ef 100644
--- a/x11/wterm/Makefile
+++ b/x11/wterm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2001/10/23 13:15:10 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2001/10/24 22:11:16 jlam Exp $
 
 DISTNAME=	wterm-6.2.9
 CATEGORIES=	x11
@@ -25,6 +25,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/wtermthai.tiff \
 		${PREFIX}/share/WindowMaker/Icons
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../wm/windowmaker/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xpenguins/Makefile b/x11/xpenguins/Makefile
index 9f346ce2160..e365b8d51b4 100644
--- a/x11/xpenguins/Makefile
+++ b/x11/xpenguins/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/10/23 13:15:10 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2001/10/24 22:11:16 jlam Exp $
 #
 
 DISTNAME=	xpenguins-2.1
@@ -12,6 +12,6 @@ COMMENT=	Little penguins walking along the tops of your windows
 USE_BUILDLINK_ONLY=	YES
 GNU_CONFIGURE=		YES
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../graphics/xpm/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xpmroot/Makefile b/x11/xpmroot/Makefile
index 734a65138e6..73d33f3eca8 100644
--- a/x11/xpmroot/Makefile
+++ b/x11/xpmroot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2001/10/23 13:15:10 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2001/10/24 22:11:17 jlam Exp $
 #
 
 DISTNAME=       fvwm-${PKG_VERSION}
@@ -31,6 +31,6 @@ do-install:
 	${INSTALL_PROGRAM}	${WRKSRC}/utils/xpmroot	${PREFIX}/bin
 	${INSTALL_MAN}		${WRKSRC}/utils/xpmroot.1 ${PREFIX}/man/man1
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../graphics/xpm/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xteddy/Makefile b/x11/xteddy/Makefile
index e641568e16b..4a383276cde 100644
--- a/x11/xteddy/Makefile
+++ b/x11/xteddy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/10/23 13:15:11 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2001/10/24 22:11:17 jlam Exp $
 
 DISTNAME=	xteddy-1.1
 CATEGORIES=	x11 games
@@ -15,6 +15,6 @@ pre-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/xteddy
 	${INSTALL_DATA_DIR} ${PREFIX}/share/xteddy/pixmaps
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../graphics/xpm/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xteddy2/Makefile b/x11/xteddy2/Makefile
index 5e494631b2b..c7527a8b592 100644
--- a/x11/xteddy2/Makefile
+++ b/x11/xteddy2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/10/23 13:15:11 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2001/10/24 22:11:17 jlam Exp $
 
 DISTNAME=	xteddy-2.0.1
 CATEGORIES=	x11 games
@@ -25,6 +25,6 @@ pre-configure:
 		${RM} -f $${file}.fixme;				\
 	done
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../graphics/imlib/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"