Make this package install its configuration file under the examples tree

and use bsd.pkg.install.mk to copy it to PKG_SYSCONFDIR.
Bump PKGREVISION to 2.

4 files changed, 40 insertions, 13 deletions

diff --git a/graphics/tuxpaint/Makefile b/graphics/tuxpaint/Makefile
index 1af55339ca6..a5e0951f9e6 100644
--- a/graphics/tuxpaint/Makefile
+++ b/graphics/tuxpaint/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2002/12/24 06:10:09 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2003/01/01 19:24:19 jmmv Exp $
 #
 
 DISTNAME=	tuxpaint-2002.10.26
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.sonic.net/pub/users/nbs/unix/x/tuxpaint/
 
@@ -15,8 +15,13 @@ USE_PKGLOCALEDIR=	YES
 USE_GMAKE=		YES
 MANCOMPRESSED=		YES
 
+MAKE_ENV+=		CONFDIR="${PKG_SYSCONFDIR}"
+EGDIR=			${PREFIX}/share/examples/tuxpaint
+CONF_FILES=		${EGDIR}/tuxpaint.conf ${PKG_SYSCONFDIR}/tuxpaint.conf
+
 .include "../../audio/SDL-mixer/buildlink2.mk"
 .include "../../devel/SDL/buildlink2.mk"
 .include "../../devel/SDL_ttf/buildlink2.mk"
 .include "../../graphics/SDL-image/buildlink2.mk"
+.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/tuxpaint/PLIST b/graphics/tuxpaint/PLIST
index 1092dc39091..03cd790766e 100644
--- a/graphics/tuxpaint/PLIST
+++ b/graphics/tuxpaint/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.4 2002/10/28 09:03:09 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/01/01 19:24:19 jmmv Exp $
 bin/tuxpaint
 bin/tuxpaint-import
-etc/tuxpaint/tuxpaint.conf
 man/man1/tuxpaint-import.1
 man/man1/tuxpaint.1
 share/doc/tuxpaint/AUTHORS.txt
@@ -65,6 +64,7 @@ share/doc/tuxpaint/tr/FAQ.txt
 share/doc/tuxpaint/tr/INSTALL.txt
 share/doc/tuxpaint/tr/PNG.txt
 share/doc/tuxpaint/tr/README.txt
+share/examples/tuxpaint/tuxpaint.conf
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/tuxpaint.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/tuxpaint.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/tuxpaint.mo
@@ -218,6 +218,7 @@ share/tuxpaint/sounds/thin.wav
 @dirrm share/tuxpaint/fonts
 @dirrm share/tuxpaint/brushes
 @dirrm share/tuxpaint
+@dirrm share/examples/tuxpaint
 @dirrm share/doc/tuxpaint/tr
 @dirrm share/doc/tuxpaint/pt_br
 @dirrm share/doc/tuxpaint/nn
@@ -229,4 +230,3 @@ share/tuxpaint/sounds/thin.wav
 @dirrm share/doc/tuxpaint/de
 @dirrm share/doc/tuxpaint/da
 @dirrm share/doc/tuxpaint
-@dirrm etc/tuxpaint
diff --git a/graphics/tuxpaint/distinfo b/graphics/tuxpaint/distinfo
index 26ad2d1a59a..c315eec96d7 100644
--- a/graphics/tuxpaint/distinfo
+++ b/graphics/tuxpaint/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2002/10/28 09:03:09 wiz Exp $
+$NetBSD: distinfo,v 1.6 2003/01/01 19:24:19 jmmv Exp $
 
 SHA1 (tuxpaint-2002.10.26.tar.gz) = 7c1ea171462f03482cc081142f90fa2dc6214e9d
 Size (tuxpaint-2002.10.26.tar.gz) = 1131125 bytes
-SHA1 (patch-aa) = 402dc6f3b45ae95e470db08b618165aeb29ca766
+SHA1 (patch-aa) = 63841c9e671e60f6bd16e449a13023336892c158
diff --git a/graphics/tuxpaint/patches/patch-aa b/graphics/tuxpaint/patches/patch-aa
index e81cbef2c81..5d856646597 100644
--- a/graphics/tuxpaint/patches/patch-aa
+++ b/graphics/tuxpaint/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.2 2002/09/29 20:58:19 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2003/01/01 19:24:20 jmmv Exp $
 
---- Makefile.orig	Sat Sep 28 10:58:15 2002
+--- Makefile.orig	Sun Oct 27 06:17:27 2002
 +++ Makefile
 @@ -11,7 +11,7 @@
  
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.2 2002/09/29 20:58:19 wiz Exp $
  
  
  # Program:
-@@ -27,7 +27,7 @@ DATA_PREFIX=$(PREFIX)/share/tuxpaint/
+@@ -27,16 +27,9 @@ DATA_PREFIX=$(PREFIX)/share/tuxpaint/
  # Docs and man page:
  
  DOC_PREFIX=$(PREFIX)/share/doc/tuxpaint/
@@ -19,8 +19,17 @@ $NetBSD: patch-aa,v 1.2 2002/09/29 20:58:19 wiz Exp $
 +MAN_PREFIX=$(PREFIX)/man/
  
  
- # 'System-wide' Config file:
-@@ -68,7 +68,7 @@ SDL_CFLAGS=$(shell sdl-config --cflags)
+-# 'System-wide' Config file:
+-
+-ifeq ($(PREFIX),/usr)
+-  CONFDIR=/etc/tuxpaint
+-else
+-  CONFDIR=$(PREFIX)/etc/tuxpaint
+-endif
+ 
+ 
+ # Icons and launchers:
+@@ -68,7 +61,7 @@ SDL_CFLAGS=$(shell sdl-config --cflags)
  
  # The entire set of CFLAGS:
  
@@ -29,7 +38,7 @@ $NetBSD: patch-aa,v 1.2 2002/09/29 20:58:19 wiz Exp $
  	-D$(NOSOUNDFLAG) -DDOC_PREFIX=\"$(DOC_PREFIX)\" \
  	-DLOCALEDIR=\"$(LOCALE_PREFIX)\" -DCONFDIR=\"$(CONFDIR)\"
  
-@@ -100,8 +100,7 @@ nosound:
+@@ -100,8 +93,7 @@ nosound:
  # to do this as superuser ("root"))
  
  install:	install-bin install-data install-man install-doc \
@@ -39,3 +48,16 @@ $NetBSD: patch-aa,v 1.2 2002/09/29 20:58:19 wiz Exp $
  		install-default-config
  	@echo
  	@echo "All done! Now (preferably NOT as 'root' superuser),"
+@@ -167,9 +159,9 @@ uninstall:
+ install-default-config:
+ 	@echo
+ 	@echo "...Installing default config file..."
+-	install -d $(CONFDIR)
+-	cp src/tuxpaint.conf $(CONFDIR)
+-	chmod 644 $(CONFDIR)/tuxpaint.conf
++	install -d $(PREFIX)/share/examples/tuxpaint
++	cp src/tuxpaint.conf $(PREFIX)/share/examples/tuxpaint
++	chmod 644 $(PREFIX)/share/examples/tuxpaint/tuxpaint.conf
+ 
+ 
+ # Install a launcher icon in the Gnome menu, under "Graphics"