summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2004-01-04 23:34:04 +0000
committerjlam <jlam@pkgsrc.org>2004-01-04 23:34:04 +0000
commit2a6f2578ceb8dea84c69d345ba4ee9bd7b5c980c (patch)
treee66d1a7fb76a2717d0a9349bc523aaa4d7516eff /x11
parentcb03cc8b04aa34076b2ba9a33e600d292395a391 (diff)
downloadpkgsrc-2a6f2578ceb8dea84c69d345ba4ee9bd7b5c980c.tar.gz
Re-arrange to match example buildlink3.mk file in bsd.buildlink3.mk.
Diffstat (limited to 'x11')
-rw-r--r--x11/Xrandr-mixedcase/buildlink3.mk18
-rw-r--r--x11/Xrender/buildlink3.mk8
-rw-r--r--x11/gtk/buildlink3.mk17
-rw-r--r--x11/tk/buildlink3.mk16
-rw-r--r--x11/xcursor/buildlink3.mk16
5 files changed, 32 insertions, 43 deletions
diff --git a/x11/Xrandr-mixedcase/buildlink3.mk b/x11/Xrandr-mixedcase/buildlink3.mk
index 4c15b9a7df2..72f77f59eae 100644
--- a/x11/Xrandr-mixedcase/buildlink3.mk
+++ b/x11/Xrandr-mixedcase/buildlink3.mk
@@ -1,22 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2003/12/04 14:40:40 recht Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:07 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XRANDR_BUILDLINK3_MK:= ${XRANDR_BUILDLINK3_MK}+
-.if !empty(XRANDR_BUILDLINK3_MK:M\+)
-. include "../../mk/bsd.prefs.mk"
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+= Xrandr
+.endif
+
+BUILDLINK_IS_BUILTIN.Xrender?= no
+.if !empty(XRANDR_BUILDLINK3_MK:M+)
BUILDLINK_DEPENDS.Xrandr?= Xrandr>=1.0.1
BUILDLINK_PKGSRCDIR.Xrandr?= ../../x11/Xrandr
BUILDLINK_PACKAGES+= Xrandr
.endif # XRANDR_BUILDLINK3_MK
-.if !defined(BUILDLINK_IS_BUILTIN.Xrender)
-BUILDLINK_IS_BUILTIN.Xrender= NO
-.endif
-
-.if !empty(BUILDLINK_DEPTH:M\+)
-BUILDLINK_DEPENDS+= Xrandr
-.endif
-
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:C/\+$//}
diff --git a/x11/Xrender/buildlink3.mk b/x11/Xrender/buildlink3.mk
index 74fc0bdcdc3..e7961f3de26 100644
--- a/x11/Xrender/buildlink3.mk
+++ b/x11/Xrender/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.8 2003/11/10 02:26:53 fredb Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2004/01/04 23:34:07 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XRENDER_BUILDLINK3_MK:= ${XRENDER_BUILDLINK3_MK}+
-.if !empty(XRENDER_BUILDLINK3_MK:M\+)
+.if !empty(XRENDER_BUILDLINK3_MK:M+)
. include "../../mk/bsd.prefs.mk"
BUILDLINK_DEPENDS.Xrender?= Xrender>=0.2
@@ -65,12 +65,12 @@ MAKEFLAGS+= _NEED_XRENDER="${_NEED_XRENDER}"
# minor number bump.
#
BUILDLINK_DEPENDS.Xrender= Xrender>=0.8.2
-. if !empty(BUILDLINK_DEPTH:M\+)
+. if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= Xrender
. endif
.endif
-.if !empty(XRENDER_BUILDLINK3_MK:M\+)
+.if !empty(XRENDER_BUILDLINK3_MK:M+)
. if ${_NEED_XRENDER} == "YES"
BUILDLINK_PACKAGES+= Xrender
. else
diff --git a/x11/gtk/buildlink3.mk b/x11/gtk/buildlink3.mk
index ca5fbe0a6ed..1c45f1c3763 100644
--- a/x11/gtk/buildlink3.mk
+++ b/x11/gtk/buildlink3.mk
@@ -1,21 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/01/03 23:06:45 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:07 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GTK_BUILDLINK3_MK:= ${GTK_BUILDLINK3_MK}+
-.if !empty(GTK_BUILDLINK3_MK:M\+)
-BUILDLINK_DEPENDS.gtk?= gtk+>=1.2.10nb5
-BUILDLINK_PKGSRCDIR.gtk?= ../../x11/gtk
-.endif # GTK_BUILDLINK3_MK
-
-.if !empty(BUILDLINK_DEPTH:M\+)
+.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= gtk
.endif
-.if !empty(GTK_BUILDLINK3_MK:M\+)
-BUILDLINK_PACKAGES+= gtk
+.if !empty(GTK_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+= gtk
+BUILDLINK_DEPENDS.gtk?= gtk+>=1.2.10nb5
+BUILDLINK_PKGSRCDIR.gtk?= ../../x11/gtk
-USE_X11= YES
+USE_X11= YES
. include "../../devel/gettext-lib/buildlink3.mk"
. include "../../devel/glib/buildlink3.mk"
diff --git a/x11/tk/buildlink3.mk b/x11/tk/buildlink3.mk
index 873256e5c51..77ed49eb9b7 100644
--- a/x11/tk/buildlink3.mk
+++ b/x11/tk/buildlink3.mk
@@ -1,19 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/01/03 23:06:45 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:07 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
TK_BUILDLINK3_MK:= ${TK_BUILDLINK3_MK}+
-.if !empty(TK_BUILDLINK3_MK:M\+)
-BUILDLINK_DEPENDS.tk?= tk>=8.3.4
-BUILDLINK_PKGSRCDIR.tk?= ../../x11/tk
-.endif # TK_BUILDLINK3_MK
-
-.if !empty(BUILDLINK_DEPTH:M\+)
+.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= tk
.endif
-.if !empty(TK_BUILDLINK3_MK:M\+)
-BUILDLINK_PACKAGES+= tk
+.if !empty(TK_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+= tk
+BUILDLINK_DEPENDS.tk?= tk>=8.3.4
+BUILDLINK_PKGSRCDIR.tk?= ../../x11/tk
+
BUILDLINK_FILES.tk= bin/wish*
#
# Make "-ltk" resolve into "-ltk83", so that we don't need to patch so
diff --git a/x11/xcursor/buildlink3.mk b/x11/xcursor/buildlink3.mk
index 2baca37f61f..fcc51afb4aa 100644
--- a/x11/xcursor/buildlink3.mk
+++ b/x11/xcursor/buildlink3.mk
@@ -1,20 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2003/12/16 08:51:42 recht Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:07 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XCURSOR_BUILDLINK3_MK:= ${XCURSOR_BUILDLINK3_MK}+
-.if !empty(XCURSOR_BUILDLINK3_MK:M\+)
-. include "../../mk/bsd.prefs.mk"
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+= xcursor
+.endif
+
+BUILDLINK_IS_BUILTIN.xcursor?= no
+.if !empty(XCURSOR_BUILDLINK3_MK:M+)
BUILDLINK_DEPENDS.xcursor?= xcursor>=1.1.1
BUILDLINK_PKGSRCDIR.xcursor?= ../../x11/xcursor
BUILDLINK_PACKAGES+= xcursor
.endif # XCURSOR_BUILDLINK3_MK
-BUILDLINK_IS_BUILTIN.xcursor= NO
-
-.if !empty(BUILDLINK_DEPTH:M\+)
-BUILDLINK_DEPENDS+= xcursor
-.endif
-
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:C/\+$//}