summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2005-06-06 19:27:57 +0000
committerjlam <jlam@pkgsrc.org>2005-06-06 19:27:57 +0000
commit17482d3d5f16c8523fe0906f1cb8ef35bbb3ef8f (patch)
tree859ad9f0af0a43a5189dca937a56bda89fff4e6a /x11
parentf2d0a42a26d3b1e9ed9787bccfe2642a12e68c20 (diff)
downloadpkgsrc-17482d3d5f16c8523fe0906f1cb8ef35bbb3ef8f.tar.gz
randrext doesn't require X11 to build, but Xrandr does, so move the
inclusion of x11.buildlink3.mk from randrext into Xrandr.
Diffstat (limited to 'x11')
-rw-r--r--x11/Xrandr-mixedcase/Makefile4
-rw-r--r--x11/Xrandr-mixedcase/buildlink3.mk3
-rw-r--r--x11/randrext/buildlink3.mk3
3 files changed, 6 insertions, 4 deletions
diff --git a/x11/Xrandr-mixedcase/Makefile b/x11/Xrandr-mixedcase/Makefile
index cb5f8114cc4..f20969ceab7 100644
--- a/x11/Xrandr-mixedcase/Makefile
+++ b/x11/Xrandr-mixedcase/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/04/11 21:48:04 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/06/06 19:27:57 jlam Exp $
#
DISTNAME= libXrandr-1.0.2
@@ -26,4 +26,6 @@ BUILDLINK_DEPENDS.randrext+= randrext>=1.0
.include "../../x11/randrext/buildlink3.mk"
.include "../../x11/xextensions/buildlink3.mk"
.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../mk/x11.buildlink3.mk"
+
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/Xrandr-mixedcase/buildlink3.mk b/x11/Xrandr-mixedcase/buildlink3.mk
index c1fe37e601f..cee82eb08c8 100644
--- a/x11/Xrandr-mixedcase/buildlink3.mk
+++ b/x11/Xrandr-mixedcase/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2005/06/01 18:03:27 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2005/06/06 19:27:57 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XRANDR_BUILDLINK3_MK:= ${XRANDR_BUILDLINK3_MK}+
@@ -18,5 +18,6 @@ BUILDLINK_PKGSRCDIR.Xrandr?= ../../x11/Xrandr
.include "../../x11/randrext/buildlink3.mk"
.include "../../x11/Xrender/buildlink3.mk"
+.include "../../mk/x11.buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/randrext/buildlink3.mk b/x11/randrext/buildlink3.mk
index bbb82b174ac..0c29598f758 100644
--- a/x11/randrext/buildlink3.mk
+++ b/x11/randrext/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2005/06/01 18:03:30 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2005/06/06 19:27:57 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
RANDREXT_BUILDLINK3_MK:= ${RANDREXT_BUILDLINK3_MK}+
@@ -17,6 +17,5 @@ BUILDLINK_DEPMETHOD.randrext?= build
.endif # RANDREXT_BUILDLINK3_MK
.include "../../x11/xextensions/buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}