Thu Mar 19 16:20:52 2009 UTC ()
Don't use + in variable names.  It's asking for troubles.


(cube)
diff -r1.6 -r1.7 pkgsrc/x11/gtk+extra/buildlink3.mk
diff -r1.8 -r1.9 pkgsrc/x11/gtk2+extra/buildlink3.mk
cvs diff -r1.6 -r1.7 pkgsrc/x11/gtk+extra/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/x11/gtk+extra/buildlink3.mk 2006/07/08 23:11:14 1.6
+++ pkgsrc/x11/gtk+extra/buildlink3.mk 2009/03/19 16:20:52 1.7
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:14 jlam Exp $ 1# $NetBSD: buildlink3.mk,v 1.7 2009/03/19 16:20:52 cube Exp $
2 2
3BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ 3BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
4GTK+EXTRA_BUILDLINK3_MK:= ${GTK+EXTRA_BUILDLINK3_MK}+ 4GTK_EXTRA_BUILDLINK3_MK:= ${GTK+EXTRA_BUILDLINK3_MK}+
5 5
6.if !empty(BUILDLINK_DEPTH:M+) 6.if !empty(BUILDLINK_DEPTH:M+)
7BUILDLINK_DEPENDS+= gtk+extra 7BUILDLINK_DEPENDS+= gtk+extra
8.endif 8.endif
9 9
10BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngtk+extra} 10BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngtk+extra}
11BUILDLINK_PACKAGES+= gtk+extra 11BUILDLINK_PACKAGES+= gtk+extra
12BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gtk+extra 12BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gtk+extra
13 13
14.if !empty(GTK+EXTRA_BUILDLINK3_MK:M+) 14.if !empty(GTK_EXTRA_BUILDLINK3_MK:M+)
15BUILDLINK_API_DEPENDS.gtk+extra+= gtk+extra>=0.99.17nb2 15BUILDLINK_API_DEPENDS.gtk+extra+= gtk+extra>=0.99.17nb2
16BUILDLINK_ABI_DEPENDS.gtk+extra?= gtk+extra>=0.99.17nb5 16BUILDLINK_ABI_DEPENDS.gtk+extra?= gtk+extra>=0.99.17nb5
17BUILDLINK_PKGSRCDIR.gtk+extra?= ../../x11/gtk+extra 17BUILDLINK_PKGSRCDIR.gtk+extra?= ../../x11/gtk+extra
18.endif # GTK+EXTRA_BUILDLINK3_MK 18.endif # GTK_EXTRA_BUILDLINK3_MK
19 19
20.include "../../x11/gtk/buildlink3.mk" 20.include "../../x11/gtk/buildlink3.mk"
21 21
22BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} 22BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
cvs diff -r1.8 -r1.9 pkgsrc/x11/gtk2+extra/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/x11/gtk2+extra/buildlink3.mk 2006/07/08 23:11:14 1.8
+++ pkgsrc/x11/gtk2+extra/buildlink3.mk 2009/03/19 16:20:52 1.9
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:11:14 jlam Exp $ 1# $NetBSD: buildlink3.mk,v 1.9 2009/03/19 16:20:52 cube Exp $
2 2
3BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ 3BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
4GTK2+EXTRA_BUILDLINK3_MK:= ${GTK2+EXTRA_BUILDLINK3_MK}+ 4GTK2_EXTRA_BUILDLINK3_MK:= ${GTK2+EXTRA_BUILDLINK3_MK}+
5 5
6.if !empty(BUILDLINK_DEPTH:M+) 6.if !empty(BUILDLINK_DEPTH:M+)
7BUILDLINK_DEPENDS+= gtk2+extra 7BUILDLINK_DEPENDS+= gtk2+extra
8.endif 8.endif
9 9
10BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngtk2+extra} 10BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngtk2+extra}
11BUILDLINK_PACKAGES+= gtk2+extra 11BUILDLINK_PACKAGES+= gtk2+extra
12BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gtk2+extra 12BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gtk2+extra
13 13
14.if !empty(GTK2+EXTRA_BUILDLINK3_MK:M+) 14.if !empty(GTK2_EXTRA_BUILDLINK3_MK:M+)
15BUILDLINK_API_DEPENDS.gtk2+extra+= gtk2+extra>=2.1.1 15BUILDLINK_API_DEPENDS.gtk2+extra+= gtk2+extra>=2.1.1
16BUILDLINK_ABI_DEPENDS.gtk2+extra?= gtk2+extra>=2.1.1nb3 16BUILDLINK_ABI_DEPENDS.gtk2+extra?= gtk2+extra>=2.1.1nb3
17BUILDLINK_PKGSRCDIR.gtk2+extra?= ../../x11/gtk2+extra 17BUILDLINK_PKGSRCDIR.gtk2+extra?= ../../x11/gtk2+extra
18.endif # GTK2+EXTRA_BUILDLINK3_MK 18.endif # GTK2_EXTRA_BUILDLINK3_MK
19 19
20.include "../../x11/gtk2/buildlink3.mk" 20.include "../../x11/gtk2/buildlink3.mk"
21 21
22BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} 22BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}