From 64d5c1c5c4436176a8881d0f16b167f731bec43d Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Mon, 6 Jun 2005 19:08:56 +0000
Subject: render doesn't require X11 to build, but Xrender does, so move the
 inclusion of x11.buildlink3.mk from render into Xrender.

---
 x11/Xrender/Makefile      | 3 ++-
 x11/Xrender/buildlink3.mk | 3 ++-
 x11/render/buildlink3.mk  | 4 +---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/x11/Xrender/Makefile b/x11/Xrender/Makefile
index f7b7d955b79..fcd049f2317 100644
--- a/x11/Xrender/Makefile
+++ b/x11/Xrender/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/04/11 21:48:04 tv Exp $
+# $NetBSD: Makefile,v 1.23 2005/06/06 19:08:56 jlam Exp $
 
 DISTNAME=	libXrender-0.8.4
 PKGNAME=	${DISTNAME:S/lib//}
@@ -21,4 +21,5 @@ BUILDLINK_DEPENDS.render+=	render>=0.8
 
 .include "../../devel/pkgconfig/buildlink3.mk"
 .include "../../x11/render/buildlink3.mk"
+.include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/Xrender/buildlink3.mk b/x11/Xrender/buildlink3.mk
index fb35eb2ba7a..09c4f239dd4 100644
--- a/x11/Xrender/buildlink3.mk
+++ b/x11/Xrender/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.33 2005/06/01 18:03:27 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.34 2005/06/06 19:08:56 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 XRENDER_BUILDLINK3_MK:=	${XRENDER_BUILDLINK3_MK}+
@@ -16,6 +16,7 @@ BUILDLINK_RECOMMENDED.Xrender+=	Xrender>=0.8.4nb1
 BUILDLINK_PKGSRCDIR.Xrender?=	../../x11/Xrender
 .endif	# XRENDER_BUILDLINK3_MK
 
+.include "../../mk/x11.buildlink3.mk"
 .include "../../x11/render/buildlink3.mk"
 
 BUILDLINK_DEPTH:=       ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/render/buildlink3.mk b/x11/render/buildlink3.mk
index ecf6422bf62..d205f028d69 100644
--- a/x11/render/buildlink3.mk
+++ b/x11/render/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2005/06/01 18:03:30 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2005/06/06 19:08:56 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 RENDER_BUILDLINK3_MK:=	${RENDER_BUILDLINK3_MK}+
@@ -16,6 +16,4 @@ BUILDLINK_PKGSRCDIR.render?=	../../x11/render
 BUILDLINK_DEPMETHOD.render?=	build
 .endif	# RENDER_BUILDLINK3_MK
 
-.include "../../mk/x11.buildlink3.mk"
-
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
-- 
cgit v1.2.3