From dff59f9ec3fce115212f12209d16f2eb7efc230a Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Tue, 23 Oct 2001 13:14:43 +0000
Subject: 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.

---
 editors/abiword/Makefile | 4 ++--
 editors/nedit/Makefile   | 4 ++--
 editors/vim-gtk/Makefile | 4 ++--
 editors/vim-xaw/Makefile | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'editors')

diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index d6ed30d2708..6c124267387 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2001/09/27 23:17:58 jlam Exp $
+# $NetBSD: Makefile,v 1.37 2001/10/23 13:14:50 jlam Exp $
 #
 # According to AbiSource's explanation of their trademark rights,
 # compilations/distributions of AbiWord not provided by AbiSource must
@@ -61,9 +61,9 @@ post-install:
 	${CHMOD} -R a+r ${PREFIX}/share/AbiSuite
 	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
 
+.include "../../mk/x11.buildlink.mk"
 .include "../../converters/libiconv/buildlink.mk"
 .include "../../graphics/png/buildlink.mk"
 .include "../../graphics/xpm/buildlink.mk"
 .include "../../x11/gtk/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/nedit/Makefile b/editors/nedit/Makefile
index e8d31965630..f7f13765cf8 100644
--- a/editors/nedit/Makefile
+++ b/editors/nedit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2001/09/12 02:27:56 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2001/10/23 13:14:51 jlam Exp $
 
 DISTNAME=	nedit-5.1.1-src
 PKGNAME=	nedit-5.1.1
@@ -22,7 +22,7 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/nedit
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/nedit
 
+.include "../../mk/x11.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/editors/vim-gtk/Makefile b/editors/vim-gtk/Makefile
index a6f289d3192..f1f5cb6987e 100644
--- a/editors/vim-gtk/Makefile
+++ b/editors/vim-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2001/10/04 10:18:11 martti Exp $
+# $NetBSD: Makefile,v 1.28 2001/10/23 13:14:51 jlam Exp $
 
 .include		"../vim-share/Makefile.common"
 
@@ -27,7 +27,7 @@ post-install:
 		${LN} -s vim ${PREFIX}/bin/$$f;				\
 	done
 
+.include "../../mk/x11.buildlink.mk"
 .include "../../devel/ncurses/buildlink.mk"
 .include "../../x11/gtk/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/vim-xaw/Makefile b/editors/vim-xaw/Makefile
index 1c98298ef53..2c743f672e8 100644
--- a/editors/vim-xaw/Makefile
+++ b/editors/vim-xaw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2001/09/27 23:18:01 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2001/10/23 13:14:51 jlam Exp $
 
 .include		"../vim-share/Makefile.common"
 
@@ -35,7 +35,7 @@ post-install:
 		${LN} -s vim ${PREFIX}/bin/$$f;				\
 	done
 
+.include "../../mk/x11.buildlink.mk"
 .include "../../devel/ncurses/buildlink.mk"
 .include "../../mk/xaw.buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
-- 
cgit v1.2.3