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 context 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,7 +1,7 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:14 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/19 16:20:52 cube Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-GTK+EXTRA_BUILDLINK3_MK:=	${GTK+EXTRA_BUILDLINK3_MK}+
+GTK_EXTRA_BUILDLINK3_MK:=	${GTK+EXTRA_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	gtk+extra
@@ -11,11 +11,11 @@
 BUILDLINK_PACKAGES+=	gtk+extra
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gtk+extra
 
-.if !empty(GTK+EXTRA_BUILDLINK3_MK:M+)
+.if !empty(GTK_EXTRA_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gtk+extra+=	gtk+extra>=0.99.17nb2
 BUILDLINK_ABI_DEPENDS.gtk+extra?=	gtk+extra>=0.99.17nb5
 BUILDLINK_PKGSRCDIR.gtk+extra?=	../../x11/gtk+extra
-.endif	# GTK+EXTRA_BUILDLINK3_MK
+.endif	# GTK_EXTRA_BUILDLINK3_MK
 
 .include "../../x11/gtk/buildlink3.mk"
 

cvs diff -r1.8 -r1.9 pkgsrc/x11/gtk2+extra/buildlink3.mk (expand / switch to context 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,7 +1,7 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:11:14 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/19 16:20:52 cube Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-GTK2+EXTRA_BUILDLINK3_MK:=	${GTK2+EXTRA_BUILDLINK3_MK}+
+GTK2_EXTRA_BUILDLINK3_MK:=	${GTK2+EXTRA_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	gtk2+extra
@@ -11,11 +11,11 @@
 BUILDLINK_PACKAGES+=	gtk2+extra
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gtk2+extra
 
-.if !empty(GTK2+EXTRA_BUILDLINK3_MK:M+)
+.if !empty(GTK2_EXTRA_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gtk2+extra+=	gtk2+extra>=2.1.1
 BUILDLINK_ABI_DEPENDS.gtk2+extra?=	gtk2+extra>=2.1.1nb3
 BUILDLINK_PKGSRCDIR.gtk2+extra?=	../../x11/gtk2+extra
-.endif	# GTK2+EXTRA_BUILDLINK3_MK
+.endif	# GTK2_EXTRA_BUILDLINK3_MK
 
 .include "../../x11/gtk2/buildlink3.mk"