Use PKG_SYSCONFDIR framework. Bump PKGREVISION.

4 files changed, 30 insertions, 5 deletions

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)							\