[pkgsrc/trunk]: pkgsrc/x11 render doesn't require X11 to build, but Xrender d...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/16676152b0d4
branches:  trunk
changeset: 495313:16676152b0d4
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon Jun 06 19:08:56 2005 +0000

description:
render doesn't require X11 to build, but Xrender does, so move the
inclusion of x11.buildlink3.mk from render into Xrender.

diffstat:

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

diffs (48 lines):

diff -r 0233d7e4ccf2 -r 16676152b0d4 x11/Xrender/Makefile
--- a/x11/Xrender/Makefile      Mon Jun 06 18:57:30 2005 +0000
+++ b/x11/Xrender/Makefile      Mon Jun 06 19:08:56 2005 +0000
@@ -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 @@
 
 .include "../../devel/pkgconfig/buildlink3.mk"
 .include "../../x11/render/buildlink3.mk"
+.include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 0233d7e4ccf2 -r 16676152b0d4 x11/Xrender/buildlink3.mk
--- a/x11/Xrender/buildlink3.mk Mon Jun 06 18:57:30 2005 +0000
+++ b/x11/Xrender/buildlink3.mk Mon Jun 06 19:08:56 2005 +0000
@@ -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_PKGSRCDIR.Xrender?=  ../../x11/Xrender
 .endif # XRENDER_BUILDLINK3_MK
 
+.include "../../mk/x11.buildlink3.mk"
 .include "../../x11/render/buildlink3.mk"
 
 BUILDLINK_DEPTH:=       ${BUILDLINK_DEPTH:S/+$//}
diff -r 0233d7e4ccf2 -r 16676152b0d4 x11/render/buildlink3.mk
--- a/x11/render/buildlink3.mk  Mon Jun 06 18:57:30 2005 +0000
+++ b/x11/render/buildlink3.mk  Mon Jun 06 19:08:56 2005 +0000
@@ -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_DEPMETHOD.render?=   build
 .endif # RENDER_BUILDLINK3_MK
 
-.include "../../mk/x11.buildlink3.mk"
-
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH:S/+$//}