Make this package install its configuration files under the examples tree

and use bsd.pkg.install.mk to copy them to PKG_SYSCONFDIR during the
installation. Bump PKGREVISION to 1.

5 files changed, 53 insertions, 21 deletions

diff --git a/wm/ion/Makefile b/wm/ion/Makefile
index 8f4fb50dae1..d0216076c25 100644
--- a/wm/ion/Makefile
+++ b/wm/ion/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2002/08/25 21:51:35 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2002/12/22 21:33:14 jmmv Exp $
 #
 
 DISTNAME=	ion-20010523
+PKGREVISION=	1
 CATEGORIES=	x11 wm
 MASTER_SITES=	http://www.students.tut.fi/~tuomov/dl/
 
@@ -13,4 +14,20 @@ USE_BUILDLINK2=	YES
 USE_X11BASE=	YES
 USE_GMAKE=	YES
 
+PKG_SYSCONFSUBDIR=	ion
+EGDIR=			${PREFIX}/share/examples/ion
+EGFILES=		bindings-default.conf bindings-sun.conf kludges.conf \
+			look-brownsteel.conf look-greyviolet.conf \
+			look-simpleblue.conf look-wheat.conf sample.conf \
+			ion.conf
+.for f in ${EGFILES}
+CONF_FILES+=		${EGDIR}/$f ${PKG_SYSCONFDIR}/$f
+.endfor
+.undef f
+
+# ion's sources will append "ion/" to PKG_SYSCONFBASE, that is, the
+# PKG_SYSCONFSUBDIR we are currently using.
+MAKE_ENV=		PKG_SYSCONFBASE="${PKG_SYSCONFBASE}"
+
+.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/ion/PLIST b/wm/ion/PLIST
index 7a6d497e538..8c3a47394eb 100644
--- a/wm/ion/PLIST
+++ b/wm/ion/PLIST
@@ -1,24 +1,24 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 20:59:18 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/12/22 21:33:14 jmmv Exp $
 bin/ion
 bin/ion-edit
 bin/ion-man
 bin/ion-runinxterm
 bin/ion-ssh
 bin/ion-view
-etc/ion/bindings-default.conf
-etc/ion/bindings-sun.conf
-etc/ion/ion.conf
-etc/ion/kludges.conf
-etc/ion/look-brownsteel.conf
-etc/ion/look-greyviolet.conf
-etc/ion/look-simpleblue.conf
-etc/ion/look-wheat.conf
-etc/ion/sample.conf
 man/man1/ion.1
 share/doc/ion/ChangeLog
 share/doc/ion/LICENSE
 share/doc/ion/README
 share/doc/ion/config.txt
 share/doc/ion/functions.txt
+share/examples/ion/bindings-default.conf
+share/examples/ion/bindings-sun.conf
+share/examples/ion/ion.conf
+share/examples/ion/kludges.conf
+share/examples/ion/look-brownsteel.conf
+share/examples/ion/look-greyviolet.conf
+share/examples/ion/look-simpleblue.conf
+share/examples/ion/look-wheat.conf
+share/examples/ion/sample.conf
+@dirrm share/examples/ion
 @dirrm share/doc/ion
-@dirrm etc/ion
diff --git a/wm/ion/distinfo b/wm/ion/distinfo
index 9de3ed20b43..55bad5fab7b 100644
--- a/wm/ion/distinfo
+++ b/wm/ion/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.5 2001/08/29 22:41:24 jlam Exp $
+$NetBSD: distinfo,v 1.6 2002/12/22 21:33:14 jmmv Exp $
 
 SHA1 (ion-20010523.tar.gz) = d2eb29d8cd193d4b2bf1e630f4bbac7bd47979d6
 Size (ion-20010523.tar.gz) = 146376 bytes
 SHA1 (patch-aa) = ae5fd844f89bf11d64f1f977219d70e8f868289c
-SHA1 (patch-ab) = 1cb5844d831db2c205142f8fe295002b646b66e8
+SHA1 (patch-ab) = fcebbfb40b218442e3ad9788f557c1b71d3a7de6
 SHA1 (patch-ac) = 302f20d54304164612d04636642a88d0565da75d
+SHA1 (patch-ad) = 0d63137de4e39cddad62e362ac6520ee5de6357f
diff --git a/wm/ion/patches/patch-ab b/wm/ion/patches/patch-ab
index 95a4b611f9e..765ae2f08fa 100644
--- a/wm/ion/patches/patch-ab
+++ b/wm/ion/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.3 2001/08/29 22:41:24 jlam Exp $
+$NetBSD: patch-ab,v 1.4 2002/12/22 21:33:15 jmmv Exp $
 
---- system.mk.orig	Mon Mar  5 11:16:01 2001
+--- system.mk.orig	Mon Mar  5 17:16:01 2001
 +++ system.mk
 @@ -7,13 +7,13 @@
  ## Installation paths
@@ -11,14 +11,15 @@ $NetBSD: patch-ab,v 1.3 2001/08/29 22:41:24 jlam Exp $
  
  # No need to modify these usually
  BINDIR=$(PREFIX)/bin
- ETCDIR=$(PREFIX)/etc
+-ETCDIR=$(PREFIX)/etc
++ETCDIR=$(PREFIX)/share/examples
  MANDIR=$(PREFIX)/man
 -DOCDIR=$(PREFIX)/doc
 +DOCDIR=$(PREFIX)/share/doc
  # Not used
  INCDIR=$(PREFIX)/include
  LIBDIR=$(PREFIX)/lib
-@@ -24,14 +24,14 @@
+@@ -24,14 +24,14 @@ LIBDIR=$(PREFIX)/lib
  ##
  
  #MODULE_SUPPORT=-DCF_NO_MODULE_SUPPORT
@@ -35,7 +36,7 @@ $NetBSD: patch-ab,v 1.3 2001/08/29 22:41:24 jlam Exp $
  
  # SunOS/Solaris
  #X11_PREFIX=/usr/openwin
-@@ -59,7 +59,6 @@
+@@ -59,7 +59,6 @@ X11_DEFINES=
  ## C compiler
  ##
  
@@ -43,7 +44,7 @@ $NetBSD: patch-ab,v 1.3 2001/08/29 22:41:24 jlam Exp $
  
  # The POSIX_SOURCE, XOPEN_SOURCE and WARN options should not be necessary,
  # they're mainly for development use. So, if they cause trouble (not
-@@ -86,8 +85,8 @@
+@@ -86,8 +85,8 @@ WARN=	-W -Wimplicit -Wreturn-type -Wswit
  	-Wparentheses -pedantic-errors -Wuninitialized
  
  
@@ -54,7 +55,7 @@ $NetBSD: patch-ab,v 1.3 2001/08/29 22:41:24 jlam Exp $
  
  
  ##
-@@ -112,9 +111,9 @@
+@@ -112,9 +111,9 @@ RANLIB=ranlib
  ##
  
  # Should work almost everywhere
diff --git a/wm/ion/patches/patch-ad b/wm/ion/patches/patch-ad
new file mode 100644
index 00000000000..330f20fb41c
--- /dev/null
+++ b/wm/ion/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2002/12/22 21:33:15 jmmv Exp $
+
+--- src/Makefile.orig	Wed May 23 23:58:05 2001
++++ src/Makefile
+@@ -10,7 +10,7 @@ include ../system.mk
+ LIBS += -L../libtu -ltu -lm $(X11_LIBS) -lX11
+ #-lefence
+ INCLUDES += -I../libtu/include $(X11_INCLUDES)
+-DEFINES += -DETCDIR=\"$(ETCDIR)\"
++DEFINES += -DETCDIR=\"$(PKG_SYSCONFBASE)\"
+ 
+ CFLAGS += $(XOPEN_SOURCE) $(MODULE_SUPPORT)
+ LDFLAGS += $(MODULE_SUPPORT_LDFLAGS)