From a4bc16d30c123e03c4125fdd70bde0eb8a71f4a4 Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Wed, 24 Oct 2001 22:10:43 +0000
Subject: 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.

---
 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 6c124267387..00bba939c9e 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2001/10/23 13:14:50 jlam Exp $
+# $NetBSD: Makefile,v 1.38 2001/10/24 22:10:53 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 f7f13765cf8..5efb6c5d335 100644
--- a/editors/nedit/Makefile
+++ b/editors/nedit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2001/10/23 13:14:51 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2001/10/24 22:10:53 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 f1f5cb6987e..540c8eef5b3 100644
--- a/editors/vim-gtk/Makefile
+++ b/editors/vim-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2001/10/23 13:14:51 jlam Exp $
+# $NetBSD: Makefile,v 1.29 2001/10/24 22:10:54 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 2c743f672e8..52a67ca9b31 100644
--- a/editors/vim-xaw/Makefile
+++ b/editors/vim-xaw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2001/10/23 13:14:51 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2001/10/24 22:10:54 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