>Number:         16966
>Category:       pkg
>Synopsis:       Changed location of shared (conf) files of wm/windowmaker
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Wed May 22 09:07:00 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator:     Julio Merino
>Release:        NetBSD 1.5ZC
>Organization:
HispaBSD
>Environment:
	
	
System: NetBSD darkstar.local 1.5ZC NetBSD 1.5ZC (DARKSTAR) #38: Sun May 19 20:12:17 CEST 2002 juli@darkstar.local:/home/pub/NetBSD/src/sys/arch/i386/compile/DARKSTAR i386
Architecture: i386
Machine: i386
>Description:
	wm/windowmaker installs several files under pkg/etc/WindowMaker.
	Those files are always copied into user's home by wmaker.inst
	command, so global settings usually do not matter.

	I've moved those files to pkg/share/WindowMaker, which makes
	more sense. This solves the problem when using PKG_SYSCONFDIR.
>How-To-Repeat:
	
>Fix:
	The following patch fixes wm/windowmaker:

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/wm/windowmaker/Makefile,v
retrieving revision 1.25
diff -u -u -r1.25 Makefile
--- Makefile	2002/03/13 17:37:48	1.25
+++ Makefile	2002/05/22 16:03:14
@@ -2,7 +2,7 @@
 
 DISTNAME=		WindowMaker-0.80.0
 PKGNAME=		windowmaker-0.80.0
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		x11 wm
 MASTER_SITES=		ftp://ftp.windowmaker.org/pub/source/release/ \
 			ftp://ftp.ics.es.osaka-u.ac.jp/mirrors/WindowMaker/source/release/
@@ -24,7 +24,8 @@
 USE_X11BASE=		YES
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--enable-usermenu \
-			--with-nlsdir=${PREFIX}/${PKGLOCALEDIR}/locale
+			--with-nlsdir=${PREFIX}/${PKGLOCALEDIR}/locale \
+			--sysconfdir=${PREFIX}/share
 CONFIGURE_ENV+=		LINGUAS=yes
 
 INSTALL_TARGET=		install-strip
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/wm/windowmaker/PLIST,v
retrieving revision 1.3
diff -u -u -r1.3 PLIST
--- PLIST	2002/02/15 10:13:01	1.3
+++ PLIST	2002/05/22 16:03:15
@@ -89,11 +89,6 @@
 bin/wsetfont
 bin/wxcopy
 bin/wxpaste
-etc/WindowMaker/WMGLOBAL
-etc/WindowMaker/WMRootMenu
-etc/WindowMaker/WMState
-etc/WindowMaker/WMWindowAttributes
-etc/WindowMaker/WindowMaker
 include/WINGs/WINGs.h
 include/WINGs/WINGsP.h
 include/WINGs/WUtil.h
@@ -247,6 +242,11 @@
 share/WindowMaker/Themes/OpenStep.style
 share/WindowMaker/Themes/Pastel.style
 share/WindowMaker/Themes/SteelBlueSilk.style
+share/WindowMaker/WMGLOBAL
+share/WindowMaker/WMRootMenu
+share/WindowMaker/WMState
+share/WindowMaker/WMWindowAttributes
+share/WindowMaker/WindowMaker
 share/WindowMaker/autostart.sh
 share/WindowMaker/exitscript.sh
 share/WindowMaker/menu

>Release-Note:
>Audit-Trail:
>Unformatted: