Use config file framework. Bump revision.

4 files changed, 64 insertions, 18 deletions

diff --git a/games/falcons-eye/Makefile b/games/falcons-eye/Makefile
index d47eee7bfc5..59aa635dc0e 100644
--- a/games/falcons-eye/Makefile
+++ b/games/falcons-eye/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.32 2006/04/22 09:22:08 rillig Exp $
+# $NetBSD: Makefile,v 1.33 2006/05/18 16:22:26 joerg Exp $
 #
 
 DISTNAME=		nethack_source_331_jtp_193
 PKGNAME=		falcons-eye-1.9.3
-PKGREVISION=		7
+PKGREVISION=		8
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=falconseye/}
 EXTRACT_SUFX=		.zip
@@ -44,6 +44,22 @@ SUBST_SED.unixconf=	-e 's,^\/\* \#define BSD 1 \*\/,\#define BSD 1,' \
 			-e 's,^\#define LINUX,\/\* \#define LINUX \*\/,'
 .endif
 
+EGDIR=			${PREFIX}/share/examples/falcons-eye
+SHAREDIR=		${PREFIX}/share/falcons-eye-dir
+
+CONF_FILES_PERMS+=	/dev/null ${SHAREDIR}/logfile ${ROOT_USER} games 664
+CONF_FILES_PERMS+=	/dev/null ${SHAREDIR}/record ${ROOT_USER} games 664
+CONF_FILES_PERM+=	${EGDIR}/jtp_intr.txt ${SHAREDIR}/config/jtp_intr.txt \
+	${ROOT_USER} games 664
+CONF_FILES_PERM+=	${EGDIR}/jtp_keys.txt ${SHAREDIR}/config/jtp_keys.txt \
+	${ROOT_USER} games 664
+CONF_FILES_PERM+=	${EGDIR}/jtp_lit1.dat ${SHAREDIR}/config/jtp_lit1.dat \
+	${ROOT_USER} games 664
+CONF_FILES_PERM+=	${EGDIR}/jtp_opts.txt ${SHAREDIR}/config/jtp_opts.txt \
+	${ROOT_USER} games 664
+CONF_FILES_PERM+=	${EGDIR}/jtp_snds.txt ${SHAREDIR}/config/jtp_snds.txt \
+	${ROOT_USER} games 664
+
 pre-configure:
 	${CP} ${WRKSRC}/src/fe-config.in ${WRKSRC}/src/fe-config
 	@${CHMOD} 755 ${WRKSRC}/sys/unix/setup.sh
diff --git a/games/falcons-eye/PLIST b/games/falcons-eye/PLIST
index 517f77c4226..da16848ed97 100644
--- a/games/falcons-eye/PLIST
+++ b/games/falcons-eye/PLIST
@@ -1,8 +1,13 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/01/21 11:56:16 pooka Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/05/18 16:22:26 joerg Exp $
 bin/falcons-eye
 bin/fe-config
 bin/recover-falcons-eye
 share/doc/falcons-eye/Guidebook.txt
+share/examples/falcons-eye/jtp_intr.txt
+share/examples/falcons-eye/jtp_keys.txt
+share/examples/falcons-eye/jtp_lit1.dat
+share/examples/falcons-eye/jtp_opts.txt
+share/examples/falcons-eye/jtp_snds.txt
 share/falcons-eye-dir/Arc-fila.lev
 share/falcons-eye-dir/Arc-filb.lev
 share/falcons-eye-dir/Arc-goal.lev
@@ -256,6 +261,7 @@ share/falcons-eye-dir/wizard2.lev
 share/falcons-eye-dir/wizard3.lev
 share/falcons-eye-dir/wizhelp
 @dirrm share/doc/falcons-eye
+@dirrm share/examples/falcons-eye
 @dirrm share/falcons-eye-dir/graphics
 @dirrm share/falcons-eye-dir/manual
 @dirrm share/falcons-eye-dir/sound
diff --git a/games/falcons-eye/distinfo b/games/falcons-eye/distinfo
index 8abe7c8df79..b1b1aa376ae 100644
--- a/games/falcons-eye/distinfo
+++ b/games/falcons-eye/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.11 2006/01/04 08:58:47 joerg Exp $
+$NetBSD: distinfo,v 1.12 2006/05/18 16:22:26 joerg Exp $
 
 SHA1 (falcons-eye-1.9.3-20050216-2/nethack_source_331_jtp_193.zip) = f25a3b77925d247762d18b6f022500aac7c42b29
 RMD160 (falcons-eye-1.9.3-20050216-2/nethack_source_331_jtp_193.zip) = a94c3bbdec7a0c034acbe431071342b872c7acc5
 Size (falcons-eye-1.9.3-20050216-2/nethack_source_331_jtp_193.zip) = 8349587 bytes
 SHA1 (patch-aa) = e068ec41aa17aeb8746475ff33fdef3540a664de
-SHA1 (patch-ab) = 4ab97753aacedfbfd6823600723f01d55043855f
+SHA1 (patch-ab) = 20fb9e0c806ed4e20c49ea2dc3b4a7e302ecd527
 SHA1 (patch-ac) = 3a88954c950854350938fbec1fef195baaacb2cf
 SHA1 (patch-ad) = dc8de40956abdea203814868c4344b7676dee82d
 SHA1 (patch-ae) = b6d0cca1e3d781a2a1f1d4b244e944eaedfec716
diff --git a/games/falcons-eye/patches/patch-ab b/games/falcons-eye/patches/patch-ab
index a1be82eaea5..9cbba2e0cb6 100644
--- a/games/falcons-eye/patches/patch-ab
+++ b/games/falcons-eye/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/01/21 11:56:17 pooka Exp $
+$NetBSD: patch-ab,v 1.2 2006/05/18 16:22:26 joerg Exp $
 
---- sys/unix/Makefile.top.orig	Sun Jun 24 18:57:24 2001
+--- sys/unix/Makefile.top.orig	2001-06-24 18:57:24.000000000 +0000
 +++ sys/unix/Makefile.top
 @@ -14,19 +14,17 @@
  # MAKE = make
@@ -28,7 +28,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/01/21 11:56:17 pooka Exp $
  
  # GAMEDIR also appears in config.h as "HACKDIR".
  # VARDIR may also appear in unixconf.h as "VAR_PLAYGROUND" else GAMEDIR
-@@ -36,9 +34,9 @@
+@@ -36,9 +34,9 @@ DIRPERM  = 0755
  # therefore there should not be anything in GAMEDIR that you want to keep
  # (if there is, you'll have to do the installation by hand or modify the
  # instructions)
@@ -40,7 +40,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/01/21 11:56:17 pooka Exp $
  
  # per discussion in Install.X11 and Install.Qt
  VARDATND = 
-@@ -65,10 +63,8 @@
+@@ -65,10 +63,8 @@ VARDAT = $(VARDATD) $(VARDATND)
  # other permission-related reasons.  If that happens, you may want to set the
  # command to "true", which is a no-op. Note that disabling chown or chgrp
  # will only work if setuid (or setgid) behavior is not desired or required.
@@ -53,7 +53,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/01/21 11:56:17 pooka Exp $
  
  # ----------------------------------------------
  # Extra configuration for NetHack - Falcon's Eye
-@@ -119,9 +115,12 @@
+@@ -119,9 +115,12 @@ JTPMANUALFILES = *.jpg *.html *.css
  $(GAME):
  	( cd src ; $(MAKE) )
  
@@ -67,7 +67,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/01/21 11:56:17 pooka Exp $
  Guidebook:
  	( cd doc ; $(MAKE) Guidebook )
  
-@@ -131,6 +130,9 @@
+@@ -131,6 +130,9 @@ manpages:
  data:
  	( cd dat ; $(MAKE) data )
  
@@ -77,7 +77,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/01/21 11:56:17 pooka Exp $
  rumors:
  	( cd dat ; $(MAKE) rumors )
  
-@@ -188,6 +190,11 @@
+@@ -188,6 +190,11 @@ dlb:
  	( cd util ; $(MAKE) dlb )
  	( cd dat ; ../util/dlb cf nhdat $(DATDLB) )
  
@@ -89,7 +89,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/01/21 11:56:17 pooka Exp $
  
  dofiles:
  	target=`sed -n					\
-@@ -203,6 +210,7 @@
+@@ -203,6 +210,7 @@ dofiles:
  	-rm -f $(SHELLDIR)/$(GAME)
  	sed -e 's;/usr/games/lib/nethackdir;$(GAMEDIR);' \
  		-e 's;HACKDIR/nethack;HACKDIR/$(GAME);' \
@@ -97,7 +97,27 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/01/21 11:56:17 pooka Exp $
  		< sys/unix/nethack.sh \
  		> $(SHELLDIR)/$(GAME)
  # set up their permissions
-@@ -280,12 +288,12 @@
+@@ -239,7 +247,8 @@ dofiles-jtp:
+ 	chmod $(DIRPERM) $(JTPMAINDIR) $(JTPDATADIR) $(JTPGRAPHICSDIR) $(JTPSOUNDDIR) $(JTPMANUALDIR)
+ # copy over the Falcon's Eye files
+ 	( cd  win/jtp/gamedata; cp $(JTPMAINFILES) $(JTPMAINDIR) ; \
+-	cd config; cp $(JTPDATAFILES) $(JTPDATADIR) ; \
++	${BSD_INSTALL_DATA_DIR} $(PREFIX)/share/examples/falcons-eye ; \
++	cd config; ${BSD_INSTALL_DATA} $(JTPDATAFILES) $(PREFIX)/share/examples/falcons-eye ; \
+ 	cd ../graphics; cp $(JTPGRAPHICSFILES) $(JTPGRAPHICSDIR) ; \
+ 	cd ../sound; cp $(JTPSOUNDFILES) $(JTPSOUNDDIR) ; \
+ 	cd ../manual; cp $(JTPMANUALFILES) $(JTPMANUALDIR) )
+@@ -247,9 +256,6 @@ dofiles-jtp:
+ 	-( cd $(JTPMAINDIR) ; $(CHOWN) $(GAMEUID) $(JTPMAINFILES) ; \
+ 	$(CHGRP) $(GAMEGRP) $(JTPMAINFILES) ; \
+ 	chmod $(FILEPERM) $(JTPMAINFILES) ; \
+-	cd $(JTPDATADIR) ; $(CHOWN) $(GAMEUID) $(JTPDATAFILES) ; \
+-	$(CHGRP) $(GAMEGRP) $(JTPDATAFILES) ; \
+-	chmod $(FILEPERM) $(JTPDATAFILES) ; \
+ 	cd $(JTPGRAPHICSDIR) ; $(CHOWN) $(GAMEUID) $(JTPGRAPHICSFILES) ; \
+ 	$(CHGRP) $(GAMEGRP) $(JTPGRAPHICSFILES) ; \
+ 	chmod $(FILEPERM) $(JTPGRAPHICSFILES) ; \
+@@ -280,19 +286,27 @@ install: $(GAME) $(VARDAT) dungeon spec_
  # set up the directories
  # not all mkdirs have -p; those that don't will create a -p directory
  	-mkdir -p $(SHELLDIR)
@@ -112,10 +132,14 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/01/21 11:56:17 pooka Exp $
  # set up the game files
  	( $(MAKE) dofiles )
  # set up some additional files
-@@ -293,6 +301,14 @@
- 	-( cd $(VARDIR) ; $(CHOWN) $(GAMEUID) perm record logfile ; \
- 			$(CHGRP) $(GAMEGRP) perm record logfile ; \
- 			chmod $(FILEPERM) perm record logfile )
+-	touch $(VARDIR)/perm $(VARDIR)/record $(VARDIR)/logfile
+-	-( cd $(VARDIR) ; $(CHOWN) $(GAMEUID) perm record logfile ; \
+-			$(CHGRP) $(GAMEGRP) perm record logfile ; \
+-			chmod $(FILEPERM) perm record logfile )
++	touch $(VARDIR)/perm
++	-( cd $(VARDIR) ; $(CHOWN) $(GAMEUID) perm ; \
++			$(CHGRP) $(GAMEGRP) perm ; \
++			chmod $(FILEPERM) perm )
 +	-mkdir -p $(PREFIX)/share/doc/$(GAME)
 +	cp doc/Guidebook.txt $(PREFIX)/share/doc/$(GAME)
 +	chown $(GAMEUID):$(GAMEGRP) $(PREFIX)/share/doc/$(GAME)/Guidebook.txt