DESTDIR suport. SETGIDGAME. Bump revision.

5 files changed, 22 insertions, 27 deletions

diff --git a/games/moria/Makefile b/games/moria/Makefile
index 299824ea80c..2fd55540a53 100644
--- a/games/moria/Makefile
+++ b/games/moria/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2007/03/24 19:21:24 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2010/06/25 22:12:31 joerg Exp $
 
 DISTNAME=		um5.5.2
 PKGNAME=		moria-5.5.2
+PKGREVISION=		1
 CATEGORIES=		games
 # The "offical" master site has lost the pub/Games directory.
 #MASTER_SITES=		ftp://ftp.cis.ksu.edu/pub/Games/Moria/source/
@@ -12,20 +13,21 @@ MAINTAINER=		simonb@NetBSD.org
 HOMEPAGE=		http://www-math.bgsu.edu/~grabine/moria.html
 COMMENT=		Rogue-like game with a different sense of scale than Rogue
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=			${WRKDIR}/umoria
 MAKE_FLAGS+=		CURSES=-lncurses
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man6
 
+SETGIDGAME=		yes
+CONF_FILES_PERMS+=	/dev/null /var/games/moria.scores \
+			${GAMES_USER} ${GAMES_GROUP} ${GAMEDATAMODE}
+SPECIAL_PERMS=		bin/moria ${SETGID_GAMES_PERMS}
+
 do-configure:
 	@${RM} -f ${WRKSRC}/*.[ch] ${WRKSRC}/Makefile
 	@cd ${WRKSRC}; ${LN} -s source/* unix/* .
 
-post-install:
-	@if [ ! -f /var/games/moria.scores ]; then \
-		${CP} -p ${PREFIX}/share/games/moria/scores.dist \
-			/var/games/moria.scores ; \
-	fi
-
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/moria/PLIST b/games/moria/PLIST
index a78943119dc..08c1d3900d0 100644
--- a/games/moria/PLIST
+++ b/games/moria/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:56:51 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2010/06/25 22:12:31 joerg Exp $
 bin/moria
 man/man6/moria.6
 share/doc/moria/ERRORS
@@ -18,7 +18,5 @@ share/games/moria/origcmds.hlp
 share/games/moria/owizcmds.hlp
 share/games/moria/roglcmds.hlp
 share/games/moria/rwizcmds.hlp
-share/games/moria/scores.dist
 share/games/moria/version.hlp
 share/games/moria/welcome.hlp
-@exec if [ ! -f /var/games/moria.scores ]; then cp -p %D/share/games/moria/scores.dist /var/games/moria.scores; fi
diff --git a/games/moria/distinfo b/games/moria/distinfo
index 45b0561d365..febb81fcbca 100644
--- a/games/moria/distinfo
+++ b/games/moria/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.9 2007/03/06 23:25:47 rillig Exp $
+$NetBSD: distinfo,v 1.10 2010/06/25 22:12:31 joerg Exp $
 
 SHA1 (um5.5.2.tar.Z) = 69c7a7bf4e2c5be123ee7a82f5ad12ad5d0f5b08
 RMD160 (um5.5.2.tar.Z) = 1556c76f151d7ea29da79071a57398f63d0b138b
 Size (um5.5.2.tar.Z) = 910536 bytes
-SHA1 (patch-aa) = 90dd341c52e322ce7a9cacc706e9f0db49c9253b
+SHA1 (patch-aa) = e2e07df29ffd72809ee36542f62ef1edf501c3cc
 SHA1 (patch-ab) = 21418a69d7a694894dd9408513693f87fff91953
 SHA1 (patch-ac) = ea9e23de0a147f317a579a4a04502cb165b4c4bd
 SHA1 (patch-ad) = f83f4596677b8d37493145f82a4d2d5cb489b53a
@@ -14,5 +14,5 @@ SHA1 (patch-ah) = e5eb295222a007a83600d9ed17ef0a0e0fd24875
 SHA1 (patch-ai) = ab8de35dad1870edb8549966aca60d0f5bdf2187
 SHA1 (patch-aj) = f0ac2b33ce021f3c2757bb37e9a5749842901556
 SHA1 (patch-ak) = 3b39f9bd883cae5cd0a8a2561fcb1bcdbfa0bc1b
-SHA1 (patch-al) = da8992fc3b7a57fdf78d5656a8a8f01b8628c8fd
+SHA1 (patch-al) = 0625fd70eeecaa7e0b5f5874b180244fb1f034c2
 SHA1 (patch-am) = b5d250e9b870e3540c382c7e7c588e1f1c5a4910
diff --git a/games/moria/patches/patch-aa b/games/moria/patches/patch-aa
index 2efd5d16529..23437830c81 100644
--- a/games/moria/patches/patch-aa
+++ b/games/moria/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2002/08/21 06:25:11 simonb Exp $
+$NetBSD: patch-aa,v 1.3 2010/06/25 22:12:31 joerg Exp $
 
 --- unix/Makefile.orig	Fri Jul 22 08:37:08 1994
 +++ unix/Makefile
@@ -35,7 +35,7 @@ $NetBSD: patch-aa,v 1.2 2002/08/21 06:25:11 simonb Exp $
  moria : $(OBJS)
  	$(CC) -o moria $(CFLAGS) $(OBJS) $(CURSES) $(LFLAGS)
  
-@@ -57,22 +62,21 @@
+@@ -57,22 +62,16 @@
  TAGS : $(SRCS)
  	ctags -x $(SRCS) > TAGS
  
@@ -59,15 +59,10 @@ $NetBSD: patch-aa,v 1.2 2002/08/21 06:25:11 simonb Exp $
 -	(cd $(LIBDIR); chgrp $(GROUP) $(LIBFILES) scores)
 -# If you are short on disk space, or aren't interested in debugging moria.
 -#	strip $(BINDIR)/moria
-+	${BSD_INSTALL_PROGRAM} moria ${BINDIR}
-+	${CHGRP} ${GROUP} ${BINDIR}/moria
-+	${CHMOD} g+s ${BINDIR}/moria
-+	${BSD_INSTALL_MAN} doc/moria.6 ${MANDIR}
-+	${BSD_INSTALL_DATA_DIR} ${LIBDIR}
-+	( cd files; ${BSD_INSTALL_DATA} ${LIBFILES} ${LIBDIR} )
-+	${TOUCH} ${LIBDIR}/scores.dist
-+	${CHMOD} 664 ${LIBDIR}/scores.dist
-+	${CHGRP} ${GROUP} ${LIBDIR}/scores.dist
++	${BSD_INSTALL_PROGRAM} moria ${DESTDIR}${BINDIR}
++	${BSD_INSTALL_MAN} doc/moria.6 ${DESTDIR}${MANDIR}
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${LIBDIR}
++	( cd files; ${BSD_INSTALL_DATA} ${LIBFILES} ${DESTDIR}${LIBDIR} )
 +	( cd doc ; ${MAKE} install )
  
  clean:
diff --git a/games/moria/patches/patch-al b/games/moria/patches/patch-al
index 6d44e5d9980..01906de496c 100644
--- a/games/moria/patches/patch-al
+++ b/games/moria/patches/patch-al
@@ -1,4 +1,4 @@
-$NetBSD: patch-al,v 1.1 2002/09/21 04:24:04 simonb Exp $
+$NetBSD: patch-al,v 1.2 2010/06/25 22:12:31 joerg Exp $
 
 --- /dev/null	Sat Aug 10 17:45:46 2002
 +++ doc/Makefile	Sat Aug 10 17:48:23 2002
@@ -16,5 +16,5 @@ $NetBSD: patch-al,v 1.1 2002/09/21 04:24:04 simonb Exp $
 +	cat moria1.txt moria2.txt > moria.txt
 +
 +install: moria.ms moria.txt
-+	${BSD_INSTALL_MAN_DIR} ${DOCDIR}
-+	${BSD_INSTALL_MAN} ${FILES} ${DOCDIR}
++	${BSD_INSTALL_MAN_DIR} ${DESTDIR}${DOCDIR}
++	${BSD_INSTALL_MAN} ${FILES} ${DESTDIR}${DOCDIR}