Fixed warnings found by pkglint -Wall.

23 files changed, 60 insertions, 58 deletions

diff --git a/x11/libxfce4gui/Makefile b/x11/libxfce4gui/Makefile
index 2b7ecb6eacb..38e3b1d9a11 100644
--- a/x11/libxfce4gui/Makefile
+++ b/x11/libxfce4gui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/02/05 23:11:39 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2006/02/17 06:49:25 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -10,7 +10,7 @@ COMMENT=	Xfce widget library
 
 #PKGREVISION=	1
 
-CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/html
+CONFIGURE_ARGS+=	--with-html-dir=${PREFIX:Q}/share/doc/html
 
 PKGCONFIG_OVERRIDE=	libxfcegui4/libxfcegui4-1.0.pc.in
 
diff --git a/x11/libxfce4gui/buildlink3.mk b/x11/libxfce4gui/buildlink3.mk
index 4643111c3c4..60f8c75330f 100644
--- a/x11/libxfce4gui/buildlink3.mk
+++ b/x11/libxfce4gui/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/02/05 23:11:39 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/02/17 06:49:25 martti Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBXFCE4GUI_BUILDLINK3_MK:=	${LIBXFCE4GUI_BUILDLINK3_MK}+
@@ -23,4 +23,4 @@ BUILDLINK_PKGSRCDIR.libxfce4gui?=	../../x11/libxfce4gui
 .include "../../x11/startup-notification/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/libxfce4mcs/Makefile b/x11/libxfce4mcs/Makefile
index 61168b74e00..23669d36939 100644
--- a/x11/libxfce4mcs/Makefile
+++ b/x11/libxfce4mcs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/02/05 23:11:39 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2006/02/17 06:49:25 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -9,7 +9,7 @@ COMMENT=	Xfce settings management library
 
 #PKGREVISION=	1
 
-CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/html
+CONFIGURE_ARGS+=	--with-html-dir=${PREFIX:Q}/share/doc/html
 
 PKGCONFIG_OVERRIDE=	libxfce4mcs/libxfce4mcs-client-1.0.pc.in
 PKGCONFIG_OVERRIDE+=	libxfce4mcs/libxfce4mcs-manager-1.0.pc.in
diff --git a/x11/libxfce4mcs/buildlink3.mk b/x11/libxfce4mcs/buildlink3.mk
index 5246884a300..4021fe57427 100644
--- a/x11/libxfce4mcs/buildlink3.mk
+++ b/x11/libxfce4mcs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/02/05 23:11:39 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/02/17 06:49:25 martti Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBXFCE4MCS_BUILDLINK3_MK:=	${LIBXFCE4MCS_BUILDLINK3_MK}+
@@ -19,4 +19,4 @@ BUILDLINK_PKGSRCDIR.libxfce4mcs?=	../../x11/libxfce4mcs
 .include "../../x11/libxfce4util/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/libxfce4util/Makefile b/x11/libxfce4util/Makefile
index 932d2e02cbc..7c49be91003 100644
--- a/x11/libxfce4util/Makefile
+++ b/x11/libxfce4util/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/02/05 23:11:39 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2006/02/17 06:49:25 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -10,7 +10,7 @@ PKGREVISION=	1
 CATEGORIES=	x11
 COMMENT=	Xfce basic library
 
-CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/html
+CONFIGURE_ARGS+=	--with-html-dir=${PREFIX:Q}/share/doc/html
 
 PKGCONFIG_OVERRIDE=	libxfce4util/libxfce4util-1.0.pc.in
 
diff --git a/x11/libxfce4util/buildlink3.mk b/x11/libxfce4util/buildlink3.mk
index 0dac0ae802b..f656d883a61 100644
--- a/x11/libxfce4util/buildlink3.mk
+++ b/x11/libxfce4util/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/02/05 23:11:39 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/02/17 06:49:25 martti Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBXFCE4UTIL_BUILDLINK3_MK:=	${LIBXFCE4UTIL_BUILDLINK3_MK}+
@@ -18,4 +18,4 @@ BUILDLINK_PKGSRCDIR.libxfce4util?=	../../x11/libxfce4util
 
 .include "../../devel/glib2/buildlink3.mk"
 
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/xfce4-clipman-plugin/buildlink3.mk b/x11/xfce4-clipman-plugin/buildlink3.mk
index 72a167aaa40..d521d1f5350 100644
--- a/x11/xfce4-clipman-plugin/buildlink3.mk
+++ b/x11/xfce4-clipman-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/05 23:11:46 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/02/17 06:49:26 martti Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_CLIPMAN_PLUGIN_BUILDLINK3_MK:=	${XFCE4_CLIPMAN_PLUGIN_BUILDLINK3_MK}+
@@ -19,4 +19,4 @@ BUILDLINK_PKGSRCDIR.xfce4-clipman-plugin?=	../../x11/xfce4-clipman-plugin
 .include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/xfce4-desktop/Makefile b/x11/xfce4-desktop/Makefile
index 86dafb4a819..2e073767896 100644
--- a/x11/xfce4-desktop/Makefile
+++ b/x11/xfce4-desktop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/02/05 23:11:46 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2006/02/17 06:49:26 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -12,16 +12,17 @@ COMMENT=	Xfce desktop background manager
 
 PKG_SYSCONFSUBDIR=	xdg/xfce4/desktop
 EGDIR=			${XFCE4_EGBASE}/desktop
-CONF_FILES=		${EGDIR}/menu.xml ${PKG_SYSCONFDIR}/menu.xml
-.for _l in ca cs da de el es et fi fr he hu ja ko nl pl pt_BR ro ru sk sv \
+CONF_FILES=		${EGDIR:Q}/menu.xml ${PKG_SYSCONFDIR:Q}/menu.xml
+.for l in ca cs da de el es et fi fr he hu ja ko nl pl pt_BR ro ru sk sv \
 	uk vi zh_TW
-CONF_FILES+=		${EGDIR}/menu.xml.${_l} ${PKG_SYSCONFDIR}/menu.xml.${_l}
+CONF_FILES+=		${EGDIR:Q}/menu.xml.${l} \
+			${PKG_SYSCONFDIR:Q}/menu.xml.${l}
 .endfor
-CONF_FILES+=		${EGDIR}/xfce-registered-categories.xml \
-			${PKG_SYSCONFDIR}/xfce-registered-categories.xml
-.for _l in cs eu fi he hu ja nl pl pt_BR ro ru sk sv zh_CN zh_TW
-CONF_FILES+=		${EGDIR}/xfce-registered-categories.xml.${_l} \
-			${PKG_SYSCONFDIR}/xfce-registered-categories.xml.${_l}
+CONF_FILES+=		${EGDIR:Q}/xfce-registered-categories.xml \
+			${PKG_SYSCONFDIR:Q}/xfce-registered-categories.xml
+.for l in cs eu fi he hu ja nl pl pt_BR ro ru sk sv zh_CN zh_TW
+CONF_FILES+=		${EGDIR:Q}/xfce-registered-categories.xml.${l} \
+			${PKG_SYSCONFDIR:Q}/xfce-registered-categories.xml.${l}
 .endfor
 
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASE:Q}
diff --git a/x11/xfce4-desktop/buildlink3.mk b/x11/xfce4-desktop/buildlink3.mk
index 59cf098284a..e566192f9e6 100644
--- a/x11/xfce4-desktop/buildlink3.mk
+++ b/x11/xfce4-desktop/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/02/05 23:11:46 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/02/17 06:49:26 martti Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XFCE4_DESKTOP_BUILDLINK3_MK:=	${XFCE4_DESKTOP_BUILDLINK3_MK}+
@@ -20,4 +20,4 @@ BUILDLINK_PKGSRCDIR.xfce4-desktop?=	../../x11/xfce4-desktop
 .include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/xfce4-gtk2-engine/buildlink3.mk b/x11/xfce4-gtk2-engine/buildlink3.mk
index 351d5ceb87e..c2cd49e591f 100644
--- a/x11/xfce4-gtk2-engine/buildlink3.mk
+++ b/x11/xfce4-gtk2-engine/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:11:46 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/02/17 06:49:26 martti Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_GTK2_ENGINE_BUILDLINK3_MK:=	${XFCE4_GTK2_ENGINE_BUILDLINK3_MK}+
@@ -19,4 +19,4 @@ BUILDLINK_PKGSRCDIR.xfce4-gtk2-engine?=	../../x11/xfce4-gtk2-engine
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/xfce4-mcs-manager/buildlink3.mk b/x11/xfce4-mcs-manager/buildlink3.mk
index 178c8f3aa02..edd7dadb505 100644
--- a/x11/xfce4-mcs-manager/buildlink3.mk
+++ b/x11/xfce4-mcs-manager/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/02/05 23:11:46 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/02/17 06:49:26 martti Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_MCS_MANAGER_BUILDLINK3_MK:=	${XFCE4_MCS_MANAGER_BUILDLINK3_MK}+
@@ -20,4 +20,4 @@ BUILDLINK_PKGSRCDIR.xfce4-mcs-manager?=	../../x11/xfce4-mcs-manager
 .include "../../x11/libxfce4mcs/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/xfce4-mcs-plugins/buildlink3.mk b/x11/xfce4-mcs-plugins/buildlink3.mk
index 2fa5bc6501f..ee56d319c5a 100644
--- a/x11/xfce4-mcs-plugins/buildlink3.mk
+++ b/x11/xfce4-mcs-plugins/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/02/05 23:11:46 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/02/17 06:49:26 martti Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_MCS_PLUGINS_BUILDLINK3_MK:=	${XFCE4_MCS_PLUGINS_BUILDLINK3_MK}+
@@ -19,4 +19,4 @@ BUILDLINK_PKGSRCDIR.xfce4-mcs-plugins?=	../../x11/xfce4-mcs-plugins
 .include "../../x11/xfce4-mcs-manager/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/xfce4-notes-plugin/buildlink3.mk b/x11/xfce4-notes-plugin/buildlink3.mk
index b0efa124b0a..100f40172ba 100644
--- a/x11/xfce4-notes-plugin/buildlink3.mk
+++ b/x11/xfce4-notes-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/05 23:11:46 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/02/17 06:49:26 martti Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_NOTES_PLUGIN_BUILDLINK3_MK:=	${XFCE4_NOTES_PLUGIN_BUILDLINK3_MK}+
@@ -19,4 +19,4 @@ BUILDLINK_PKGSRCDIR.xfce4-notes-plugin?=	../../x11/xfce4-notes-plugin
 .include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/xfce4-panel/Makefile b/x11/xfce4-panel/Makefile
index fa59459b213..2eeb0fa128b 100644
--- a/x11/xfce4-panel/Makefile
+++ b/x11/xfce4-panel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2006/02/05 23:11:46 joerg Exp $
+# $NetBSD: Makefile,v 1.25 2006/02/17 06:49:26 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -14,11 +14,11 @@ PTHREAD_AUTO_VARS=	yes
 
 PKG_SYSCONFSUBDIR=	xdg/xfce4/panel
 EGDIR=			${XFCE4_EGBASE}/panel
-CONF_FILES=		${EGDIR}/contents.xml ${PKG_SYSCONFDIR}/contents.xml
-.for _l in ar az ca da el eu fi fr he hu it ja ko lt ms nl pl ro ru sk sv \
+CONF_FILES=		${EGDIR:Q}/contents.xml ${PKG_SYSCONFDIR:Q}/contents.xml
+.for l in ar az ca da el eu fi fr he hu it ja ko lt ms nl pl ro ru sk sv \
 	tr vi zh_CN zh_TW
-CONF_FILES+=		${EGDIR}/contents.xml.${_l} \
-			${PKG_SYSCONFDIR}/contents.xml.${_l}
+CONF_FILES+=		${EGDIR:Q}/contents.xml.${l} \
+			${PKG_SYSCONFDIR:Q}/contents.xml.${l}
 .endfor
 
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASE:Q}
diff --git a/x11/xfce4-panel/buildlink3.mk b/x11/xfce4-panel/buildlink3.mk
index be49e8d5a19..aebcc4d2284 100644
--- a/x11/xfce4-panel/buildlink3.mk
+++ b/x11/xfce4-panel/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/02/05 23:11:46 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/02/17 06:49:26 martti Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XFCE4_PANEL_BUILDLINK3_MK:=	${XFCE4_PANEL_BUILDLINK3_MK}+
@@ -21,4 +21,4 @@ BUILDLINK_PKGSRCDIR.xfce4-panel?=	../../x11/xfce4-panel
 .include "../../x11/startup-notification/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/xfce4-session/Makefile b/x11/xfce4-session/Makefile
index 823b6b934f3..1b3cbf88427 100644
--- a/x11/xfce4-session/Makefile
+++ b/x11/xfce4-session/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/02/05 23:11:46 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2006/02/17 06:49:26 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -11,10 +11,11 @@ COMMENT=	Xfce session manager
 
 PKG_SYSCONFSUBDIR=	xdg/xfce4-session
 EGDIR=			${XFCE4_EGBASE}/session
-CONF_FILES=		${EGDIR}/xfce4-session.rc \
-			${PKG_SYSCONFDIR}/xfce4-session.rc
+CONF_FILES=		${EGDIR:Q}/xfce4-session.rc \
+			${PKG_SYSCONFDIR:Q}/xfce4-session.rc
 
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASE:Q} ICEAUTH=${TOOLS_PATH.iceauth}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASE:Q} \
+			ICEAUTH=${TOOLS_PATH.iceauth:Q}
 
 REQD_DIRS+=		${XFCE4_EGBASE} ${EGDIR}
 
diff --git a/x11/xfce4-session/buildlink3.mk b/x11/xfce4-session/buildlink3.mk
index f85907d0080..e92f4252063 100644
--- a/x11/xfce4-session/buildlink3.mk
+++ b/x11/xfce4-session/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:11:46 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/02/17 06:49:26 martti Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XFCE4_SESSION_BUILDLINK3_MK:=	${XFCE4_SESSION_BUILDLINK3_MK}+
@@ -19,4 +19,4 @@ BUILDLINK_PKGSRCDIR.xfce4-session?=	../../x11/xfce4-session
 .include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/xfce4-taskbar-plugin/buildlink3.mk b/x11/xfce4-taskbar-plugin/buildlink3.mk
index b93016d4d57..3424d462123 100644
--- a/x11/xfce4-taskbar-plugin/buildlink3.mk
+++ b/x11/xfce4-taskbar-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:11:46 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/02/17 06:49:26 martti Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_TASKBAR_PLUGIN_BUILDLINK3_MK:=	${XFCE4_TASKBAR_PLUGIN_BUILDLINK3_MK}+
@@ -19,4 +19,4 @@ BUILDLINK_PKGSRCDIR.xfce4-taskbar-plugin?=	../../x11/xfce4-taskbar-plugin
 .include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/xfce4-toys/buildlink3.mk b/x11/xfce4-toys/buildlink3.mk
index 8876bb82e67..47415f60176 100644
--- a/x11/xfce4-toys/buildlink3.mk
+++ b/x11/xfce4-toys/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/02/05 23:11:46 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/02/17 06:49:26 martti Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XFCE4_TOYS_BUILDLINK3_MK:=	${XFCE4_TOYS_BUILDLINK3_MK}+
@@ -20,4 +20,4 @@ BUILDLINK_PKGSRCDIR.xfce4-toys?=	../../x11/xfce4-toys
 .include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/xfce4-trigger-launcher/buildlink3.mk b/x11/xfce4-trigger-launcher/buildlink3.mk
index 73a5135db47..ac6aa1318ea 100644
--- a/x11/xfce4-trigger-launcher/buildlink3.mk
+++ b/x11/xfce4-trigger-launcher/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/02/05 23:11:46 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/02/17 06:49:26 martti Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_TRIGGER_LAUNCHER_BUILDLINK3_MK:=	${XFCE4_TRIGGER_LAUNCHER_BUILDLINK3_MK}+
@@ -19,4 +19,4 @@ BUILDLINK_PKGSRCDIR.xfce4-trigger-launcher?=	../../x11/xfce4-trigger-launcher
 .include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/xfce4-utils/Makefile b/x11/xfce4-utils/Makefile
index 5144579ee40..704b49a1a26 100644
--- a/x11/xfce4-utils/Makefile
+++ b/x11/xfce4-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/02/05 23:11:47 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2006/02/17 06:49:26 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -12,7 +12,7 @@ COMMENT=	Xfce utilities
 
 PKG_SYSCONFSUBDIR=	xdg/xfce4
 EGDIR=			${XFCE4_EGBASE}
-CONF_FILES=		${EGDIR}/xinitrc ${PKG_SYSCONFDIR}/xinitrc
+CONF_FILES=		${EGDIR:Q}/xinitrc ${PKG_SYSCONFDIR:Q}/xinitrc
 
 REQD_DIRS+=		${EGDIR}
 
diff --git a/x11/xfce4-utils/buildlink3.mk b/x11/xfce4-utils/buildlink3.mk
index f79085d7c14..3de020aa9bc 100644
--- a/x11/xfce4-utils/buildlink3.mk
+++ b/x11/xfce4-utils/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/02/05 23:11:47 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/02/17 06:49:26 martti Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XFCE4_UTILS_BUILDLINK3_MK:=	${XFCE4_UTILS_BUILDLINK3_MK}+
@@ -19,4 +19,4 @@ BUILDLINK_PKGSRCDIR.xfce4-utils?=	../../x11/xfce4-utils
 .include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/xfce4-windowlist-plugin/buildlink3.mk b/x11/xfce4-windowlist-plugin/buildlink3.mk
index 4d80c2c30dc..e197659ffe2 100644
--- a/x11/xfce4-windowlist-plugin/buildlink3.mk
+++ b/x11/xfce4-windowlist-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:11:47 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/02/17 06:49:26 martti Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_WINDOWLIST_PLUGIN_BUILDLINK3_MK:=	${XFCE4_WINDOWLIST_PLUGIN_BUILDLINK3_MK}+
@@ -19,4 +19,4 @@ BUILDLINK_PKGSRCDIR.xfce4-windowlist-plugin?=	../../x11/xfce4-windowlist-plugin
 .include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}