Use PKG_SYSCONFDIR framework. Bump PKGREVISION.

5 files changed, 83 insertions, 37 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 \