Use PKG_SYSCONFDIR. Bump PKGREVISION.

4 files changed, 24 insertions, 7 deletions

diff --git a/x11/xfce4-exo/Makefile b/x11/xfce4-exo/Makefile
index 9ef39816f52..136d43692f9 100644
--- a/x11/xfce4-exo/Makefile
+++ b/x11/xfce4-exo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2008/12/09 10:33:36 ahoka Exp $
+# $NetBSD: Makefile,v 1.6 2008/12/18 16:38:08 hira Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -8,12 +8,17 @@ XFCE4_VERSION=	0.3.4
 
 DISTNAME=	exo-${XFCE4_VERSION}
 PKGNAME=	xfce4-exo-${XFCE4_VERSION}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	x11
 COMMENT=	Xfce extension library
 
 DEPENDS+=	p5-URI>=0:../../www/p5-URI
 
+PKG_SYSCONFSUBDIR=	xdg/xfce4
+EGDIR=			${XFCE4_EGBASE}
+CONF_FILES=		${EGDIR:Q}/helpers.rc ${PKG_SYSCONFDIR:Q}/helpers.rc
+OWN_DIRS+=		${EGDIR}
+
 .include "options.mk"
 
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
diff --git a/x11/xfce4-exo/PLIST b/x11/xfce4-exo/PLIST
index e4cff002ec1..2702a392458 100644
--- a/x11/xfce4-exo/PLIST
+++ b/x11/xfce4-exo/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2007/12/07 19:43:27 martti Exp $
+@comment $NetBSD: PLIST,v 1.3 2008/12/18 16:38:08 hira Exp $
 bin/exo-csource
 bin/exo-desktop-item-edit
 bin/exo-eject
@@ -6,7 +6,6 @@ bin/exo-mount
 bin/exo-open
 bin/exo-preferred-applications
 bin/exo-unmount
-etc/xdg/xfce4/helpers.rc
 include/exo-0.3/exo-hal/exo-hal.h
 include/exo-0.3/exo/exo-binding.h
 include/exo-0.3/exo/exo-cell-renderer-ellipsized-text.h
@@ -45,6 +44,7 @@ libexec/exo-helper-0.3
 man/man1/exo-csource.1
 man/man1/exo-open.1
 share/applications/exo-preferred-applications.desktop
+share/examples/xfce4/helpers.rc
 share/gtk-doc/html/exo/ExoCellRendererIcon.html
 share/gtk-doc/html/exo/ExoCellRendererEllipsizedText.html
 share/gtk-doc/html/exo/ExoEllipsizedLabel.html
@@ -192,5 +192,3 @@ share/xfce4/helpers/xterm.desktop
 @unexec ${RMDIR} %D/share/xfce4/doc/C/images 2>/dev/null || ${TRUE}
 @unexec ${RMDIR} %D/share/xfce4/doc/C 2>/dev/null || ${TRUE}
 @unexec ${RMDIR} %D/share/xfce4/doc 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/etc/xdg/xfce4 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/etc/xdg 2>/dev/null || ${TRUE}
diff --git a/x11/xfce4-exo/distinfo b/x11/xfce4-exo/distinfo
index 50b030d5984..0235dfe0b45 100644
--- a/x11/xfce4-exo/distinfo
+++ b/x11/xfce4-exo/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.5 2008/12/09 10:33:36 ahoka Exp $
+$NetBSD: distinfo,v 1.6 2008/12/18 16:38:08 hira Exp $
 
 SHA1 (exo-0.3.4.tar.bz2) = 4f7a3f46592fd0311be1f011f17431f211cc1fcb
 RMD160 (exo-0.3.4.tar.bz2) = e021f030a624c522c819ec0f3a8682a1007ae748
 Size (exo-0.3.4.tar.bz2) = 1300127 bytes
 SHA1 (patch-ad) = af08127aad06a5e9d8e8055dff1f55982666d8d9
 SHA1 (patch-ae) = 18a95737a6eaef8697224d4c099625c18be7ddfb
+SHA1 (patch-af) = 3ee9049c676a03eadaaa92c69f5480e625a9cc9f
diff --git a/x11/xfce4-exo/patches/patch-af b/x11/xfce4-exo/patches/patch-af
new file mode 100644
index 00000000000..232926af987
--- /dev/null
+++ b/x11/xfce4-exo/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2008/12/18 16:38:08 hira Exp $
+
+--- exo-helper/helpers/Makefile.in.orig	2008-11-29 17:14:28.000000000 +0900
++++ exo-helper/helpers/Makefile.in	2008-11-29 17:15:31.000000000 +0900
+@@ -276,7 +276,7 @@
+ target_vendor = @target_vendor@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-defaultsdir = $(sysconfdir)/xdg/xfce4
++defaultsdir = $(datadir)/examples/xfce4
+ defaults_DATA = helpers.rc
+ desktopdir = $(datadir)/xfce4/helpers
+ desktop_in_in_files = \