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.

---
 chat/gaim/Makefile     | 4 ++--
 chat/gtkyahoo/Makefile | 4 ++--
 chat/kyahoo/Makefile   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'chat')

diff --git a/chat/gaim/Makefile b/chat/gaim/Makefile
index 2092995de4d..899a020cc5d 100644
--- a/chat/gaim/Makefile
+++ b/chat/gaim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/10/23 13:14:47 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2001/10/24 22:10:48 jlam Exp $
 #
 
 DISTNAME=	gaim-0.44
@@ -30,7 +30,7 @@ CONFIGURE_ARGS+=	--enable-pixbuf
 
 CONFIGURE_ENV+=		pixbufcfg="${GDK_PIXBUF_CONFIG}"
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../audio/esound/buildlink.mk"
 .include "../../graphics/gdk-pixbuf/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/gtkyahoo/Makefile b/chat/gtkyahoo/Makefile
index f7891910525..365ee9acca2 100644
--- a/chat/gtkyahoo/Makefile
+++ b/chat/gtkyahoo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/10/23 13:14:47 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2001/10/24 22:10:48 jlam Exp $
 
 DISTNAME=	gtkyahoo-0.18.2
 CATEGORIES=	chat
@@ -20,7 +20,7 @@ CONFIGURE_ARGS+=	--with-libyahoo="${BUILDLINK_DIR}"
 pre-configure:
 	${RM} -rf ${WRKSRC}/libyahoo
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../chat/libyahoo/buildlink.mk"
 .include "../../x11/gtk/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/kyahoo/Makefile b/chat/kyahoo/Makefile
index 71791bc1e54..695c01bac0b 100644
--- a/chat/kyahoo/Makefile
+++ b/chat/kyahoo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/10/23 13:14:47 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2001/10/24 22:10:48 jlam Exp $
 
 DISTNAME=	kyahoo-0.7
 CATEGORIES=	chat
@@ -25,7 +25,7 @@ MAKE_ENV+=		USER_LDFLAGS="${LDFLAGS}"
 pre-build:
 	${CHMOD} +x ${WRKSRC}/missing
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../chat/libyahoo/buildlink.mk"
 .include "../../x11/kdebase2/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
-- 
cgit v1.2.3