Regenerate to fix some pkglint warnings.

39 files changed, 168 insertions, 195 deletions

diff --git a/audio/xfce4-mixer/buildlink3.mk b/audio/xfce4-mixer/buildlink3.mk
index 08e54c12b4f..84c9b6b5d53 100644
--- a/audio/xfce4-mixer/buildlink3.mk
+++ b/audio/xfce4-mixer/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.17 2006/07/08 23:10:38 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2006/10/12 09:24:19 martti Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XFCE4_MIXER_BUILDLINK3_MK:=	${XFCE4_MIXER_BUILDLINK3_MK}+
 
-.if !empty(BUILDLINK_DEPTH:M+)
+.if ${BUILDLINK_DEPTH} == "+"
 BUILDLINK_DEPENDS+=	xfce4-mixer
 .endif
 
@@ -11,12 +11,12 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-mixer}
 BUILDLINK_PACKAGES+=	xfce4-mixer
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-mixer
 
-.if !empty(XFCE4_MIXER_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.xfce4-mixer+=	xfce4-mixer>=4.2.3
-BUILDLINK_ABI_DEPENDS.xfce4-mixer?=	xfce4-mixer>=4.2.3nb4
+.if ${XFCE4_MIXER_BUILDLINK3_MK} == "+"
+BUILDLINK_API_DEPENDS.xfce4-mixer+=	xfce4-mixer>=4.2.3nb4
 BUILDLINK_PKGSRCDIR.xfce4-mixer?=	../../audio/xfce4-mixer
 .endif	# XFCE4_MIXER_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/graphics/xfce4-icon-theme/buildlink3.mk b/graphics/xfce4-icon-theme/buildlink3.mk
index 1cc3a98b161..b6333b277df 100644
--- a/graphics/xfce4-icon-theme/buildlink3.mk
+++ b/graphics/xfce4-icon-theme/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:53 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/10/12 09:24:19 martti Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_ICON_THEME_BUILDLINK3_MK:=	${XFCE4_ICON_THEME_BUILDLINK3_MK}+
 
-.if !empty(BUILDLINK_DEPTH:M+)
+.if ${BUILDLINK_DEPTH} == "+"
 BUILDLINK_DEPENDS+=	xfce4-icon-theme
 .endif
 
@@ -11,9 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-icon-theme}
 BUILDLINK_PACKAGES+=	xfce4-icon-theme
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-icon-theme
 
-.if !empty(XFCE4_ICON_THEME_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.xfce4-icon-theme+=	xfce4-icon-theme>=4.2.3
-BUILDLINK_ABI_DEPENDS.xfce4-icon-theme?=	xfce4-icon-theme>=4.2.3nb1
+.if ${XFCE4_ICON_THEME_BUILDLINK3_MK} == "+"
+BUILDLINK_API_DEPENDS.xfce4-icon-theme+=	xfce4-icon-theme>=4.2.3nb1
 BUILDLINK_PKGSRCDIR.xfce4-icon-theme?=	../../graphics/xfce4-icon-theme
 .endif	# XFCE4_ICON_THEME_BUILDLINK3_MK
 
diff --git a/graphics/xfce4-iconbox/buildlink3.mk b/graphics/xfce4-iconbox/buildlink3.mk
index fd8b4f7dcaf..111afbed0ac 100644
--- a/graphics/xfce4-iconbox/buildlink3.mk
+++ b/graphics/xfce4-iconbox/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.16 2006/07/08 23:10:53 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2006/10/12 09:24:19 martti Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XFCE4_ICONBOX_BUILDLINK3_MK:=	${XFCE4_ICONBOX_BUILDLINK3_MK}+
 
-.if !empty(BUILDLINK_DEPTH:M+)
+.if ${BUILDLINK_DEPTH} == "+"
 BUILDLINK_DEPENDS+=	xfce4-iconbox
 .endif
 
@@ -11,12 +11,12 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-iconbox}
 BUILDLINK_PACKAGES+=	xfce4-iconbox
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-iconbox
 
-.if !empty(XFCE4_ICONBOX_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.xfce4-iconbox+=	xfce4-iconbox>=4.2.3
-BUILDLINK_ABI_DEPENDS.xfce4-iconbox?=	xfce4-iconbox>=4.2.3nb4
+.if ${XFCE4_ICONBOX_BUILDLINK3_MK} == "+"
+BUILDLINK_API_DEPENDS.xfce4-iconbox+=	xfce4-iconbox>=4.2.3nb4
 BUILDLINK_PKGSRCDIR.xfce4-iconbox?=	../../graphics/xfce4-iconbox
 .endif	# XFCE4_ICONBOX_BUILDLINK3_MK
 
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 
diff --git a/meta-pkgs/xfce4/buildlink3.mk b/meta-pkgs/xfce4/buildlink3.mk
index 54c43d30284..d8ec66e8d62 100644
--- a/meta-pkgs/xfce4/buildlink3.mk
+++ b/meta-pkgs/xfce4/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.15 2006/07/08 23:11:00 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2006/10/12 09:24:19 martti Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 XFCE4_BUILDLINK3_MK:=	${XFCE4_BUILDLINK3_MK}+
 
-.if !empty(BUILDLINK_DEPTH:M+)
+.if ${BUILDLINK_DEPTH} == "+"
 BUILDLINK_DEPENDS+=	xfce4
 .endif
 
@@ -11,9 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4}
 BUILDLINK_PACKAGES+=	xfce4
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4
 
-.if !empty(XFCE4_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.xfce4+=	xfce4>=4.2.3.1
-BUILDLINK_ABI_DEPENDS.xfce4?=	xfce4>=4.2.3.2nb3
+.if ${XFCE4_BUILDLINK3_MK} == "+"
+BUILDLINK_API_DEPENDS.xfce4+=	xfce4>=4.2.3.2nb3
 BUILDLINK_PKGSRCDIR.xfce4?=	../../meta-pkgs/xfce4
 .endif	# XFCE4_BUILDLINK3_MK
 
diff --git a/misc/xfce4-weather-plugin/buildlink3.mk b/misc/xfce4-weather-plugin/buildlink3.mk
index 036016c7664..50b3dfaafdd 100644
--- a/misc/xfce4-weather-plugin/buildlink3.mk
+++ b/misc/xfce4-weather-plugin/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:11:00 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/10/12 09:24:19 martti Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_WEATHER_PLUGIN_BUILDLINK3_MK:=	${XFCE4_WEATHER_PLUGIN_BUILDLINK3_MK}+
 
-.if !empty(BUILDLINK_DEPTH:M+)
+.if ${BUILDLINK_DEPTH} == "+"
 BUILDLINK_DEPENDS+=	xfce4-weather-plugin
 .endif
 
@@ -11,9 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-weather-plugin}
 BUILDLINK_PACKAGES+=	xfce4-weather-plugin
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-weather-plugin
 
-.if !empty(XFCE4_WEATHER_PLUGIN_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.xfce4-weather-plugin+=	xfce4-weather-plugin>=0.4.9
-BUILDLINK_ABI_DEPENDS.xfce4-weather-plugin?=	xfce4-weather-plugin>=0.4.9nb3
+.if ${XFCE4_WEATHER_PLUGIN_BUILDLINK3_MK} == "+"
+BUILDLINK_API_DEPENDS.xfce4-weather-plugin+=	xfce4-weather-plugin>=0.4.9nb3
 BUILDLINK_PKGSRCDIR.xfce4-weather-plugin?=	../../misc/xfce4-weather-plugin
 .endif	# XFCE4_WEATHER_PLUGIN_BUILDLINK3_MK
 
diff --git a/net/xfce4-wavelan-plugin/buildlink3.mk b/net/xfce4-wavelan-plugin/buildlink3.mk
index 3cadbbce547..8c4d7e2233c 100644
--- a/net/xfce4-wavelan-plugin/buildlink3.mk
+++ b/net/xfce4-wavelan-plugin/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 23:11:04 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/10/12 09:24:19 martti Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_WAVELAN_PLUGIN_BUILDLINK3_MK:=	${XFCE4_WAVELAN_PLUGIN_BUILDLINK3_MK}+
 
-.if !empty(BUILDLINK_DEPTH:M+)
+.if ${BUILDLINK_DEPTH} == "+"
 BUILDLINK_DEPENDS+=	xfce4-wavelan-plugin
 .endif
 
@@ -11,9 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-wavelan-plugin}
 BUILDLINK_PACKAGES+=	xfce4-wavelan-plugin
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-wavelan-plugin
 
-.if !empty(XFCE4_WAVELAN_PLUGIN_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.xfce4-wavelan-plugin+=	xfce4-wavelan-plugin>=0.4.1nb1
-BUILDLINK_ABI_DEPENDS.xfce4-wavelan-plugin?=	xfce4-wavelan-plugin>=0.4.1nb4
+.if ${XFCE4_WAVELAN_PLUGIN_BUILDLINK3_MK} == "+"
+BUILDLINK_API_DEPENDS.xfce4-wavelan-plugin+=	xfce4-wavelan-plugin>=0.4.1nb4
 BUILDLINK_PKGSRCDIR.xfce4-wavelan-plugin?=	../../net/xfce4-wavelan-plugin
 .endif	# XFCE4_WAVELAN_PLUGIN_BUILDLINK3_MK
 
diff --git a/print/xfce4-print/buildlink3.mk b/print/xfce4-print/buildlink3.mk
index 111e48e291f..f059609bcd5 100644
--- a/print/xfce4-print/buildlink3.mk
+++ b/print/xfce4-print/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.17 2006/07/08 23:11:05 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2006/10/12 09:24:19 martti Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XFCE4_PRINT_BUILDLINK3_MK:=	${XFCE4_PRINT_BUILDLINK3_MK}+
 
-.if !empty(BUILDLINK_DEPTH:M+)
+.if ${BUILDLINK_DEPTH} == "+"
 BUILDLINK_DEPENDS+=	xfce4-print
 .endif
 
@@ -11,12 +11,12 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-print}
 BUILDLINK_PACKAGES+=	xfce4-print
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-print
 
-.if !empty(XFCE4_PRINT_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.xfce4-print+=	xfce4-print>=4.2.3
-BUILDLINK_ABI_DEPENDS.xfce4-print?=	xfce4-print>=4.2.3nb4
+.if ${XFCE4_PRINT_BUILDLINK3_MK} == "+"
+BUILDLINK_API_DEPENDS.xfce4-print+=	xfce4-print>=4.2.3nb4
 BUILDLINK_PKGSRCDIR.xfce4-print?=	../../print/xfce4-print
 .endif	# XFCE4_PRINT_BUILDLINK3_MK
 
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../print/a2ps/buildlink3.mk"
 .include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/sysutils/xfce4-appfinder/buildlink3.mk b/sysutils/xfce4-appfinder/buildlink3.mk
index 4544763b512..eb04b245f72 100644
--- a/sysutils/xfce4-appfinder/buildlink3.mk
+++ b/sysutils/xfce4-appfinder/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 23:11:09 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/10/12 09:24:19 martti Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XFCE4_APPFINDER_BUILDLINK3_MK:=	${XFCE4_APPFINDER_BUILDLINK3_MK}+
 
-.if !empty(BUILDLINK_DEPTH:M+)
+.if ${BUILDLINK_DEPTH} == "+"
 BUILDLINK_DEPENDS+=	xfce4-appfinder
 .endif
 
@@ -11,9 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-appfinder}
 BUILDLINK_PACKAGES+=	xfce4-appfinder
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-appfinder
 
-.if !empty(XFCE4_APPFINDER_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.xfce4-appfinder+=	xfce4-appfinder>=4.2.3
-BUILDLINK_ABI_DEPENDS.xfce4-appfinder?=	xfce4-appfinder>=4.2.3nb3
+.if ${XFCE4_APPFINDER_BUILDLINK3_MK} == "+"
+BUILDLINK_API_DEPENDS.xfce4-appfinder+=	xfce4-appfinder>=4.2.3nb3
 BUILDLINK_PKGSRCDIR.xfce4-appfinder?=	../../sysutils/xfce4-appfinder
 .endif	# XFCE4_APPFINDER_BUILDLINK3_MK
 
diff --git a/sysutils/xfce4-cpugraph-plugin/buildlink3.mk b/sysutils/xfce4-cpugraph-plugin/buildlink3.mk
index 876fe0cb97f..0c78661be7e 100644
--- a/sysutils/xfce4-cpugraph-plugin/buildlink3.mk
+++ b/sysutils/xfce4-cpugraph-plugin/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:11:09 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/10/12 09:24:19 martti Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_CPUGRAPH_PLUGIN_BUILDLINK3_MK:=	${XFCE4_CPUGRAPH_PLUGIN_BUILDLINK3_MK}+
 
-.if !empty(BUILDLINK_DEPTH:M+)
+.if ${BUILDLINK_DEPTH} == "+"
 BUILDLINK_DEPENDS+=	xfce4-cpugraph-plugin
 .endif
 
@@ -11,9 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-cpugraph-plugin}
 BUILDLINK_PACKAGES+=	xfce4-cpugraph-plugin
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-cpugraph-plugin
 
-.if !empty(XFCE4_CPUGRAPH_PLUGIN_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.xfce4-cpugraph-plugin+=	xfce4-cpugraph-plugin>=0.2.2nb1
-BUILDLINK_ABI_DEPENDS.xfce4-cpugraph-plugin?=	xfce4-cpugraph-plugin>=0.2.2nb4
+.if ${XFCE4_CPUGRAPH_PLUGIN_BUILDLINK3_MK} == "+"
+BUILDLINK_API_DEPENDS.xfce4-cpugraph-plugin+=	xfce4-cpugraph-plugin>=0.2.2nb4
 BUILDLINK_PKGSRCDIR.xfce4-cpugraph-plugin?=	../../sysutils/xfce4-cpugraph-plugin
 .endif	# XFCE4_CPUGRAPH_PLUGIN_BUILDLINK3_MK
 
diff --git a/sysutils/xfce4-diskperf-plugin/buildlink3.mk b/sysutils/xfce4-diskperf-plugin/buildlink3.mk
index 2035af1e17c..e3fedd98afc 100644
--- a/sysutils/xfce4-diskperf-plugin/buildlink3.mk
+++ b/sysutils/xfce4-diskperf-plugin/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 23:11:09 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/10/12 09:24:19 martti Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_DISKPERF_PLUGIN_BUILDLINK3_MK:=	${XFCE4_DISKPERF_PLUGIN_BUILDLINK3_MK}+
 
-.if !empty(BUILDLINK_DEPTH:M+)
+.if ${BUILDLINK_DEPTH} == "+"
 BUILDLINK_DEPENDS+=	xfce4-diskperf-plugin
 .endif
 
@@ -11,9 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-diskperf-plugin}
 BUILDLINK_PACKAGES+=	xfce4-diskperf-plugin
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-diskperf-plugin
 
-.if !empty(XFCE4_DISKPERF_PLUGIN_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.xfce4-diskperf-plugin+=	xfce4-diskperf-plugin>=1.5
-BUILDLINK_ABI_DEPENDS.xfce4-diskperf-plugin?=	xfce4-diskperf-plugin>=1.5nb3
+.if ${XFCE4_DISKPERF_PLUGIN_BUILDLINK3_MK} == "+"
+BUILDLINK_API_DEPENDS.xfce4-diskperf-plugin+=	xfce4-diskperf-plugin>=1.5nb3
 BUILDLINK_PKGSRCDIR.xfce4-diskperf-plugin?=	../../sysutils/xfce4-diskperf-plugin
 .endif	# XFCE4_DISKPERF_PLUGIN_BUILDLINK3_MK
 
diff --git a/sysutils/xfce4-fm/buildlink3.mk b/sysutils/xfce4-fm/buildlink3.mk
index 4054119aae9..7148b65e61b 100644
--- a/sysutils/xfce4-fm/buildlink3.mk
+++ b/sysutils/xfce4-fm/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.16 2006/07/08 23:11:09 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2006/10/12 09:24:19 martti Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XFCE4_FM_BUILDLINK3_MK:=	${XFCE4_FM_BUILDLINK3_MK}+
 
-.if !empty(BUILDLINK_DEPTH:M+)
+.if ${BUILDLINK_DEPTH} == "+"
 BUILDLINK_DEPENDS+=	xfce4-fm
 .endif
 
@@ -11,13 +11,13 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-fm}
 BUILDLINK_PACKAGES+=	xfce4-fm
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-fm
 
-.if !empty(XFCE4_FM_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.xfce4-fm+=	xfce4-fm>=4.2.3
-BUILDLINK_ABI_DEPENDS.xfce4-fm?=	xfce4-fm>=4.2.3nb4
+.if ${XFCE4_FM_BUILDLINK3_MK} == "+"
+BUILDLINK_API_DEPENDS.xfce4-fm+=	xfce4-fm>=4.2.3nb4
 BUILDLINK_PKGSRCDIR.xfce4-fm?=	../../sysutils/xfce4-fm
 .endif	# XFCE4_FM_BUILDLINK3_MK
 
 .include "../../databases/dbh/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/sysutils/xfce4-fsguard-plugin/buildlink3.mk b/sysutils/xfce4-fsguard-plugin/buildlink3.mk
index ceb0621c35c..be7502c4bf3 100644
--- a/sysutils/xfce4-fsguard-plugin/buildlink3.mk
+++ b/sysutils/xfce4-fsguard-plugin/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:11:09 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/10/12 09:24:19 martti Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_FSGUARD_PLUGIN_BUILDLINK3_MK:=	${XFCE4_FSGUARD_PLUGIN_BUILDLINK3_MK}+
 
-.if !empty(BUILDLINK_DEPTH:M+)
+.if ${BUILDLINK_DEPTH} == "+"
 BUILDLINK_DEPENDS+=	xfce4-fsguard-plugin
 .endif
 
@@ -11,9 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-fsguard-plugin}
 BUILDLINK_PACKAGES+=	xfce4-fsguard-plugin
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-fsguard-plugin
 
-.if !empty(XFCE4_FSGUARD_PLUGIN_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.xfce4-fsguard-plugin+=	xfce4-fsguard-plugin>=0.2.1
-BUILDLINK_ABI_DEPENDS.xfce4-fsguard-plugin?=	xfce4-fsguard-plugin>=0.2.1nb3
+.if ${XFCE4_FSGUARD_PLUGIN_BUILDLINK3_MK} == "+"
+BUILDLINK_API_DEPENDS.xfce4-fsguard-plugin+=	xfce4-fsguard-plugin>=0.2.1nb3
 BUILDLINK_PKGSRCDIR.xfce4-fsguard-plugin?=	../../sysutils/xfce4-fsguard-plugin
 .endif	# XFCE4_FSGUARD_PLUGIN_BUILDLINK3_MK
 
diff --git a/sysutils/xfce4-minicmd-plugin/buildlink3.mk b/sysutils/xfce4-minicmd-plugin/buildlink3.mk
index d94a4f50f84..8cd9d73063b 100644
--- a/sysutils/xfce4-minicmd-plugin/buildlink3.mk
+++ b/sysutils/xfce4-minicmd-plugin/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.14 2006/07/08 23:11:09 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2006/10/12 09:24:20 martti Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_MINICMD_PLUGIN_BUILDLINK3_MK:=	${XFCE4_MINICMD_PLUGIN_BUILDLINK3_MK}+
 
-.if !empty(BUILDLINK_DEPTH:M+)
+.if ${BUILDLINK_DEPTH} == "+"
 BUILDLINK_DEPENDS+=	xfce4-minicmd-plugin
 .endif
 
@@ -11,9 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-minicmd-plugin}
 BUILDLINK_PACKAGES+=	xfce4-minicmd-plugin
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-minicmd-plugin
 
-.if !empty(XFCE4_MINICMD_PLUGIN_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.xfce4-minicmd-plugin+=	xfce4-minicmd-plugin>=0.3.0
-BUILDLINK_ABI_DEPENDS.xfce4-minicmd-plugin?=	xfce4-minicmd-plugin>=0.3.0nb3
+.if ${XFCE4_MINICMD_PLUGIN_BUILDLINK3_MK} == "+"
+BUILDLINK_API_DEPENDS.xfce4-minicmd-plugin+=	xfce4-minicmd-plugin>=0.3.0nb3
 BUILDLINK_PKGSRCDIR.xfce4-minicmd-plugin?=	../../sysutils/xfce4-minicmd-plugin
 .endif	# XFCE4_MINICMD_PLUGIN_BUILDLINK3_MK
 
diff --git a/sysutils/xfce4-netload-plugin/buildlink3.mk b/sysutils/xfce4-netload-plugin/buildlink3.mk
index c2b1521f6f0..721c3991876 100644
--- a/sysutils/xfce4-netload-plugin/buildlink3.mk
+++ b/sysutils/xfce4-netload-plugin/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.15 2006/07/08 23:11:09 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2006/10/12 09:24:20 martti Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_NETLOAD_PLUGIN_BUILDLINK3_MK:=	${XFCE4_NETLOAD_PLUGIN_BUILDLINK3_MK}+
 
-.if !empty(BUILDLINK_DEPTH:M+)
+.if ${BUILDLINK_DEPTH} == "+"
 BUILDLINK_DEPENDS+=	xfce4-netload-plugin
 .endif
 
@@ -11,9 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-netload-plugin}
 BUILDLINK_PACKAGES+=	xfce4-netload-plugin
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-netload-plugin
 
-.if !empty(XFCE4_NETLOAD_PLUGIN_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.xfce4-netload-plugin+=	xfce4-netload-plugin>=0.3.3
-BUILDLINK_ABI_DEPENDS.xfce4-netload-plugin?=	xfce4-netload-plugin>=0.3.3nb4
+.if ${XFCE4_NETLOAD_PLUGIN_BUILDLINK3_MK} == "+"
+BUILDLINK_API_DEPENDS.xfce4-netload-plugin+=	xfce4-netload-plugin>=0.3.3nb4
 BUILDLINK_PKGSRCDIR.xfce4-netload-plugin?=	../../sysutils/xfce4-netload-plugin
 .endif	# XFCE4_NETLOAD_PLUGIN_BUILDLINK3_MK
 
diff --git a/sysutils/xfce4-quicklauncher-plugin/buildlink3.mk b/sysutils/xfce4-quicklauncher-plugin/buildlink3.mk
index 48834c6ecf4..56d5d6c60be 100644
--- a/sysutils/xfce4-quicklauncher-plugin/buildlink3.mk
+++ b/sysutils/xfce4-quicklauncher-plugin/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:11:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/10/12 09:24:20 martti Exp $
 
 BUILDLINK_DEPTH:=				${BUILDLINK_DEPTH}+
 XFCE4_QUICKLAUNCHER_PLUGIN_BUILDLINK3_MK:=	${XFCE4_QUICKLAUNCHER_PLUGIN_BUILDLINK3_MK}+
 
-.if !empty(BUILDLINK_DEPTH:M+)
+.if ${BUILDLINK_DEPTH} == "+"
 BUILDLINK_DEPENDS+=	xfce4-quicklauncher-plugin
 .endif
 
@@ -11,9 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-quicklauncher-plugin}
 BUILDLINK_PACKAGES+=	xfce4-quicklauncher-plugin
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-quicklauncher-plugin
 
-.if !empty(XFCE4_QUICKLAUNCHER_PLUGIN_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.xfce4-quicklauncher-plugin+=	xfce4-quicklauncher-plugin>=0.81
-BUILDLINK_ABI_DEPENDS.xfce4-quicklauncher-plugin?=	xfce4-quicklauncher-plugin>=0.81nb4
+.if ${XFCE4_QUICKLAUNCHER_PLUGIN_BUILDLINK3_MK} == "+"
+BUILDLINK_API_DEPENDS.xfce4-quicklauncher-plugin+=	xfce4-quicklauncher-plugin>=0.81nb4
 BUILDLINK_PKGSRCDIR.xfce4-quicklauncher-plugin?=	../../sysutils/xfce4-quicklauncher-plugin
 .endif	# XFCE4_QUICKLAUNCHER_PLUGIN_BUILDLINK3_MK
 
diff --git a/sysutils/xfce4-showdesktop-plugin/buildlink3.mk b/sysutils/xfce4-showdesktop-plugin/buildlink3.mk
index 2f4fef3fdf9..99eff43131a 100644
--- a/sysutils/xfce4-showdesktop-plugin/buildlink3.mk
+++ b/sysutils/xfce4-showdesktop-plugin/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 23:11:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2006/10/12 09:24:20 martti Exp $
 
 BUILDLINK_DEPTH:=				${BUILDLINK_DEPTH}+
 XFCE4_SHOWDESKTOP_PLUGIN_BUILDLINK3_MK:=	${XFCE4_SHOWDESKTOP_PLUGIN_BUILDLINK3_MK}+
 
-.if !empty(BUILDLINK_DEPTH:M+)
+.if ${BUILDLINK_DEPTH} == "+"
 BUILDLINK_DEPENDS+=	xfce4-showdesktop-plugin
 .endif
 
@@ -11,9 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-showdesktop-plugin}
 BUILDLINK_PACKAGES+=	xfce4-showdesktop-plugin
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-showdesktop-plugin
 
-.if !empty(XFCE4_SHOWDESKTOP_PLUGIN_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.xfce4-showdesktop-plugin+=	xfce4-showdesktop-plugin>=0.4.0
-BUILDLINK_ABI_DEPENDS.xfce4-showdesktop-plugin?=	xfce4-showdesktop-plugin>=0.4.0nb3
+.if ${XFCE4_SHOWDESKTOP_PLUGIN_BUILDLINK3_MK} == "+"
+BUILDLINK_API_DEPENDS.xfce4-showdesktop-plugin+=	xfce4-showdesktop-plugin>=0.4.0nb3
 BUILDLINK_PKGSRCDIR.xfce4-showdesktop-plugin?=	../../sysutils/xfce4-showdesktop-plugin
 .endif	# XFCE4_SHOWDESKTOP_PLUGIN_BUILDLINK3_MK
 
diff --git a/sysutils/xfce4-systemload-plugin/buildlink3.mk b/sysutils/xfce4-systemload-plugin/buildlink3.mk
index 66575fd780f..86ad48586ed 100644
--- a/sysutils/xfce4-systemload-plugin/buildlink3.mk
+++ b/sysutils/xfce4-systemload-plugin/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 23:11:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2006/10/12 09:24:20 martti Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_SYSTEMLOAD_PLUGIN_BUILDLINK3_MK:=	${XFCE4_SYSTEMLOAD_PLUGIN_BUILDLINK3_MK}+
 
-.if !empty(BUILDLINK_DEPTH:M+)
+.if ${BUILDLINK_DEPTH} == "+"
 BUILDLINK_DEPENDS+=	xfce4-systemload-plugin
 .endif
 
@@ -11,9 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-systemload-plugin}
 BUILDLINK_PACKAGES+=	xfce4-systemload-plugin
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-systemload-plugin
 
-.if !empty(XFCE4_SYSTEMLOAD_PLUGIN_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.xfce4-systemload-plugin+=	xfce4-systemload-plugin>=0.3.6
-BUILDLINK_ABI_DEPENDS.xfce4-systemload-plugin?=	xfce4-systemload-plugin>=0.3.6nb4
+.if ${XFCE4_SYSTEMLOAD_PLUGIN_BUILDLINK3_MK} == "+"
+BUILDLINK_API_DEPENDS.xfce4-systemload-plugin+=	xfce4-systemload-plugin>=0.3.6nb4
 BUILDLINK_PKGSRCDIR.xfce4-systemload-plugin?=	../../sysutils/xfce4-systemload-plugin
 .endif	# XFCE4_SYSTEMLOAD_PLUGIN_BUILDLINK3_MK
 
diff --git a/sysutils/xfce4-systray/buildlink3.mk b/sysutils/xfce4-systray/buildlink3.mk
index 779b55ce65c..91d1fdd5f55 100644
--- a/sysutils/xfce4-systray/buildlink3.mk
+++ b/sysutils/xfce4-systray/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.16 2006/07/08 23:11:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2006/10/12 09:24:20 martti Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XFCE4_SYSTRAY_BUILDLINK3_MK:=	${XFCE4_SYSTRAY_BUILDLINK3_MK}+
 
-.if !empty(BUILDLINK_DEPTH:M+)
+.if ${BUILDLINK_DEPTH} == "+"
 BUILDLINK_DEPENDS+=	xfce4-systray
 .endif
 
@@ -11,9 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-systray}
 BUILDLINK_PACKAGES+=	xfce4-systray
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-systray
 
-.if !empty(XFCE4_SYSTRAY_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.xfce4-systray+=	xfce4-systray>=4.2.3
-BUILDLINK_ABI_DEPENDS.xfce4-systray?=	xfce4-systray>=4.2.3nb3
+.if ${XFCE4_SYSTRAY_BUILDLINK3_MK} == "+"
+BUILDLINK_API_DEPENDS.xfce4-systray+=	xfce4-systray>=4.2.3nb3
 BUILDLINK_PKGSRCDIR.xfce4-systray?=	../../sysutils/xfce4-systray
 .endif	# XFCE4_SYSTRAY_BUILDLINK3_MK
 
diff --git a/sysutils/xfce4-xkb-plugin/buildlink3.mk b/sysutils/xfce4-xkb-plugin/buildlink3.mk
index 201c206d7b8..ca1dbe2bae5 100644
--- a/sysutils/xfce4-xkb-plugin/buildlink3.mk
+++ b/sysutils/xfce4-xkb-plugin/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 23:11:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/10/12 09:24:20 martti Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_XKB_PLUGIN_BUILDLINK3_MK:=	${XFCE4_XKB_PLUGIN_BUILDLINK3_MK}+
 
-.if !empty(BUILDLINK_DEPTH:M+)
+.if ${BUILDLINK_DEPTH} == "+"
 BUILDLINK_DEPENDS+=	xfce4-xkb-plugin
 .endif
 
@@ -11,9 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-xkb-plugin}
 BUILDLINK_PACKAGES+=	xfce4-xkb-plugin
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-xkb-plugin
 
-.if !empty(XFCE4_XKB_PLUGIN_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.xfce4-xkb-plugin+=	xfce4-xkb-plugin>=0.3.3
-BUILDLINK_ABI_DEPENDS.xfce4-xkb-plugin?=	xfce4-xkb-plugin>=0.3.3nb1
+.if ${XFCE4_XKB_PLUGIN_BUILDLINK3_MK} == "+"
+BUILDLINK_API_DEPENDS.xfce4-xkb-plugin+=	xfce4-xkb-plugin>=0.3.3nb1
 BUILDLINK_PKGSRCDIR.xfce4-xkb-plugin?=	../../sysutils/xfce4-xkb-plugin
 .endif	# XFCE4_XKB_PLUGIN_BUILDLINK3_MK
 
diff --git a/time/xfce4-calendar/buildlink3.mk b/time/xfce4-calendar/buildlink3.mk
index 18f38976321..e82ccd6f437 100644
--- a/time/xfce4-calendar/buildlink3.mk
+++ b/time/xfce4-calendar/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 23:11:11 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/10/12 09:24:20 martti Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XFCE4_CALENDAR_BUILDLINK3_MK:=	${XFCE4_CALENDAR_BUILDLINK3_MK}+
 
-.if !empty(BUILDLINK_DEPTH:M+)
+.if ${BUILDLINK_DEPTH} == "+"
 BUILDLINK_DEPENDS+=	xfce4-calendar
 .endif
 
@@ -11,13 +11,13 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-calendar}
 BUILDLINK_PACKAGES+=	xfce4-calendar
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-calendar
 
-.if !empty(XFCE4_CALENDAR_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.xfce4-calendar+=	xfce4-calendar>=4.2.3
-BUILDLINK_ABI_DEPENDS.xfce4-calendar?=	xfce4-calendar>=4.2.3nb4
+.if ${XFCE4_CALENDAR_BUILDLINK3_MK} == "+"
+BUILDLINK_API_DEPENDS.xfce4-calendar+=	xfce4-calendar>=4.2.3nb4
 BUILDLINK_PKGSRCDIR.xfce4-calendar?=	../../time/xfce4-calendar
 .endif	# XFCE4_CALENDAR_BUILDLINK3_MK
 
 .include "../../databases/dbh/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 
diff --git a/time/xfce4-datetime-plugin/buildlink3.mk b/time/xfce4-datetime-plugin/buildlink3.mk
index 4e1e3870f2c..a3a9a204045 100644
--- a/time/xfce4-datetime-plugin/buildlink3.mk
+++ b/time/xfce4-datetime-plugin/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:11:11 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/10/12 09:24:20 martti Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_DATETIME_PLUGIN_BUILDLINK3_MK:=	${XFCE4_DATETIME_PLUGIN_BUILDLINK3_MK}+
 
-.if !empty(BUILDLINK_DEPTH:M+)
+.if ${BUILDLINK_DEPTH} == "+"
 BUILDLINK_DEPENDS+=	xfce4-datetime-plugin
 .endif
 
@@ -11,9 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-datetime-plugin}
 BUILDLINK_PACKAGES+=	xfce4-datetime-plugin
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-datetime-plugin
 
-.if !empty(XFCE4_DATETIME_PLUGIN_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.xfce4-datetime-plugin+=	xfce4-datetime-plugin>=0.3.1
-BUILDLINK_ABI_DEPENDS.xfce4-datetime-plugin?=	xfce4-datetime-plugin>=0.3.1nb3
+.if ${XFCE4_DATETIME_PLUGIN_BUILDLINK3_MK} == "+"
+BUILDLINK_API_DEPENDS.xfce4-datetime-plugin+=	xfce4-datetime-plugin>=0.3.1nb3
 BUILDLINK_PKGSRCDIR.xfce4-datetime-plugin?=	../../time/xfce4-datetime-plugin
 .endif	# XFCE4_DATETIME_PLUGIN_BUILDLINK3_MK
 
diff --git a/wm/xfce4-wm-themes/buildlink3.mk b/wm/xfce4-wm-themes/buildlink3.mk
index ff637c0ffde..7b63c124290 100644
--- a/wm/xfce4-wm-themes/buildlink3.mk
+++ b/wm/xfce4-wm-themes/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.16 2006/07/08 23:11:12 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2006/10/12 09:24:20 martti Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XFCE4_WM_THEMES_BUILDLINK3_MK:=	${XFCE4_WM_THEMES_BUILDLINK3_MK}+
 
-.if !empty(BUILDLINK_DEPTH:M+)
+.if ${BUILDLINK_DEPTH} == "+"
 BUILDLINK_DEPENDS+=	xfce4-wm-themes
 .endif
 
@@ -11,9 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-wm-themes}
 BUILDLINK_PACKAGES+=	xfce4-wm-themes
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-wm-themes
 
-.if !empty(XFCE4_WM_THEMES_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.xfce4-wm-themes+=	xfce4-wm-themes>=4.2.3
-BUILDLINK_ABI_DEPENDS.xfce4-wm-themes?=	xfce4-wm-themes>=4.2.3nb3
+.if ${XFCE4_WM_THEMES_BUILDLINK3_MK} == "+"
+BUILDLINK_API_DEPENDS.xfce4-wm-themes+=	xfce4-wm-themes>=4.2.3nb3
 BUILDLINK_PKGSRCDIR.xfce4-wm-themes?=	../../wm/xfce4-wm-themes
 .endif	# XFCE4_WM_THEMES_BUILDLINK3_MK
 
diff --git a/wm/xfce4-wm/buildlink3.mk b/wm/xfce4-wm/buildlink3.mk
index 256f90c35ba..c116f60a3fc 100644
--- a/wm/xfce4-wm/buildlink3.mk
+++ b/wm/xfce4-wm/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.17 2006/07/08 23:11:12 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2006/10/12 09:24:20 martti Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XFCE4_WM_BUILDLINK3_MK:=	${XFCE4_WM_BUILDLINK3_MK}+
 
-.if !empty(BUILDLINK_DEPTH:M+)
+.if ${BUILDLINK_DEPTH} == "+"
 BUILDLINK_DEPENDS+=	xfce4-wm
 .endif
 
@@ -11,12 +11,12 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-wm}
 BUILDLINK_PACKAGES+=	xfce4-wm
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-wm
 
-.if !empty(XFCE4_WM_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.xfce4-wm+=	xfce4-wm>=4.2.3.2
-BUILDLINK_ABI_DEPENDS.xfce4-wm?=	xfce4-wm>=4.2.3.2nb4
+.if ${XFCE4_WM_BUILDLINK3_MK} == "+"
+BUILDLINK_API_DEPENDS.xfce4-wm+=	xfce4-wm>=4.2.3.2nb4
 BUILDLINK_PKGSRCDIR.xfce4-wm?=	../../wm/xfce4-wm
 .endif	# XFCE4_WM_BUILDLINK3_MK
 
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/xpm/buildlink3.mk"
 .include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
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