Regenerate to fix some pkglint warnings.

16 files changed, 70 insertions, 80 deletions

diff --git a/x11/libxfce4gui/buildlink3.mk b/x11/libxfce4gui/buildlink3.mk
index 84826fcac7d..8abda9f87b0 100644
--- a/x11/libxfce4gui/buildlink3.mk
+++ b/x11/libxfce4gui/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.18 2006/07/08 23:11:14 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2006/10/12 09:24:20 martti Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBXFCE4GUI_BUILDLINK3_MK:=	${LIBXFCE4GUI_BUILDLINK3_MK}+
 
-.if !empty(BUILDLINK_DEPTH:M+)
+.if ${BUILDLINK_DEPTH} == "+"
 BUILDLINK_DEPENDS+=	libxfce4gui
 .endif
 
@@ -11,9 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibxfce4gui}
 BUILDLINK_PACKAGES+=	libxfce4gui
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libxfce4gui
 
-.if !empty(LIBXFCE4GUI_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.libxfce4gui+=	libxfce4gui>=4.2.3
-BUILDLINK_ABI_DEPENDS.libxfce4gui?=	libxfce4gui>=4.2.3nb3
+.if ${LIBXFCE4GUI_BUILDLINK3_MK} == "+"
+BUILDLINK_API_DEPENDS.libxfce4gui+=	libxfce4gui>=4.2.3nb4
 BUILDLINK_PKGSRCDIR.libxfce4gui?=	../../x11/libxfce4gui
 .endif	# LIBXFCE4GUI_BUILDLINK3_MK
 
diff --git a/x11/libxfce4mcs/buildlink3.mk b/x11/libxfce4mcs/buildlink3.mk
index a11b62abd1b..3b62707c73e 100644
--- a/x11/libxfce4mcs/buildlink3.mk
+++ b/x11/libxfce4mcs/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.16 2006/07/08 23:11:14 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2006/10/12 09:24:20 martti Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBXFCE4MCS_BUILDLINK3_MK:=	${LIBXFCE4MCS_BUILDLINK3_MK}+
 
-.if !empty(BUILDLINK_DEPTH:M+)
+.if ${BUILDLINK_DEPTH} == "+"
 BUILDLINK_DEPENDS+=	libxfce4mcs
 .endif
 
@@ -11,9 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibxfce4mcs}
 BUILDLINK_PACKAGES+=	libxfce4mcs
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libxfce4mcs
 
-.if !empty(LIBXFCE4MCS_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.libxfce4mcs+=	libxfce4mcs>=4.2.3
-BUILDLINK_ABI_DEPENDS.libxfce4mcs?=	libxfce4mcs>=4.2.3nb1
+.if ${LIBXFCE4MCS_BUILDLINK3_MK} == "+"
+BUILDLINK_API_DEPENDS.libxfce4mcs+=	libxfce4mcs>=4.2.3nb2
 BUILDLINK_PKGSRCDIR.libxfce4mcs?=	../../x11/libxfce4mcs
 .endif	# LIBXFCE4MCS_BUILDLINK3_MK
 
diff --git a/x11/libxfce4util/buildlink3.mk b/x11/libxfce4util/buildlink3.mk
index 3fe5ea14564..1e70f72b71f 100644
--- a/x11/libxfce4util/buildlink3.mk
+++ b/x11/libxfce4util/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.16 2006/07/08 23:11:14 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2006/10/12 09:24:20 martti Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBXFCE4UTIL_BUILDLINK3_MK:=	${LIBXFCE4UTIL_BUILDLINK3_MK}+
 
-.if !empty(BUILDLINK_DEPTH:M+)
+.if ${BUILDLINK_DEPTH} == "+"
 BUILDLINK_DEPENDS+=	libxfce4util
 .endif
 
@@ -11,9 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibxfce4util}
 BUILDLINK_PACKAGES+=	libxfce4util
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libxfce4util
 
-.if !empty(LIBXFCE4UTIL_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.libxfce4util+=	libxfce4util>=4.2.3.2
-BUILDLINK_ABI_DEPENDS.libxfce4util?=	libxfce4util>=4.2.3.2nb1
+.if ${LIBXFCE4UTIL_BUILDLINK3_MK} == "+"
+BUILDLINK_API_DEPENDS.libxfce4util+=	libxfce4util>=4.2.3.2nb2
 BUILDLINK_PKGSRCDIR.libxfce4util?=	../../x11/libxfce4util
 .endif	# LIBXFCE4UTIL_BUILDLINK3_MK
 
diff --git a/x11/xfce4-clipman-plugin/buildlink3.mk b/x11/xfce4-clipman-plugin/buildlink3.mk
index eece1df9835..b15ac5f1174 100644
--- a/x11/xfce4-clipman-plugin/buildlink3.mk
+++ b/x11/xfce4-clipman-plugin/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 23:11:16 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2006/10/12 09:24:21 martti Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_CLIPMAN_PLUGIN_BUILDLINK3_MK:=	${XFCE4_CLIPMAN_PLUGIN_BUILDLINK3_MK}+
 
-.if !empty(BUILDLINK_DEPTH:M+)
+.if ${BUILDLINK_DEPTH} == "+"
 BUILDLINK_DEPENDS+=	xfce4-clipman-plugin
 .endif
 
@@ -11,9 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-clipman-plugin}
 BUILDLINK_PACKAGES+=	xfce4-clipman-plugin
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-clipman-plugin
 
-.if !empty(XFCE4_CLIPMAN_PLUGIN_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.xfce4-clipman-plugin+=	xfce4-clipman-plugin>=0.4.1
-BUILDLINK_ABI_DEPENDS.xfce4-clipman-plugin?=	xfce4-clipman-plugin>=0.4.1nb3
+.if ${XFCE4_CLIPMAN_PLUGIN_BUILDLINK3_MK} == "+"
+BUILDLINK_API_DEPENDS.xfce4-clipman-plugin+=	xfce4-clipman-plugin>=0.4.1nb3
 BUILDLINK_PKGSRCDIR.xfce4-clipman-plugin?=	../../x11/xfce4-clipman-plugin
 .endif	# XFCE4_CLIPMAN_PLUGIN_BUILDLINK3_MK
 
diff --git a/x11/xfce4-desktop/buildlink3.mk b/x11/xfce4-desktop/buildlink3.mk
index fc54e4d8044..bbf3cc33921 100644
--- a/x11/xfce4-desktop/buildlink3.mk
+++ b/x11/xfce4-desktop/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.17 2006/07/08 23:11:16 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2006/10/12 09:24:21 martti Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XFCE4_DESKTOP_BUILDLINK3_MK:=	${XFCE4_DESKTOP_BUILDLINK3_MK}+
 
-.if !empty(BUILDLINK_DEPTH:M+)
+.if ${BUILDLINK_DEPTH} == "+"
 BUILDLINK_DEPENDS+=	xfce4-desktop
 .endif
 
@@ -11,12 +11,12 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-desktop}
 BUILDLINK_PACKAGES+=	xfce4-desktop
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-desktop
 
-.if !empty(XFCE4_DESKTOP_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.xfce4-desktop+=	xfce4-desktop>=4.2.3
-BUILDLINK_ABI_DEPENDS.xfce4-desktop?=	xfce4-desktop>=4.2.3nb4
+.if ${XFCE4_DESKTOP_BUILDLINK3_MK} == "+"
+BUILDLINK_API_DEPENDS.xfce4-desktop+=	xfce4-desktop>=4.2.3nb4
 BUILDLINK_PKGSRCDIR.xfce4-desktop?=	../../x11/xfce4-desktop
 .endif	# XFCE4_DESKTOP_BUILDLINK3_MK
 
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/x11/xfce4-gtk2-engine/buildlink3.mk b/x11/xfce4-gtk2-engine/buildlink3.mk
index b9dfbcc05b5..072086bb375 100644
--- a/x11/xfce4-gtk2-engine/buildlink3.mk
+++ b/x11/xfce4-gtk2-engine/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:11:16 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/10/12 09:24:21 martti Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_GTK2_ENGINE_BUILDLINK3_MK:=	${XFCE4_GTK2_ENGINE_BUILDLINK3_MK}+
 
-.if !empty(BUILDLINK_DEPTH:M+)
+.if ${BUILDLINK_DEPTH} == "+"
 BUILDLINK_DEPENDS+=	xfce4-gtk2-engine
 .endif
 
@@ -11,9 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-gtk2-engine}
 BUILDLINK_PACKAGES+=	xfce4-gtk2-engine
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-gtk2-engine
 
-.if !empty(XFCE4_GTK2_ENGINE_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.xfce4-gtk2-engine+=	xfce4-gtk2-engine>=2.2.8
-BUILDLINK_ABI_DEPENDS.xfce4-gtk2-engine?=	xfce4-gtk2-engine>=2.2.8nb3
+.if ${XFCE4_GTK2_ENGINE_BUILDLINK3_MK} == "+"
+BUILDLINK_API_DEPENDS.xfce4-gtk2-engine+=	xfce4-gtk2-engine>=2.2.8nb4
 BUILDLINK_PKGSRCDIR.xfce4-gtk2-engine?=	../../x11/xfce4-gtk2-engine
 .endif	# XFCE4_GTK2_ENGINE_BUILDLINK3_MK
 
diff --git a/x11/xfce4-mcs-manager/buildlink3.mk b/x11/xfce4-mcs-manager/buildlink3.mk
index 49fac51dfed..3c0c93eabad 100644
--- a/x11/xfce4-mcs-manager/buildlink3.mk
+++ b/x11/xfce4-mcs-manager/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.16 2006/07/08 23:11:16 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2006/10/12 09:24:21 martti Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_MCS_MANAGER_BUILDLINK3_MK:=	${XFCE4_MCS_MANAGER_BUILDLINK3_MK}+
 
-.if !empty(BUILDLINK_DEPTH:M+)
+.if ${BUILDLINK_DEPTH} == "+"
 BUILDLINK_DEPENDS+=	xfce4-mcs-manager
 .endif
 
@@ -11,12 +11,12 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-mcs-manager}
 BUILDLINK_PACKAGES+=	xfce4-mcs-manager
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-mcs-manager
 
-.if !empty(XFCE4_MCS_MANAGER_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.xfce4-mcs-manager+=	xfce4-mcs-manager>=4.2.3
-BUILDLINK_ABI_DEPENDS.xfce4-mcs-manager?=	xfce4-mcs-manager>=4.2.3nb4
+.if ${XFCE4_MCS_MANAGER_BUILDLINK3_MK} == "+"
+BUILDLINK_API_DEPENDS.xfce4-mcs-manager+=	xfce4-mcs-manager>=4.2.3nb4
 BUILDLINK_PKGSRCDIR.xfce4-mcs-manager?=	../../x11/xfce4-mcs-manager
 .endif	# XFCE4_MCS_MANAGER_BUILDLINK3_MK
 
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../x11/libxfce4gui/buildlink3.mk"
 .include "../../x11/libxfce4mcs/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/x11/xfce4-mcs-plugins/buildlink3.mk b/x11/xfce4-mcs-plugins/buildlink3.mk
index 3b1dde04af8..d572a791a46 100644
--- a/x11/xfce4-mcs-plugins/buildlink3.mk
+++ b/x11/xfce4-mcs-plugins/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.16 2006/07/08 23:11:16 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2006/10/12 09:24:21 martti Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_MCS_PLUGINS_BUILDLINK3_MK:=	${XFCE4_MCS_PLUGINS_BUILDLINK3_MK}+
 
-.if !empty(BUILDLINK_DEPTH:M+)
+.if ${BUILDLINK_DEPTH} == "+"
 BUILDLINK_DEPENDS+=	xfce4-mcs-plugins
 .endif
 
@@ -11,12 +11,12 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-mcs-plugins}
 BUILDLINK_PACKAGES+=	xfce4-mcs-plugins
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-mcs-plugins
 
-.if !empty(XFCE4_MCS_PLUGINS_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.xfce4-mcs-plugins+=	xfce4-mcs-plugins>=4.2.3
-BUILDLINK_ABI_DEPENDS.xfce4-mcs-plugins?=	xfce4-mcs-plugins>=4.2.3nb4
+.if ${XFCE4_MCS_PLUGINS_BUILDLINK3_MK} == "+"
+BUILDLINK_API_DEPENDS.xfce4-mcs-plugins+=	xfce4-mcs-plugins>=4.2.3nb4
 BUILDLINK_PKGSRCDIR.xfce4-mcs-plugins?=	../../x11/xfce4-mcs-plugins
 .endif	# XFCE4_MCS_PLUGINS_BUILDLINK3_MK
 
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../x11/xfce4-mcs-manager/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 
diff --git a/x11/xfce4-notes-plugin/buildlink3.mk b/x11/xfce4-notes-plugin/buildlink3.mk
index f9caf29a95c..6ed03fbdcec 100644
--- a/x11/xfce4-notes-plugin/buildlink3.mk
+++ b/x11/xfce4-notes-plugin/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.14 2006/07/08 23:11:16 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2006/10/12 09:24:21 martti Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_NOTES_PLUGIN_BUILDLINK3_MK:=	${XFCE4_NOTES_PLUGIN_BUILDLINK3_MK}+
 
-.if !empty(BUILDLINK_DEPTH:M+)
+.if ${BUILDLINK_DEPTH} == "+"
 BUILDLINK_DEPENDS+=	xfce4-notes-plugin
 .endif
 
@@ -11,9 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-notes-plugin}
 BUILDLINK_PACKAGES+=	xfce4-notes-plugin
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-notes-plugin
 
-.if !empty(XFCE4_NOTES_PLUGIN_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.xfce4-notes-plugin+=	xfce4-notes-plugin>=0.11.1
-BUILDLINK_ABI_DEPENDS.xfce4-notes-plugin?=	xfce4-notes-plugin>=0.11.1nb3
+.if ${XFCE4_NOTES_PLUGIN_BUILDLINK3_MK} == "+"
+BUILDLINK_API_DEPENDS.xfce4-notes-plugin+=	xfce4-notes-plugin>=0.11.1nb3
 BUILDLINK_PKGSRCDIR.xfce4-notes-plugin?=	../../x11/xfce4-notes-plugin
 .endif	# XFCE4_NOTES_PLUGIN_BUILDLINK3_MK
 
diff --git a/x11/xfce4-panel/buildlink3.mk b/x11/xfce4-panel/buildlink3.mk
index 5ee8bbc292e..a0004fcb3a8 100644
--- a/x11/xfce4-panel/buildlink3.mk
+++ b/x11/xfce4-panel/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.17 2006/07/08 23:11:16 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2006/10/12 09:24:21 martti Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XFCE4_PANEL_BUILDLINK3_MK:=	${XFCE4_PANEL_BUILDLINK3_MK}+
 
-.if !empty(BUILDLINK_DEPTH:M+)
+.if ${BUILDLINK_DEPTH} == "+"
 BUILDLINK_DEPENDS+=	xfce4-panel
 .endif
 
@@ -11,12 +11,12 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-panel}
 BUILDLINK_PACKAGES+=	xfce4-panel
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-panel
 
-.if !empty(XFCE4_PANEL_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.xfce4-panel+=	xfce4-panel>=4.2.3
-BUILDLINK_ABI_DEPENDS.xfce4-panel?=	xfce4-panel>=4.2.3nb4
+.if ${XFCE4_PANEL_BUILDLINK3_MK} == "+"
+BUILDLINK_API_DEPENDS.xfce4-panel+=	xfce4-panel>=4.2.3nb4
 BUILDLINK_PKGSRCDIR.xfce4-panel?=	../../x11/xfce4-panel
 .endif	# XFCE4_PANEL_BUILDLINK3_MK
 
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
diff --git a/x11/xfce4-session/buildlink3.mk b/x11/xfce4-session/buildlink3.mk
index deae44afa02..053cc87b528 100644
--- a/x11/xfce4-session/buildlink3.mk
+++ b/x11/xfce4-session/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 23:11:17 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/10/12 09:24:21 martti Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XFCE4_SESSION_BUILDLINK3_MK:=	${XFCE4_SESSION_BUILDLINK3_MK}+
 
-.if !empty(BUILDLINK_DEPTH:M+)
+.if ${BUILDLINK_DEPTH} == "+"
 BUILDLINK_DEPENDS+=	xfce4-session
 .endif
 
@@ -11,12 +11,12 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-session}
 BUILDLINK_PACKAGES+=	xfce4-session
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-session
 
-.if !empty(XFCE4_SESSION_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.xfce4-session+=	xfce4-session>=4.2.3
-BUILDLINK_ABI_DEPENDS.xfce4-session?=	xfce4-session>=4.2.3nb4
+.if ${XFCE4_SESSION_BUILDLINK3_MK} == "+"
+BUILDLINK_API_DEPENDS.xfce4-session+=	xfce4-session>=4.2.3nb4
 BUILDLINK_PKGSRCDIR.xfce4-session?=	../../x11/xfce4-session
 .endif	# XFCE4_SESSION_BUILDLINK3_MK
 
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 
diff --git a/x11/xfce4-taskbar-plugin/buildlink3.mk b/x11/xfce4-taskbar-plugin/buildlink3.mk
index ef819752c1e..738195de701 100644
--- a/x11/xfce4-taskbar-plugin/buildlink3.mk
+++ b/x11/xfce4-taskbar-plugin/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 23:11:17 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/10/12 09:24:21 martti Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_TASKBAR_PLUGIN_BUILDLINK3_MK:=	${XFCE4_TASKBAR_PLUGIN_BUILDLINK3_MK}+
 
-.if !empty(BUILDLINK_DEPTH:M+)
+.if ${BUILDLINK_DEPTH} == "+"
 BUILDLINK_DEPENDS+=	xfce4-taskbar-plugin
 .endif
 
@@ -11,9 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-taskbar-plugin}
 BUILDLINK_PACKAGES+=	xfce4-taskbar-plugin
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-taskbar-plugin
 
-.if !empty(XFCE4_TASKBAR_PLUGIN_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.xfce4-taskbar-plugin+=	xfce4-taskbar-plugin>=0.2.2
-BUILDLINK_ABI_DEPENDS.xfce4-taskbar-plugin?=	xfce4-taskbar-plugin>=0.2.2nb3
+.if ${XFCE4_TASKBAR_PLUGIN_BUILDLINK3_MK} == "+"
+BUILDLINK_API_DEPENDS.xfce4-taskbar-plugin+=	xfce4-taskbar-plugin>=0.2.2nb3
 BUILDLINK_PKGSRCDIR.xfce4-taskbar-plugin?=	../../x11/xfce4-taskbar-plugin
 .endif	# XFCE4_TASKBAR_PLUGIN_BUILDLINK3_MK
 
diff --git a/x11/xfce4-toys/buildlink3.mk b/x11/xfce4-toys/buildlink3.mk
index 4dd606c3935..57a2d9d4569 100644
--- a/x11/xfce4-toys/buildlink3.mk
+++ b/x11/xfce4-toys/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.16 2006/07/08 23:11:17 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2006/10/12 09:24:21 martti Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XFCE4_TOYS_BUILDLINK3_MK:=	${XFCE4_TOYS_BUILDLINK3_MK}+
 
-.if !empty(BUILDLINK_DEPTH:M+)
+.if ${BUILDLINK_DEPTH} == "+"
 BUILDLINK_DEPENDS+=	xfce4-toys
 .endif
 
@@ -11,9 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-toys}
 BUILDLINK_PACKAGES+=	xfce4-toys
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-toys
 
-.if !empty(XFCE4_TOYS_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.xfce4-toys+=	xfce4-toys>=4.2.3
-BUILDLINK_ABI_DEPENDS.xfce4-toys?=	xfce4-toys>=4.2.3nb3
+.if ${XFCE4_TOYS_BUILDLINK3_MK} == "+"
+BUILDLINK_API_DEPENDS.xfce4-toys+=	xfce4-toys>=4.2.3nb3
 BUILDLINK_PKGSRCDIR.xfce4-toys?=	../../x11/xfce4-toys
 .endif	# XFCE4_TOYS_BUILDLINK3_MK
 
diff --git a/x11/xfce4-trigger-launcher/buildlink3.mk b/x11/xfce4-trigger-launcher/buildlink3.mk
index a4882fc8279..b29dc680682 100644
--- a/x11/xfce4-trigger-launcher/buildlink3.mk
+++ b/x11/xfce4-trigger-launcher/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.17 2006/07/08 23:11:17 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2006/10/12 09:24:21 martti Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_TRIGGER_LAUNCHER_BUILDLINK3_MK:=	${XFCE4_TRIGGER_LAUNCHER_BUILDLINK3_MK}+
 
-.if !empty(BUILDLINK_DEPTH:M+)
+.if ${BUILDLINK_DEPTH} == "+"
 BUILDLINK_DEPENDS+=	xfce4-trigger-launcher
 .endif
 
@@ -11,9 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-trigger-launcher}
 BUILDLINK_PACKAGES+=	xfce4-trigger-launcher
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-trigger-launcher
 
-.if !empty(XFCE4_TRIGGER_LAUNCHER_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.xfce4-trigger-launcher+=	xfce4-trigger-launcher>=4.2.3
-BUILDLINK_ABI_DEPENDS.xfce4-trigger-launcher?=	xfce4-trigger-launcher>=4.2.3nb3
+.if ${XFCE4_TRIGGER_LAUNCHER_BUILDLINK3_MK} == "+"
+BUILDLINK_API_DEPENDS.xfce4-trigger-launcher+=	xfce4-trigger-launcher>=4.2.3nb3
 BUILDLINK_PKGSRCDIR.xfce4-trigger-launcher?=	../../x11/xfce4-trigger-launcher
 .endif	# XFCE4_TRIGGER_LAUNCHER_BUILDLINK3_MK
 
diff --git a/x11/xfce4-utils/buildlink3.mk b/x11/xfce4-utils/buildlink3.mk
index 7ae983ae577..9e45120cf6f 100644
--- a/x11/xfce4-utils/buildlink3.mk
+++ b/x11/xfce4-utils/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.19 2006/07/08 23:11:17 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2006/10/12 09:24:21 martti Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XFCE4_UTILS_BUILDLINK3_MK:=	${XFCE4_UTILS_BUILDLINK3_MK}+
 
-.if !empty(BUILDLINK_DEPTH:M+)
+.if ${BUILDLINK_DEPTH} == "+"
 BUILDLINK_DEPENDS+=	xfce4-utils
 .endif
 
@@ -11,12 +11,12 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-utils}
 BUILDLINK_PACKAGES+=	xfce4-utils
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-utils
 
-.if !empty(XFCE4_UTILS_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.xfce4-utils+=	xfce4-utils>=4.2.3
-BUILDLINK_ABI_DEPENDS.xfce4-utils?=	xfce4-utils>=4.2.3nb5
+.if ${XFCE4_UTILS_BUILDLINK3_MK} == "+"
+BUILDLINK_API_DEPENDS.xfce4-utils+=	xfce4-utils>=4.2.3nb5
 BUILDLINK_PKGSRCDIR.xfce4-utils?=	../../x11/xfce4-utils
 .endif	# XFCE4_UTILS_BUILDLINK3_MK
 
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 
diff --git a/x11/xfce4-windowlist-plugin/buildlink3.mk b/x11/xfce4-windowlist-plugin/buildlink3.mk
index 7966c6d17bc..8cb64b3df85 100644
--- a/x11/xfce4-windowlist-plugin/buildlink3.mk
+++ b/x11/xfce4-windowlist-plugin/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:11:17 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/10/12 09:24:21 martti Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_WINDOWLIST_PLUGIN_BUILDLINK3_MK:=	${XFCE4_WINDOWLIST_PLUGIN_BUILDLINK3_MK}+
 
-.if !empty(BUILDLINK_DEPTH:M+)
+.if ${BUILDLINK_DEPTH} == "+"
 BUILDLINK_DEPENDS+=	xfce4-windowlist-plugin
 .endif
 
@@ -11,9 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-windowlist-plugin}
 BUILDLINK_PACKAGES+=	xfce4-windowlist-plugin
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-windowlist-plugin
 
-.if !empty(XFCE4_WINDOWLIST_PLUGIN_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.xfce4-windowlist-plugin+=	xfce4-windowlist-plugin>=0.1.0nb1
-BUILDLINK_ABI_DEPENDS.xfce4-windowlist-plugin?=	xfce4-windowlist-plugin>=0.1.0nb4
+.if ${XFCE4_WINDOWLIST_PLUGIN_BUILDLINK3_MK} == "+"
+BUILDLINK_API_DEPENDS.xfce4-windowlist-plugin+=	xfce4-windowlist-plugin>=0.1.0nb4
 BUILDLINK_PKGSRCDIR.xfce4-windowlist-plugin?=	../../x11/xfce4-windowlist-plugin
 .endif	# XFCE4_WINDOWLIST_PLUGIN_BUILDLINK3_MK