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.

---
 www/Mosaic/Makefile  | 4 ++--
 www/amaya/Makefile   | 4 ++--
 www/gtkhtml/Makefile | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'www')

diff --git a/www/Mosaic/Makefile b/www/Mosaic/Makefile
index 6a6a804741b..0a9b61670bb 100644
--- a/www/Mosaic/Makefile
+++ b/www/Mosaic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2001/10/23 13:15:06 jlam Exp $
+# $NetBSD: Makefile,v 1.33 2001/10/24 22:11:10 jlam Exp $
 # FreeBSD Id: Makefile,v 1.15 1998/05/27 08:44:56 dburr Exp
 #
 
@@ -38,10 +38,10 @@ do-install:
 		${PREFIX}/lib/X11/app-defaults/Mosaic
 	${INSTALL_DATA_DIR} ${PREFIX}/share/mosaic
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../devel/zlib/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/www/amaya/Makefile b/www/amaya/Makefile
index 99179439d70..4e5f3383772 100644
--- a/www/amaya/Makefile
+++ b/www/amaya/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/10/23 13:15:06 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2001/10/24 22:11:10 jlam Exp $
 
 DISTNAME=	amaya-src-5.1
 PKGNAME=	amaya-5.1
@@ -47,9 +47,9 @@ post-patch:
 pre-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/Amaya
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../graphics/jpeg/buildlink.mk"
 .include "../../graphics/png/buildlink.mk"
 .include "../../www/libwww/buildlink.mk"
 .include "../../mk/motif.buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/gtkhtml/Makefile b/www/gtkhtml/Makefile
index 2d465fac2be..f51af11500a 100644
--- a/www/gtkhtml/Makefile
+++ b/www/gtkhtml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2001/10/23 13:15:06 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2001/10/24 22:11:10 jlam Exp $
 
 DISTNAME=		gtkhtml-0.14.0
 CATEGORIES=		www gnome
@@ -17,11 +17,11 @@ GNU_CONFIGURE=		YES
 
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../devel/bonobo/buildlink.mk"
 .include "../../devel/gal/buildlink.mk"
 .include "../../print/gnome-print/buildlink.mk"
 .include "../../www/glibwww/buildlink.mk"
 .include "../../www/libghttp/buildlink.mk"
 .include "../../x11/controlcenter/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
-- 
cgit v1.2.3