Hello Martti and xfce4 users:

Here are patches for x11/xfce4-desktop  so it will use PKG_SYSCONFDIR.
It appears that x11/xfce4-panel changes should be similar.

Does anyone want to do x11/xfce4-panel and xfce4-utils too?

Can I commit this for x11/xfce4-desktop? (I have only been using xfce4
off-an-on for a little while, so I am not sure how to test these
menu.xml files yet.)

$NetBSD$

--- Makefile.in.orig	2004-02-28 07:32:24.000000000 -0800
+++ Makefile.in
@@ -213,7 +213,7 @@ sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 SUBDIRS = backdrops common doc po settings src
-confdir = $(sysconfdir)/xfce4
+confdir = $(PKGEXAMPLESDIR)
 conf_DATA = \
 	menu.xml 							\
 	menu.xml.az 							\
? x11/xfce4-desktop/patches
Index: x11/xfce4-desktop/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/xfce4-desktop/Makefile,v
retrieving revision 1.9
diff -b -u -r1.9 Makefile
--- x11/xfce4-desktop/Makefile	10 Mar 2004 11:53:37 -0000	1.9
+++ x11/xfce4-desktop/Makefile	9 Apr 2004 22:26:41 -0000
@@ -3,10 +3,25 @@
 .include "../../meta-pkgs/xfce4/Makefile.common"

 DISTNAME=	xfdesktop-${XFCE4_VERSION}
+PKGREVISION=	1
 PKGNAME=	xfce4-desktop-${XFCE4_VERSION}
 CATEGORIES=	x11
 COMMENT=	XFce4 desktop background manager

+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASEDIR}
+
+USE_PKGINSTALL=		YES
+PKG_SYSCONFSUBDIR=	xfce4
+PKGEXAMPLESDIR=		${PREFIX}/share/examples/${PKGBASE}
+MAKE_ENV+=		PKGEXAMPLESDIR=${PKGEXAMPLESDIR}
+EGFILES=	menu.xml menu.xml.ca menu.xml.fr menu.xml.nl menu.xml.tr
+EGFILES+=	menu.xml.zh_CN menu.xml.az menu.xml.de menu.xml.hu
+EGFILES+=	menu.xml.ta menu.xml.vi menu.xml.zh_TW
+.for f in ${EGFILES}
+CONF_FILES+=	${PKGEXAMPLESDIR}/$f ${PKG_SYSCONFDIR}/$f
+.endfor
+.undef f
+
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
Index: x11/xfce4-desktop/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/x11/xfce4-desktop/PLIST,v
retrieving revision 1.5
diff -b -u -r1.5 PLIST
--- x11/xfce4-desktop/PLIST	10 Mar 2004 07:41:16 -0000	1.5
+++ x11/xfce4-desktop/PLIST	9 Apr 2004 22:26:41 -0000
@@ -1,17 +1,17 @@
 @comment $NetBSD: PLIST,v 1.5 2004/03/10 07:41:16 martti Exp $
 bin/xfdesktop
-etc/xfce4/menu.xml
-etc/xfce4/menu.xml.az
-etc/xfce4/menu.xml.ca
-etc/xfce4/menu.xml.de
-etc/xfce4/menu.xml.fr
-etc/xfce4/menu.xml.hu
-etc/xfce4/menu.xml.nl
-etc/xfce4/menu.xml.ta
-etc/xfce4/menu.xml.tr
-etc/xfce4/menu.xml.vi
-etc/xfce4/menu.xml.zh_CN
-etc/xfce4/menu.xml.zh_TW
+share/examples/xfce4-desktop/menu.xml
+share/examples/xfce4-desktop/menu.xml.az
+share/examples/xfce4-desktop/menu.xml.ca
+share/examples/xfce4-desktop/menu.xml.de
+share/examples/xfce4-desktop/menu.xml.fr
+share/examples/xfce4-desktop/menu.xml.hu
+share/examples/xfce4-desktop/menu.xml.nl
+share/examples/xfce4-desktop/menu.xml.ta
+share/examples/xfce4-desktop/menu.xml.tr
+share/examples/xfce4-desktop/menu.xml.vi
+share/examples/xfce4-desktop/menu.xml.zh_CN
+share/examples/xfce4-desktop/menu.xml.zh_TW
 lib/xfce4/mcs-plugins/backdrop_settings.a
 lib/xfce4/mcs-plugins/backdrop_settings.la
 lib/xfce4/mcs-plugins/backdrop_settings.so
Index: x11/xfce4-desktop/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/x11/xfce4-desktop/distinfo,v
retrieving revision 1.5
diff -b -u -r1.5 distinfo
--- x11/xfce4-desktop/distinfo	10 Mar 2004 07:41:16 -0000	1.5
+++ x11/xfce4-desktop/distinfo	9 Apr 2004 22:26:41 -0000
@@ -2,3 +2,4 @@

 SHA1 (xfdesktop-4.0.4.tar.gz) = 9fef66f385e4bf3e79ff25b11b7377aa38c33cc4
 Size (xfdesktop-4.0.4.tar.gz) = 2121394 bytes
+SHA1 (patch-aa) = 79818e205558b596aed0ec32b1126e99b8a5e455



   Jeremy C. Reed
   http://www.reedmedia.net/