Add PKG_DESTDIR_SUPPORT, bump pkgrevision, use pkgsrc infrastructure for

scores

5 files changed, 34 insertions, 21 deletions

diff --git a/games/zombies/Makefile b/games/zombies/Makefile
index 3313f1c3e45..3fd59645787 100644
--- a/games/zombies/Makefile
+++ b/games/zombies/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2008/02/28 11:58:48 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2009/12/10 20:59:22 abs Exp $
 
 DISTNAME=	zombies-1.0
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://www.thistledown.com.au/software/
 
@@ -9,10 +9,20 @@ MAINTAINER=	simonb@NetBSD.org
 HOMEPAGE=	http://www.thistledown.com.au/software/
 COMMENT=	Simple robots-like game where you destroy the zombies
 
-AUTO_MKDIRS=			yes
-BUILD_DEFS+=		VARBASE
-MAKE_ENV+=	VARBASE=${VARBASE}
-MAKE_DIRS=	${VARBASE}/games
+# For removing setting SETGIDGAME from here pkgsrc should be fixed
+SETGIDGAME=		yes
+
+SAVEPATH=		${VARBASE}/games/zombies
+SCOREFILE=		${SAVEPATH}/scores
+
+SPECIAL_PERMS=		bin/zombies ${SETGID_GAMES_PERMS}
+OWN_DIRS_PERMS+=	${SAVEPATH} ${GAMEOWN} ${GAMEGRP} ${GAMEDIRMODE}
+
+AUTO_MKDIRS=	yes
+BUILD_DEFS+=	VARBASE SCOREFILE
+MAKE_ENV+=	SCOREFILE=${SCOREFILE}
+
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../mk/curses.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/zombies/PLIST b/games/zombies/PLIST
index 9f3e6de41ba..1479571c047 100644
--- a/games/zombies/PLIST
+++ b/games/zombies/PLIST
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2004/03/06 20:28:20 snj Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/12/10 20:59:22 abs Exp $
 bin/zombies
 man/man6/zombies.6
 share/games/zombies_score.dist
-@exec if [ ! -f /var/games/zombies_score ]; then ${CP} -p %D/share/games/zombies_score.dist /var/games/zombies_score; fi
diff --git a/games/zombies/distinfo b/games/zombies/distinfo
index f993ed73626..445a68078db 100644
--- a/games/zombies/distinfo
+++ b/games/zombies/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.8 2007/06/01 08:58:44 rillig Exp $
+$NetBSD: distinfo,v 1.9 2009/12/10 20:59:22 abs Exp $
 
 SHA1 (zombies-1.0.tar.gz) = 5bc4c87211b5aa29edffb7df74ee12c0bbdc408a
 RMD160 (zombies-1.0.tar.gz) = 006fcb8876f6712178ae7486b15c6a27de6270ee
 Size (zombies-1.0.tar.gz) = 9482 bytes
-SHA1 (patch-aa) = 1816cd3c317d312243d76ff42df168922c4a2726
-SHA1 (patch-ab) = c17689d0b97e48e8d75c696809a77cf9664bcc4e
+SHA1 (patch-aa) = 3a863f9cb1f2894c5a47133ab1ef97b790825553
+SHA1 (patch-ab) = be8f4baf75ede5154a30617368651ca2df735574
diff --git a/games/zombies/patches/patch-aa b/games/zombies/patches/patch-aa
index cfe206ca49d..e2387e29a22 100644
--- a/games/zombies/patches/patch-aa
+++ b/games/zombies/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.5 2007/06/01 08:58:44 rillig Exp $
+$NetBSD: patch-aa,v 1.6 2009/12/10 20:59:22 abs Exp $
 
 --- Makefile.orig	1999-06-26 14:37:17.000000000 +0000
 +++ Makefile
@@ -17,7 +17,7 @@ $NetBSD: patch-aa,v 1.5 2007/06/01 08:58:44 rillig Exp $
 -MANOWN		= root
 -MANGRP		= wheel
 -MANMODE		= 444
-+SCOREFILE	= ${VARBASE}/games/zombies_score
++SCOREFILE	?= ${VARBASE}/games/zombies_score
 +#BINOWN		= games
 +#BINGRP		= games
 +#BINMODE		= 2555
@@ -49,11 +49,15 @@ $NetBSD: patch-aa,v 1.5 2007/06/01 08:58:44 rillig Exp $
  
  all:		$(PROG)
  
-@@ -77,6 +77,7 @@ ${OBJS}:	${HDRS}
+@@ -75,8 +75,9 @@ zombies:	${OBJS}
+ ${OBJS}:	${HDRS}
+ 
  install:	${PROG}
- 		${INSTALL_PROG} ${PROG} ${BINDIR}
- 		${INSTALL_MAN} ${MAN} ${MANDIR}
-+		${INSTALL_SCORE} /dev/null ${PREFIX}/share/games/zombies_score.dist
+-		${INSTALL_PROG} ${PROG} ${BINDIR}
+-		${INSTALL_MAN} ${MAN} ${MANDIR}
++		${INSTALL_PROG} ${PROG} ${DESTDIR}${BINDIR}
++		${INSTALL_MAN} ${MAN} ${DESTDIR}${MANDIR}
++		${INSTALL_SCORE} /dev/null ${DESTDIR}${PREFIX}/share/games/zombies_score.dist
  		if [ ! -f ${SCOREFILE} ]; then \
  			${INSTALL_SCORE} /dev/null ${SCOREFILE} ; \
  		fi
diff --git a/games/zombies/patches/patch-ab b/games/zombies/patches/patch-ab
index 85141c82616..caf7f39b81b 100644
--- a/games/zombies/patches/patch-ab
+++ b/games/zombies/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1 2001/04/18 12:20:38 simonb Exp $
+$NetBSD: patch-ab,v 1.2 2009/12/10 20:59:22 abs Exp $
 
---- main.c.orig	Sat Jun 26 23:48:39 1999
-+++ main.c	Wed Apr 18 22:11:45 2001
-@@ -212,21 +212,11 @@
+--- main.c.orig	1999-06-26 13:48:39.000000000 +0000
++++ main.c
+@@ -212,21 +212,11 @@ quit(int ignored)
  #ifndef	_putchar
  	extern	int _putchar();
  #endif