x11.buildlink.mk needs to be included before any buildlink.mk files that

use X11_BUILDLINK_MK as a test value.  Generally just reordering the
inclusions so that x11.buildlink.mk comes before the other buildlink.mk
files will make everthing work.

23 files changed, 46 insertions, 47 deletions

diff --git a/x11/Xbae/Makefile b/x11/Xbae/Makefile
index 35c4e0e45e2..02be864c87c 100644
--- a/x11/Xbae/Makefile
+++ b/x11/Xbae/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/09/12 02:57:38 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2001/10/23 13:15:06 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/motif.buildlink.mk"
 .include "../../mk/x11.buildlink.mk"
+.include "../../mk/motif.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/XmHTML/Makefile b/x11/XmHTML/Makefile
index 908e9b65bf4..f764b733a51 100644
--- a/x11/XmHTML/Makefile
+++ b/x11/XmHTML/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2001/09/12 04:05:03 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2001/10/23 13:15:07 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 2df415dbca9..bee0e541e7e 100644
--- a/x11/controlcenter/Makefile
+++ b/x11/controlcenter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2001/10/06 13:09:52 rh Exp $
+# $NetBSD: Makefile,v 1.33 2001/10/23 13:15:07 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/gettext-lib/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 c06a3806315..2449ad55f67 100644
--- a/x11/ebuilder/Makefile
+++ b/x11/ebuilder/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2001/08/29 22:41:27 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2001/10/23 13:15:07 jlam Exp $
 #
 
 DISTNAME=	ebuilder-0.56d
@@ -19,6 +19,6 @@ MAKE_ENV+=		CXXFLAGS="${CXXFLAGS}"
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/ebuilder ${PREFIX}/bin
 
-.include "../../x11/qt2-libs/buildlink.mk"
 .include "../../mk/x11.buildlink.mk"
+.include "../../x11/qt2-libs/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile
index 144869e24e8..58c28b8d5d3 100644
--- a/x11/eterm/Makefile
+++ b/x11/eterm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/08/29 22:41:27 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2001/10/23 13:15:07 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 "../../graphics/imlib/buildlink.mk"
 .include "../../mk/x11.buildlink.mk"
+.include "../../graphics/imlib/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/fltk/Makefile b/x11/fltk/Makefile
index c75d351813b..e56125fe157 100644
--- a/x11/fltk/Makefile
+++ b/x11/fltk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2001/08/29 22:41:28 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2001/10/23 13:15:07 jlam Exp $
 #
 
 DISTNAME=	${PKGNAME}-source
@@ -30,6 +30,6 @@ test:
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV}				\
 		${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} test
 
-.include "../../graphics/Mesa/buildlink.mk"
 .include "../../mk/x11.buildlink.mk"
+.include "../../graphics/Mesa/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gnome-core/Makefile b/x11/gnome-core/Makefile
index 98f74b479ea..93e01b1bc01 100644
--- a/x11/gnome-core/Makefile
+++ b/x11/gnome-core/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.70 2001/10/12 20:11:55 tron Exp $
+# $NetBSD: Makefile,v 1.71 2001/10/23 13:15:08 jlam Exp $
 
 DISTNAME=		gnome-core-1.4.0.4
 CATEGORIES=		x11 gnome
@@ -42,6 +42,7 @@ post-install:
 .endfor
 .endfor
 
+.include "../../mk/x11.buildlink.mk"
 .include "../../archivers/bzip2/buildlink.mk"
 .include "../../graphics/gdk-pixbuf-gnome/buildlink.mk"
 .include "../../www/libghttp/buildlink.mk"
@@ -49,5 +50,4 @@ post-install:
 .include "../../devel/libglade/buildlink.mk"
 .include "../../www/gtkhtml/buildlink.mk"
 .include "../../devel/gettext-lib/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 95be3088a9f..7a556656265 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.71 2001/10/03 22:36:41 jlam Exp $
+# $NetBSD: Makefile,v 1.72 2001/10/23 13:15:08 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 c7050881c16..7405d4dc9d4 100644
--- a/x11/gtk--/Makefile
+++ b/x11/gtk--/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2001/10/23 03:13:28 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2001/10/23 13:15:08 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 feb3c7b167e..334acf56a7b 100644
--- a/x11/gtk/Makefile
+++ b/x11/gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2001/10/03 22:36:41 jlam Exp $
+# $NetBSD: Makefile,v 1.67 2001/10/23 13:15:08 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/qt2-designer-kde/Makefile b/x11/qt2-designer-kde/Makefile
index 105046ebdc4..7f87841a90b 100644
--- a/x11/qt2-designer-kde/Makefile
+++ b/x11/qt2-designer-kde/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/09/13 01:19:20 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2001/10/23 13:15:08 jlam Exp $
 #
 
 .include "../qt2-libs/Makefile.common"
@@ -24,8 +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 fd7308a0f51..411355aab5b 100644
--- a/x11/qt2-libs/Makefile
+++ b/x11/qt2-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2001/08/29 22:41:29 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2001/10/23 13:15:09 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 157dffca0a9..d93a3501fe8 100644
--- a/x11/qwt/Makefile
+++ b/x11/qwt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/09/27 23:19:02 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2001/10/23 13:15:09 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 "../../x11/qt2-libs/buildlink.mk"
 .include "../../mk/x11.buildlink.mk"
+.include "../../x11/qt2-libs/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/rxvt/Makefile b/x11/rxvt/Makefile
index c64ba1611cc..f341924e444 100644
--- a/x11/rxvt/Makefile
+++ b/x11/rxvt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2001/09/30 16:38:08 martin Exp $
+# $NetBSD: Makefile,v 1.29 2001/10/23 13:15:09 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 "../../graphics/xpm/buildlink.mk"
 .include "../../mk/x11.buildlink.mk"
+.include "../../graphics/xpm/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/tk/Makefile b/x11/tk/Makefile
index 8e7b0da462b..dd96ddbb0d4 100644
--- a/x11/tk/Makefile
+++ b/x11/tk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/10/23 09:57:30 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2001/10/23 13:15:09 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 "../../lang/tcl/buildlink.mk"
 .include "../../mk/x11.buildlink.mk"
+.include "../../lang/tcl/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/wmessage/Makefile b/x11/wmessage/Makefile
index c49d9397a39..57fa668c7ed 100644
--- a/x11/wmessage/Makefile
+++ b/x11/wmessage/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/10/05 13:24:22 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2001/10/23 13:15:09 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 dfed1494c35..5cb88b18a25 100644
--- a/x11/wmfire/Makefile
+++ b/x11/wmfire/Makefile
@@ -1,4 +1,4 @@
-#$NetBSD: Makefile,v 1.8 2001/08/29 22:41:31 jlam Exp $
+#$NetBSD: Makefile,v 1.9 2001/10/23 13:15:10 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 "../../graphics/xpm/buildlink.mk"
 .include "../../mk/x11.buildlink.mk"
+.include "../../graphics/xpm/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/wmweather/Makefile b/x11/wmweather/Makefile
index 324161fe962..ed35ee58646 100644
--- a/x11/wmweather/Makefile
+++ b/x11/wmweather/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/08/29 22:41:31 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2001/10/23 13:15:10 jlam Exp $
 #
 
 DISTNAME=	wmWeather-1.31
@@ -17,6 +17,6 @@ REPLACE_PERL=		GrabWeather
 
 CPPFLAGS+=		-I${X11BASE}/include
 
-.include "../../graphics/xpm/buildlink.mk"
 .include "../../mk/x11.buildlink.mk"
+.include "../../graphics/xpm/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/wterm/Makefile b/x11/wterm/Makefile
index 95e9a3b8882..4defe8cf5bb 100644
--- a/x11/wterm/Makefile
+++ b/x11/wterm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/10/05 21:49:30 tron Exp $
+# $NetBSD: Makefile,v 1.15 2001/10/23 13:15:10 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 "../../wm/windowmaker/buildlink.mk"
 .include "../../mk/x11.buildlink.mk"
+.include "../../wm/windowmaker/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xpenguins/Makefile b/x11/xpenguins/Makefile
index a47612f0578..9f346ce2160 100644
--- a/x11/xpenguins/Makefile
+++ b/x11/xpenguins/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/08/29 22:41:31 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2001/10/23 13:15:10 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 "../../graphics/xpm/buildlink.mk"
 .include "../../mk/x11.buildlink.mk"
+.include "../../graphics/xpm/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xpmroot/Makefile b/x11/xpmroot/Makefile
index a521ae26353..734a65138e6 100644
--- a/x11/xpmroot/Makefile
+++ b/x11/xpmroot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2001/10/09 12:19:05 martti Exp $
+# $NetBSD: Makefile,v 1.21 2001/10/23 13:15:10 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 "../../graphics/xpm/buildlink.mk"
 .include "../../mk/x11.buildlink.mk"
+.include "../../graphics/xpm/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xteddy/Makefile b/x11/xteddy/Makefile
index 56568ad88a2..e641568e16b 100644
--- a/x11/xteddy/Makefile
+++ b/x11/xteddy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/08/29 22:41:32 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2001/10/23 13:15:11 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 "../../graphics/xpm/buildlink.mk"
 .include "../../mk/x11.buildlink.mk"
+.include "../../graphics/xpm/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xteddy2/Makefile b/x11/xteddy2/Makefile
index 007708d17cb..5e494631b2b 100644
--- a/x11/xteddy2/Makefile
+++ b/x11/xteddy2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/08/29 22:41:32 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2001/10/23 13:15:11 jlam Exp $
 
 DISTNAME=	xteddy-2.0.1
 CATEGORIES=	x11 games
@@ -25,6 +25,6 @@ pre-configure:
 		${RM} -f $${file}.fixme;				\
 	done
 
-.include "../../graphics/imlib/buildlink.mk"
 .include "../../mk/x11.buildlink.mk"
+.include "../../graphics/imlib/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"