Use PKG_SYSCONFDIR framework. Bump PKGREVISION.

4 files changed, 56 insertions, 28 deletions

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							\