Install configuration files under the examples hierarchy and use

bsd.pkg.install.mk to copy them to PKG_SYSCONFDIR.  Bump PKGREVISION to 1.

This closes my own PR pkg/16966 (which proposed a different, wrong change).

4 files changed, 34 insertions, 10 deletions

diff --git a/wm/windowmaker/Makefile b/wm/windowmaker/Makefile
index 3b1d1c67647..29d3f4e79b6 100644
--- a/wm/windowmaker/Makefile
+++ b/wm/windowmaker/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.30 2002/11/21 16:08:49 tron Exp $
+# $NetBSD: Makefile,v 1.31 2003/01/08 19:56:34 jmmv Exp $
 
 VERS=			0.80.2
 DISTNAME=		WindowMaker-${VERS}
 PKGNAME=		windowmaker-${VERS}
-# PKGREVISION=		1
+PKGREVISION=		1
 CATEGORIES=		x11 wm
 MASTER_SITES=		ftp://ftp.windowmaker.org/pub/source/release/ \
 			ftp://ftp.ics.es.osaka-u.ac.jp/mirrors/WindowMaker/source/release/
@@ -21,6 +21,7 @@ USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--enable-usermenu \
+			--sysconfdir=${PKG_SYSCONFBASE} \
 			--with-nlsdir=${PREFIX}/${PKGLOCALEDIR}/locale
 CONFIGURE_ENV+=		LINGUAS=yes
 CONFIGURE_ENV+=		CPP_PATH="${CPP}"
@@ -29,6 +30,14 @@ INSTALL_TARGET=		install-strip
 
 .include "../../mk/bsd.prefs.mk"
 
+PKG_SYSCONFSUBDIR=	WindowMaker
+EGDIR=			${PREFIX}/share/examples/WindowMaker
+CONF_FILES=
+.for f in WMGLOBAL WMRootMenu WMState WMWindowAttributes WindowMaker
+CONF_FILES+=		${EGDIR}/$f ${PKG_SYSCONFDIR}/$f
+.endfor
+.undef f
+
 # WINDOWMAKER_OPTIONS is a space-separated list of compile-time options
 # to support.  Currently supported options:
 #
@@ -81,6 +90,7 @@ post-install:
 .include "../../graphics/tiff/buildlink2.mk"
 .include "../../graphics/xpm/buildlink2.mk"
 
+.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
 
 # "egcs" has an optimizer problem on "arm32".
diff --git a/wm/windowmaker/PLIST b/wm/windowmaker/PLIST
index c598a1ac0b5..2859aa5ae97 100644
--- a/wm/windowmaker/PLIST
+++ b/wm/windowmaker/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2002/08/26 13:02:16 tron Exp $
+@comment $NetBSD: PLIST,v 1.8 2003/01/08 19:56:34 jmmv Exp $
 GNUstep/Apps/WPrefs.app/WPrefs
 GNUstep/Apps/WPrefs.app/WPrefs.tiff
 GNUstep/Apps/WPrefs.app/WPrefs.xpm
@@ -89,11 +89,6 @@ bin/wpaste
 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
@@ -303,6 +298,11 @@ share/doc/WindowMaker/README
 share/doc/WindowMaker/README.GNOME
 share/doc/WindowMaker/README.KDE
 share/doc/WindowMaker/README.definable-cursor
+share/examples/WindowMaker/WMGLOBAL
+share/examples/WindowMaker/WMRootMenu
+share/examples/WindowMaker/WMState
+share/examples/WindowMaker/WMWindowAttributes
+share/examples/WindowMaker/WindowMaker
 ${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/WPrefs.mo
 ${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/WindowMaker.mo
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/WINGs.mo
@@ -348,6 +348,7 @@ ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/WindowMaker.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/WindowMaker.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/WPrefs.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/WindowMaker.mo
+@dirrm share/examples/WindowMaker
 @dirrm share/doc/WindowMaker
 @dirrm share/WindowMaker/Themes
 @dirrm share/WindowMaker/Styles
@@ -362,7 +363,6 @@ ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/WindowMaker.mo
 @dirrm man/sk/man1
 @dirrm man/sk
 @dirrm include/WINGs
-@dirrm etc/WindowMaker
 @dirrm GNUstep/Apps/WPrefs.app/xpm
 @dirrm GNUstep/Apps/WPrefs.app/tiff
 @dirrm GNUstep/Apps/WPrefs.app
diff --git a/wm/windowmaker/distinfo b/wm/windowmaker/distinfo
index 6ffd006a3a4..25ef31cedf4 100644
--- a/wm/windowmaker/distinfo
+++ b/wm/windowmaker/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2002/11/21 16:08:49 tron Exp $
+$NetBSD: distinfo,v 1.18 2003/01/08 19:56:34 jmmv Exp $
 
 SHA1 (WindowMaker-0.80.2.tar.bz2) = efc8b3e29f738b44cca6257304ae0951cfd33b43
 Size (WindowMaker-0.80.2.tar.bz2) = 2053988 bytes
@@ -7,4 +7,5 @@ SHA1 (patch-ab) = ef1804477a1908e4a53e29bb43cd40399ea0c870
 SHA1 (patch-ac) = e44933c13b86aa11777d929a71add7fb95118d28
 SHA1 (patch-ad) = 040d603c789987f18c6622e12f6044cfae172e15
 SHA1 (patch-ae) = 92abcb4a013b6df1a89f9884780c3d9611056582
+SHA1 (patch-af) = fd60724503f7bc29788be7e72bbe5898ed282c2c
 SHA1 (patch-ah) = 6725c4762a07f923304dc63df66afe8a6fae0253
diff --git a/wm/windowmaker/patches/patch-af b/wm/windowmaker/patches/patch-af
new file mode 100644
index 00000000000..e0ccdfcf6f5
--- /dev/null
+++ b/wm/windowmaker/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.3 2003/01/08 19:56:34 jmmv Exp $
+
+--- WindowMaker/Defaults/Makefile.in.orig	Tue Jul  2 02:37:45 2002
++++ WindowMaker/Defaults/Makefile.in
+@@ -95,7 +95,7 @@ X_LIBRARY_PATH = @X_LIBRARY_PATH@
+ supported_locales = @supported_locales@
+ wprefsdir = @wprefsdir@
+ 
+-defsdatadir = $(sysconfdir)/WindowMaker
++defsdatadir = $(datadir)/examples/WindowMaker
+ 
+ defsdata_DATA = WMRootMenu WMWindowAttributes WindowMaker WMState WMGLOBAL
+