Use PKG_SYSCONFDIR framework. Bump PKGREVISION.

17 files changed, 198 insertions, 74 deletions

diff --git a/x11/xfce4-desktop/Makefile b/x11/xfce4-desktop/Makefile
index 841255b2481..3db25c56af2 100644
--- a/x11/xfce4-desktop/Makefile
+++ b/x11/xfce4-desktop/Makefile
@@ -1,12 +1,32 @@
-# $NetBSD: Makefile,v 1.11 2005/01/17 12:56:13 martti Exp $
+# $NetBSD: Makefile,v 1.12 2005/06/15 09:00:15 hira Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=	xfdesktop-${XFCE4_VERSION}
 PKGNAME=	xfce4-desktop-${XFCE4_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 COMMENT=	XFce4 desktop background manager
 
+USE_PKGINSTALL=		yes
+
+PKG_SYSCONFSUBDIR=	xdg/xfce4/desktop
+EGDIR=			${XFCE4_EGBASE}/desktop
+CONF_FILES=		${EGDIR}/menu.xml ${PKG_SYSCONFDIR}/menu.xml
+.for _l in cs da de es et fi fr he ja ko nl pt_BR ro ru sk uk vi zh_TW
+CONF_FILES+=		${EGDIR}/menu.xml.${_l} ${PKG_SYSCONFDIR}/menu.xml.${_l}
+.endfor
+CONF_FILES+=		${EGDIR}/xfce-registered-categories.xml \
+			${PKG_SYSCONFDIR}/xfce-registered-categories.xml
+.for _l in cs eu fi hu ja nl pt_BR ro ru sk zh_CN zh_TW
+CONF_FILES+=		${EGDIR}/xfce-registered-categories.xml.${_l} \
+			${PKG_SYSCONFDIR}/xfce-registered-categories.xml.${_l}
+.endfor
+
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASE}
+
+MAKE_DIRS+=		${XFCE4_EGBASE} ${EGDIR}
+
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xfce4-desktop/PLIST b/x11/xfce4-desktop/PLIST
index 0239ba03135..8323ac70096 100644
--- a/x11/xfce4-desktop/PLIST
+++ b/x11/xfce4-desktop/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2005/05/18 06:10:31 martti Exp $
+@comment $NetBSD: PLIST,v 1.12 2005/06/15 09:00:15 hira Exp $
 ${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/xfdesktop.mo
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/xfdesktop.mo
 ${PKGLOCALEDIR}/locale/be/LC_MESSAGES/xfdesktop.mo
@@ -45,44 +45,44 @@ ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/xfdesktop.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/xfdesktop.mo
 bin/xfce4-menueditor
 bin/xfdesktop
-etc/xdg/xfce4/desktop/menu.xml
-etc/xdg/xfce4/desktop/menu.xml.cs
-etc/xdg/xfce4/desktop/menu.xml.da
-etc/xdg/xfce4/desktop/menu.xml.de
-etc/xdg/xfce4/desktop/menu.xml.es
-etc/xdg/xfce4/desktop/menu.xml.et
-etc/xdg/xfce4/desktop/menu.xml.fi
-etc/xdg/xfce4/desktop/menu.xml.fr
-etc/xdg/xfce4/desktop/menu.xml.he
-etc/xdg/xfce4/desktop/menu.xml.ja
-etc/xdg/xfce4/desktop/menu.xml.ko
-etc/xdg/xfce4/desktop/menu.xml.nl
-etc/xdg/xfce4/desktop/menu.xml.pt_BR
-etc/xdg/xfce4/desktop/menu.xml.ro
-etc/xdg/xfce4/desktop/menu.xml.ru
-etc/xdg/xfce4/desktop/menu.xml.sk
-etc/xdg/xfce4/desktop/menu.xml.uk
-etc/xdg/xfce4/desktop/menu.xml.vi
-etc/xdg/xfce4/desktop/menu.xml.zh_TW
-etc/xdg/xfce4/desktop/xfce-registered-categories.xml
-etc/xdg/xfce4/desktop/xfce-registered-categories.xml.cs
-etc/xdg/xfce4/desktop/xfce-registered-categories.xml.eu
-etc/xdg/xfce4/desktop/xfce-registered-categories.xml.fi
-etc/xdg/xfce4/desktop/xfce-registered-categories.xml.hu
-etc/xdg/xfce4/desktop/xfce-registered-categories.xml.ja
-etc/xdg/xfce4/desktop/xfce-registered-categories.xml.nl
-etc/xdg/xfce4/desktop/xfce-registered-categories.xml.pt_BR
-etc/xdg/xfce4/desktop/xfce-registered-categories.xml.ro
-etc/xdg/xfce4/desktop/xfce-registered-categories.xml.ru
-etc/xdg/xfce4/desktop/xfce-registered-categories.xml.sk
-etc/xdg/xfce4/desktop/xfce-registered-categories.xml.zh_CN
-etc/xdg/xfce4/desktop/xfce-registered-categories.xml.zh_TW
 lib/xfce4/mcs-plugins/backdrop_settings.la
 lib/xfce4/modules/xfce4_desktop_menu.la
 lib/xfce4/panel-plugins/libdesktopmenu.la
 man/man1/xfdesktop.1
 share/applications/xfce-backdrop-settings.desktop
 share/applications/xfce-menueditor.desktop
+share/examples/xfce4/desktop/menu.xml
+share/examples/xfce4/desktop/menu.xml.cs
+share/examples/xfce4/desktop/menu.xml.da
+share/examples/xfce4/desktop/menu.xml.de
+share/examples/xfce4/desktop/menu.xml.es
+share/examples/xfce4/desktop/menu.xml.et
+share/examples/xfce4/desktop/menu.xml.fi
+share/examples/xfce4/desktop/menu.xml.fr
+share/examples/xfce4/desktop/menu.xml.he
+share/examples/xfce4/desktop/menu.xml.ja
+share/examples/xfce4/desktop/menu.xml.ko
+share/examples/xfce4/desktop/menu.xml.nl
+share/examples/xfce4/desktop/menu.xml.pt_BR
+share/examples/xfce4/desktop/menu.xml.ro
+share/examples/xfce4/desktop/menu.xml.ru
+share/examples/xfce4/desktop/menu.xml.sk
+share/examples/xfce4/desktop/menu.xml.uk
+share/examples/xfce4/desktop/menu.xml.vi
+share/examples/xfce4/desktop/menu.xml.zh_TW
+share/examples/xfce4/desktop/xfce-registered-categories.xml
+share/examples/xfce4/desktop/xfce-registered-categories.xml.cs
+share/examples/xfce4/desktop/xfce-registered-categories.xml.eu
+share/examples/xfce4/desktop/xfce-registered-categories.xml.fi
+share/examples/xfce4/desktop/xfce-registered-categories.xml.hu
+share/examples/xfce4/desktop/xfce-registered-categories.xml.ja
+share/examples/xfce4/desktop/xfce-registered-categories.xml.nl
+share/examples/xfce4/desktop/xfce-registered-categories.xml.pt_BR
+share/examples/xfce4/desktop/xfce-registered-categories.xml.ro
+share/examples/xfce4/desktop/xfce-registered-categories.xml.ru
+share/examples/xfce4/desktop/xfce-registered-categories.xml.sk
+share/examples/xfce4/desktop/xfce-registered-categories.xml.zh_CN
+share/examples/xfce4/desktop/xfce-registered-categories.xml.zh_TW
 share/icons/hicolor/32x32/apps/xfce4-backdrop.png
 share/icons/hicolor/32x32/apps/xfce4-menueditor.png
 share/icons/hicolor/48x48/apps/xfce4-backdrop.png
@@ -119,6 +119,4 @@ share/xfce4/doc/fr/images/xfdesktop-editor.png
 share/xfce4/doc/fr/images/xfdesktop-list.png
 share/xfce4/doc/fr/images/xfdesktop-menu-tab.png
 share/xfce4/doc/fr/xfdesktop.html
-@dirrm etc/xdg/xfce4/desktop
-@unexec ${RMDIR} %D/etc/xdg/xfce4 2>/dev/null || ${TRUE}
 @unexec ${RMDIR} %D/share/xfce4/backdrops 2>/dev/null || ${TRUE}
diff --git a/x11/xfce4-desktop/distinfo b/x11/xfce4-desktop/distinfo
index 6ef441c54f2..c5e6a9a8b30 100644
--- a/x11/xfce4-desktop/distinfo
+++ b/x11/xfce4-desktop/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.11 2005/05/18 06:10:31 martti Exp $
+$NetBSD: distinfo,v 1.12 2005/06/15 09:00:15 hira Exp $
 
 SHA1 (xfdesktop-4.2.2.tar.gz) = 5a8bd1fe4541e96f781535ea2a3b8266c3249feb
 RMD160 (xfdesktop-4.2.2.tar.gz) = f4eed52553607b3db14130e529bbe68cb0a5adf2
 Size (xfdesktop-4.2.2.tar.gz) = 2945698 bytes
+SHA1 (patch-aa) = 688161e8361ca83bc30ea71b0f15f044bdcdd045
+SHA1 (patch-ab) = 6a7d204cdafdc9535b6732ed7e6d717ba712eaab
diff --git a/x11/xfce4-desktop/patches/patch-aa b/x11/xfce4-desktop/patches/patch-aa
new file mode 100644
index 00000000000..8858e3bf111
--- /dev/null
+++ b/x11/xfce4-desktop/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2005/06/15 09:00:15 hira Exp $
+
+--- Makefile.in.orig	2005-06-13 18:40:55.000000000 +0900
++++ Makefile.in	2005-06-13 18:41:43.000000000 +0900
+@@ -275,7 +275,7 @@
+ 
+ SUBDIRS = backdrops common doc po settings src modules pixmaps \
+ 	$(am__append_1) $(am__append_2)
+-confdir = $(sysconfdir)/xdg/xfce4/desktop
++confdir = $(datadir)/examples/xfce4/desktop
+ conf_DATA = \
+ 	menu.xml 							\
+ 	menu.xml.cs							\
diff --git a/x11/xfce4-desktop/patches/patch-ab b/x11/xfce4-desktop/patches/patch-ab
new file mode 100644
index 00000000000..815ba6ff9d9
--- /dev/null
+++ b/x11/xfce4-desktop/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2005/06/15 09:00:15 hira Exp $
+
+--- modules/menu/Makefile.in.orig	2005-06-13 18:42:49.000000000 +0900
++++ modules/menu/Makefile.in	2005-06-13 18:43:10.000000000 +0900
+@@ -292,7 +292,7 @@
+ 	@GMODULE_LIBS@ \
+ 	@LIBXFCEGUI4_LIBS@
+ 
+-xfceconfdir = $(sysconfdir)/xdg/xfce4/desktop
++xfceconfdir = $(datadir)/examples/xfce4/desktop
+ xfceconf_DATA = \
+ 	xfce-registered-categories.xml \
+ 	xfce-registered-categories.xml.cs \
diff --git a/x11/xfce4-panel/Makefile b/x11/xfce4-panel/Makefile
index 6848f22bd33..72c53c89df4 100644
--- a/x11/xfce4-panel/Makefile
+++ b/x11/xfce4-panel/Makefile
@@ -1,14 +1,30 @@
-# $NetBSD: Makefile,v 1.16 2005/05/18 06:10:31 martti Exp $
+# $NetBSD: Makefile,v 1.17 2005/06/15 09:01:59 hira Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=	xfce4-panel-${XFCE4_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 COMMENT=	XFce4 panel
 
 PKGCONFIG_OVERRIDE=	panel/xfce4-panel-1.0.pc.in
 PTHREAD_AUTO_VARS=	yes
 
+USE_PKGINSTALL=		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 eu fi fr he hu it ja ko lt ms nl ro ru sk tr vi zh_CN \
+	zh_TW
+CONF_FILES+=		${EGDIR}/contents.xml.${_l} \
+			${PKG_SYSCONFDIR}/contents.xml.${_l}
+.endfor
+
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASE}
+
+MAKE_DIRS+=		${XFCE4_EGBASE} ${EGDIR}
+
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
diff --git a/x11/xfce4-panel/PLIST b/x11/xfce4-panel/PLIST
index 1d1bf47c5a3..aa8a6fc95e0 100644
--- a/x11/xfce4-panel/PLIST
+++ b/x11/xfce4-panel/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2005/05/18 06:10:31 martti Exp $
+@comment $NetBSD: PLIST,v 1.12 2005/06/15 09:01:59 hira Exp $
 ${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/xfce4-panel.mo
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/xfce4-panel.mo
 ${PKGLOCALEDIR}/locale/be/LC_MESSAGES/xfce4-panel.mo
@@ -43,29 +43,6 @@ ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/xfce4-panel.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/xfce4-panel.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/xfce4-panel.mo
 bin/xfce4-panel
-etc/xdg/xfce4/panel/contents.xml
-etc/xdg/xfce4/panel/contents.xml.ar
-etc/xdg/xfce4/panel/contents.xml.az
-etc/xdg/xfce4/panel/contents.xml.ca
-etc/xdg/xfce4/panel/contents.xml.da
-etc/xdg/xfce4/panel/contents.xml.eu
-etc/xdg/xfce4/panel/contents.xml.fi
-etc/xdg/xfce4/panel/contents.xml.fr
-etc/xdg/xfce4/panel/contents.xml.he
-etc/xdg/xfce4/panel/contents.xml.hu
-etc/xdg/xfce4/panel/contents.xml.it
-etc/xdg/xfce4/panel/contents.xml.ja
-etc/xdg/xfce4/panel/contents.xml.ko
-etc/xdg/xfce4/panel/contents.xml.lt
-etc/xdg/xfce4/panel/contents.xml.ms
-etc/xdg/xfce4/panel/contents.xml.nl
-etc/xdg/xfce4/panel/contents.xml.ro
-etc/xdg/xfce4/panel/contents.xml.ru
-etc/xdg/xfce4/panel/contents.xml.sk
-etc/xdg/xfce4/panel/contents.xml.tr
-etc/xdg/xfce4/panel/contents.xml.vi
-etc/xdg/xfce4/panel/contents.xml.zh_CN
-etc/xdg/xfce4/panel/contents.xml.zh_TW
 include/xfce4/panel/add-control-dialog.h
 include/xfce4/panel/controls.h
 include/xfce4/panel/global.h
@@ -86,6 +63,29 @@ lib/xfce4/panel-plugins/libseparator.la
 lib/xfce4/panel-plugins/libswitcher.la
 lib/xfce4/panel-plugins/libsystembuttons.la
 share/applications/xfce-panel-settings.desktop
+share/examples/xfce4/panel/contents.xml
+share/examples/xfce4/panel/contents.xml.ar
+share/examples/xfce4/panel/contents.xml.az
+share/examples/xfce4/panel/contents.xml.ca
+share/examples/xfce4/panel/contents.xml.da
+share/examples/xfce4/panel/contents.xml.eu
+share/examples/xfce4/panel/contents.xml.fi
+share/examples/xfce4/panel/contents.xml.fr
+share/examples/xfce4/panel/contents.xml.he
+share/examples/xfce4/panel/contents.xml.hu
+share/examples/xfce4/panel/contents.xml.it
+share/examples/xfce4/panel/contents.xml.ja
+share/examples/xfce4/panel/contents.xml.ko
+share/examples/xfce4/panel/contents.xml.lt
+share/examples/xfce4/panel/contents.xml.ms
+share/examples/xfce4/panel/contents.xml.nl
+share/examples/xfce4/panel/contents.xml.ro
+share/examples/xfce4/panel/contents.xml.ru
+share/examples/xfce4/panel/contents.xml.sk
+share/examples/xfce4/panel/contents.xml.tr
+share/examples/xfce4/panel/contents.xml.vi
+share/examples/xfce4/panel/contents.xml.zh_CN
+share/examples/xfce4/panel/contents.xml.zh_TW
 share/icons/hicolor/16x16/apps/xfce-system-exit.png
 share/icons/hicolor/16x16/apps/xfce-system-info.png
 share/icons/hicolor/16x16/apps/xfce-system-lock.png
@@ -133,5 +133,3 @@ share/xfce4/doc/fr/images/systembuttons-properties.png
 share/xfce4/doc/fr/xfce4-panel.html
 @dirrm lib/xfce4/panel-plugins
 @dirrm include/xfce4/panel
-@dirrm etc/xdg/xfce4/panel
-@unexec ${RMDIR} %D/etc/xdg/xfce4 2>/dev/null || ${TRUE}
diff --git a/x11/xfce4-panel/distinfo b/x11/xfce4-panel/distinfo
index 1da88528ab8..8edfefe449a 100644
--- a/x11/xfce4-panel/distinfo
+++ b/x11/xfce4-panel/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.11 2005/05/18 06:10:31 martti Exp $
+$NetBSD: distinfo,v 1.12 2005/06/15 09:01:59 hira Exp $
 
 SHA1 (xfce4-panel-4.2.2.tar.gz) = b69c771437c4a133d3814dfef52a5d2089d278bb
 RMD160 (xfce4-panel-4.2.2.tar.gz) = 262aaa0acf58af515c9f5bc1bb0db1621088e593
 Size (xfce4-panel-4.2.2.tar.gz) = 1184587 bytes
+SHA1 (patch-aa) = 80188922f6282ffa109c639727ed86678221e36b
diff --git a/x11/xfce4-panel/patches/patch-aa b/x11/xfce4-panel/patches/patch-aa
new file mode 100644
index 00000000000..e8d9186cae6
--- /dev/null
+++ b/x11/xfce4-panel/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2005/06/15 09:01:59 hira Exp $
+
+--- Makefile.in.orig	2005-06-13 19:00:58.000000000 +0900
++++ Makefile.in	2005-06-13 19:01:29.000000000 +0900
+@@ -236,7 +236,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-confdir = $(sysconfdir)/xdg/xfce4/panel
++confdir = $(datadir)/examples/xfce4/panel
+ conf_DATA = \
+ 	contents.xml 							\
+ 	contents.xml.ar							\
diff --git a/x11/xfce4-session/Makefile b/x11/xfce4-session/Makefile
index 36da2ecf758..f084cc67693 100644
--- a/x11/xfce4-session/Makefile
+++ b/x11/xfce4-session/Makefile
@@ -1,10 +1,22 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/01/17 12:52:48 martti Exp $
+# $NetBSD: Makefile,v 1.2 2005/06/15 09:03:28 hira Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=	xfce4-session-${XFCE4_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 COMMENT=	XFce4 session manager
 
+USE_PKGINSTALL=	yes
+
+PKG_SYSCONFSUBDIR=	xdg/xfce4/xfce4-session
+EGDIR=			${XFCE4_EGBASE}/session
+CONF_FILES=		${EGDIR}/xfce4-session.rc \
+			${PKG_SYSCONFDIR}/xfce4-session.rc
+
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASE}
+
+MAKE_DIRS+=		${XFCE4_EGBASE} ${EGDIR}
+
 .include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xfce4-session/PLIST b/x11/xfce4-session/PLIST
index 447f0ecc606..7c01eef513c 100644
--- a/x11/xfce4-session/PLIST
+++ b/x11/xfce4-session/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2005/05/18 06:10:31 martti Exp $
+@comment $NetBSD: PLIST,v 1.4 2005/06/15 09:03:28 hira Exp $
 ${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/xfce4-session.mo
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/xfce4-session.mo
 ${PKGLOCALEDIR}/locale/be/LC_MESSAGES/xfce4-session.mo
@@ -44,7 +44,6 @@ ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/xfce4-session.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/xfce4-session.mo
 bin/xfce4-session
 bin/xfce4-session-logout
-etc/xdg/xfce4-session/xfce4-session.rc
 include/xfce4/xfce4-session-4.2/libxfsm/xfsm-splash-engine.h
 include/xfce4/xfce4-session-4.2/libxfsm/xfsm-splash-rc.h
 lib/libxfsm-4.2.la
@@ -61,6 +60,7 @@ man/man1/xfce4-session-logout.1
 man/man1/xfce4-session.1
 share/applications/xfce-session-settings.desktop
 share/applications/xfce-splash-settings.desktop
+share/examples/xfce4/session/xfce4-session.rc
 share/icons/hicolor/128x128/apps/xfce4-session.png
 share/icons/hicolor/48x48/apps/xfce4-session.png
 share/icons/hicolor/48x48/apps/xfce4-splash.png
@@ -91,5 +91,4 @@ share/xfce4/doc/fr/xfce4-session.html
 @dirrm lib/xfce4/splash
 @dirrm include/xfce4/xfce4-session-4.2/libxfsm
 @dirrm include/xfce4/xfce4-session-4.2
-@dirrm etc/xdg/xfce4-session
 @unexec ${RMDIR} %D/share/themes/Default 2>/dev/null || ${TRUE}
diff --git a/x11/xfce4-session/distinfo b/x11/xfce4-session/distinfo
index 475975a4873..8548282baaf 100644
--- a/x11/xfce4-session/distinfo
+++ b/x11/xfce4-session/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.4 2005/05/18 06:10:31 martti Exp $
+$NetBSD: distinfo,v 1.5 2005/06/15 09:03:28 hira Exp $
 
 SHA1 (xfce4-session-4.2.2.tar.gz) = c84ac42ef6069456740a4788a3ed14d9e86aeafd
 RMD160 (xfce4-session-4.2.2.tar.gz) = f322301e5dfcf1476197318d2e154f648bc9e933
 Size (xfce4-session-4.2.2.tar.gz) = 1499674 bytes
+SHA1 (patch-aa) = acf3953b39f632423fddd799ba66eb8b4b6893bc
diff --git a/x11/xfce4-session/patches/patch-aa b/x11/xfce4-session/patches/patch-aa
new file mode 100644
index 00000000000..63f9b350f8f
--- /dev/null
+++ b/x11/xfce4-session/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2005/06/15 09:03:28 hira Exp $
+
+--- Makefile.in.orig	2005-06-13 18:25:08.000000000 +0900
++++ Makefile.in	2005-06-13 18:26:18.000000000 +0900
+@@ -249,7 +249,7 @@
+ 	xfce4-session-logout						\
+ 	xfsm-shutdown-helper
+ 
+-configdir = $(sysconfdir)/xdg/xfce4-session
++configdir = $(datadir)/examples/xfce4/session
+ config_DATA = xfce4-session.rc
+ EXTRA_DIST = \
+ 	$(config_DATA)							\
diff --git a/x11/xfce4-utils/Makefile b/x11/xfce4-utils/Makefile
index 9d00fc3af77..9e02d405960 100644
--- a/x11/xfce4-utils/Makefile
+++ b/x11/xfce4-utils/Makefile
@@ -1,11 +1,22 @@
-# $NetBSD: Makefile,v 1.12 2005/01/17 12:56:14 martti Exp $
+# $NetBSD: Makefile,v 1.13 2005/06/15 09:04:32 hira Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=	xfce-utils-${XFCE4_VERSION}
 PKGNAME=	xfce4-utils-${XFCE4_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 COMMENT=	XFce4 utilities
 
+USE_PKGINSTALL=		yes
+
+PKG_SYSCONFSUBDIR=	xdg/xfce4
+EGDIR=			${XFCE4_EGBASE}
+CONF_FILES=		${EGDIR}/xinitrc ${PKG_SYSCONFDIR}/xinitrc
+
+MAKE_DIRS+=		${EGDIR}
+
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASE}
+
 .include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xfce4-utils/PLIST b/x11/xfce4-utils/PLIST
index fae23da09e8..eecbf34aacf 100644
--- a/x11/xfce4-utils/PLIST
+++ b/x11/xfce4-utils/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2005/05/18 06:10:31 martti Exp $
+@comment $NetBSD: PLIST,v 1.12 2005/06/15 09:04:32 hira Exp $
 ${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/xfce-utils.mo
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/xfce-utils.mo
 ${PKGLOCALEDIR}/locale/be/LC_MESSAGES/xfce-utils.mo
@@ -50,9 +50,9 @@ bin/xfmountdev4
 bin/xfrun4
 bin/xftaskbar4
 bin/xfterm4
-etc/xdg/xfce4/xinitrc
 lib/xfce4/mcs-plugins/xftaskbar_plugin.la
 share/applications/xfce-taskbar-settings.desktop
+share/examples/xfce4/xinitrc
 share/icons/hicolor/48x48/apps/xfce4-logo.png
 share/icons/hicolor/48x48/apps/xfce4-taskbar.png
 share/icons/hicolor/scalable/apps/xfce4-taskbar.svg
diff --git a/x11/xfce4-utils/distinfo b/x11/xfce4-utils/distinfo
index eb54a363a53..52c76a2b6e6 100644
--- a/x11/xfce4-utils/distinfo
+++ b/x11/xfce4-utils/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.11 2005/05/18 06:10:31 martti Exp $
+$NetBSD: distinfo,v 1.12 2005/06/15 09:04:32 hira Exp $
 
 SHA1 (xfce-utils-4.2.2.tar.gz) = 384778857af16f7c583272e3a9e2104d9eac8de6
 RMD160 (xfce-utils-4.2.2.tar.gz) = 603a0fc6e6c33d01054f274ceee846f01be7621c
 Size (xfce-utils-4.2.2.tar.gz) = 1031911 bytes
+SHA1 (patch-aa) = deafbcd8b3c367d377aa25416c9d25043f907e60
diff --git a/x11/xfce4-utils/patches/patch-aa b/x11/xfce4-utils/patches/patch-aa
new file mode 100644
index 00000000000..b57ffe0c515
--- /dev/null
+++ b/x11/xfce4-utils/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2005/06/15 09:04:32 hira Exp $
+
+--- scripts/Makefile.in.orig	2005-06-13 18:05:51.000000000 +0900
++++ scripts/Makefile.in	2005-06-13 18:07:08.000000000 +0900
+@@ -233,7 +233,7 @@
+         -e 's,@sysconfdir\@,$(sysconfdir),g' \
+ 	-e 's,@BROWSER_DEFAULT\@,@BROWSER_DEFAULT@,g'
+ 
+-conffilesdir = @sysconfdir@/xdg/xfce4
++conffilesdir = @datadir@/examples/xfce4
+ conffiles_DATA = \
+ 	xinitrc
+