From 9d18cbcf3d344d366ec69d93d4b07cfec98c8420 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
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.

---
 converters/psiconv/Makefile | 4 ++--
 converters/wv/Makefile      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'converters')

diff --git a/converters/psiconv/Makefile b/converters/psiconv/Makefile
index f973a71803a..288067798f1 100644
--- a/converters/psiconv/Makefile
+++ b/converters/psiconv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/10/23 13:14:48 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2001/10/24 22:10:49 jlam Exp $
 #
 
 DISTNAME=	psiconv-0.6.1
@@ -23,6 +23,6 @@ post-install:
 		${INSTALL_DATA} $${file} ${DOCDIR};			\
 	done
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../graphics/ImageMagick/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/converters/wv/Makefile b/converters/wv/Makefile
index 1aab71deab5..bcfb4c44c54 100644
--- a/converters/wv/Makefile
+++ b/converters/wv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2001/10/23 13:14:48 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2001/10/24 22:10:50 jlam Exp $
 #
 
 DISTNAME=		wv-0.6.7
@@ -25,9 +25,9 @@ post-install:
 	cd ${WRKSRC} && ${INSTALL_DATA} COPYING CREDITS INSTALL KNOWN-BUGS \
 		README help/Docs/XML_Tags ${PREFIX}/share/doc/wv
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../converters/libiconv/buildlink.mk"
 .include "../../devel/glib/buildlink.mk"
 .include "../../graphics/ImageMagick/buildlink.mk"
 .include "../../graphics/libwmf/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
-- 
cgit v1.2.3