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.

5 files changed, 10 insertions, 10 deletions

diff --git a/cad/dinotrace/Makefile b/cad/dinotrace/Makefile
index 95bc1a98fd2..96ea094297f 100644
--- a/cad/dinotrace/Makefile
+++ b/cad/dinotrace/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/10/17 02:23:19 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2001/10/23 13:14:46 jlam Exp $
 #
 
 DISTNAME=	dinotrace-9.1d
@@ -16,6 +16,6 @@ INFO_FILES=	dinotrace.info
 USE_BUILDLINK_ONLY=	YES
 GNU_CONFIGURE=		YES
 
-.include "../../mk/motif.buildlink.mk"
 .include "../../mk/x11.buildlink.mk"
+.include "../../mk/motif.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/felt/Makefile b/cad/felt/Makefile
index eebc4dc777c..3ecd75ca7f3 100644
--- a/cad/felt/Makefile
+++ b/cad/felt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2001/08/29 22:41:04 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2001/10/23 13:14:46 jlam Exp $
 
 DISTNAME=		felt-3.05.src
 PKGNAME=		felt-3.05
@@ -36,7 +36,7 @@ post-install:
 		COPYING CHANGELOG TODO ${PREFIX}/share/doc/felt
 	${INSTALL_DATA} ${WRKSRC}/examples/* ${PREFIX}/share/examples/felt
 
+.include "../../mk/x11.buildlink.mk"
 .include "../../devel/readline/buildlink.mk"
 .include "../../mk/xaw.buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/ng-spice/Makefile b/cad/ng-spice/Makefile
index 88ff94bfa98..2bc6a491715 100644
--- a/cad/ng-spice/Makefile
+++ b/cad/ng-spice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/09/27 23:17:46 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2001/10/23 13:14:46 jlam Exp $
 #
 
 DISTNAME=	ng-spice-rework-13
@@ -21,7 +21,7 @@ LIBS+=			${LIBGETOPT}
 
 USE_BUILDLINK_ONLY=	YES
 
+.include "../../mk/x11.buildlink.mk"
 .include "../../devel/libgetopt/buildlink.mk"
 .include "../../devel/ncurses/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/qcad/Makefile b/cad/qcad/Makefile
index 5f72118daa2..5170f77b1cb 100644
--- a/cad/qcad/Makefile
+++ b/cad/qcad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/08/29 22:41:05 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2001/10/23 13:14:46 jlam Exp $
 
 DISTNAME=		qcad-1.4.7-src
 PKGNAME=		qcad-1.4.7
@@ -33,6 +33,6 @@ do-install:
 	TODO cur doc examples fonts hatches libraries messages xpm) |	\
 	(cd ${PREFIX}/share/qcad; ${GTAR} vxf - )
 
-.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/cad/vipec/Makefile b/cad/vipec/Makefile
index 07286bf35b8..118b1abc59b 100644
--- a/cad/vipec/Makefile
+++ b/cad/vipec/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2001/08/29 22:41:06 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2001/10/23 13:14:46 jlam Exp $
 #
 
 DISTNAME=	vipec-2.0.4
@@ -34,6 +34,6 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/vipec/help/models/*.html ${PREFIX}/share/doc/vipec/models
 	${INSTALL_DATA} ${WRKSRC}/vipec/help/models/*.png ${PREFIX}/share/doc/vipec/models
 
-.include "../../x11/qt2-libs/buildlink.mk"
 .include "../../mk/x11.buildlink.mk"
+.include "../../x11/qt2-libs/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"