* LICENSE=gnu-gpl-v2 (or later)

* add user-destdir installation support
* use usual user/group/permission instead of hard coded one for permissions
* create one more missing required directory

Bump PKGREVISION.

3 files changed, 27 insertions, 13 deletions

diff --git a/games/ivan/Makefile b/games/ivan/Makefile
index 6f14baa3616..18656e44836 100644
--- a/games/ivan/Makefile
+++ b/games/ivan/Makefile
@@ -1,16 +1,18 @@
-# $NetBSD: Makefile,v 1.15 2008/09/25 14:02:09 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2011/03/16 11:40:27 obache Exp $
 #
 
 DISTNAME=		ivan-0.50
-PKGREVISION=		8
+PKGREVISION=		9
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=ivan/}
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://ivan.sourceforge.net/
 COMMENT=		Graphical roguelike featuring deep gameplay
+LICENSE=		gnu-gpl-v2 # or later
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_TOOLS+=		gmake
 GNU_CONFIGURE=		YES
@@ -19,8 +21,10 @@ CONFIGURE_ARGS+=	--localstatedir=${PREFIX}/share
 USE_LANGUAGES=		c c++
 
 REQD_DIRS+=		share/ivan
+OWN_DIRS_PERMS+=	share/ivan/Bones ${GAMES_USER} ${GAMES_GROUP} ${GAMEDIRMODE}
 CONF_FILES_PERMS+=	/dev/null ${PREFIX}/share/ivan/ivan-highscore.scores \
-			${ROOT_USER} games 664
+			${GAMES_USER} ${GAMES_GROUP} ${GAMEDATAMODE}
+SPECIAL_PERMS+=		bin/ivan ${SETGID_GAMES_PERMS}
 
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/games/ivan/distinfo b/games/ivan/distinfo
index ddf8cee21e1..6e627214e4d 100644
--- a/games/ivan/distinfo
+++ b/games/ivan/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.5 2008/07/27 21:44:47 dholland Exp $
+$NetBSD: distinfo,v 1.6 2011/03/16 11:40:27 obache Exp $
 
 SHA1 (ivan-0.50.tar.gz) = e4c5ae2b9bdfd59a0ed3c87a504043df12b0f1a4
 RMD160 (ivan-0.50.tar.gz) = 7e84340cd8fdfbdaaf7fde730fc0a76b137e2e91
 Size (ivan-0.50.tar.gz) = 803651 bytes
 SHA1 (patch-aa) = a52f3945a79e12cc72d30d9609c4bf390809a5bd
 SHA1 (patch-ab) = 63f215564ee0922d1daa5240b5a3b3b4afc5db24
-SHA1 (patch-ac) = 047b81b0253688e4473825a108f4d5c02d95c942
+SHA1 (patch-ac) = 42150fb33cbc0136bd702ab5cb26dcbc9d7c717c
 SHA1 (patch-ad) = 0cf6d0d9dff4482f091bff502b0ebd180734c631
 SHA1 (patch-ae) = 2b55ebd81f5136f5be8081f5dadf953a6370d199
 SHA1 (patch-af) = af3d8e16b1ee3e3e0d5efe2f301b7a5380880b14
diff --git a/games/ivan/patches/patch-ac b/games/ivan/patches/patch-ac
index f3b15f4299c..535e0b0f474 100644
--- a/games/ivan/patches/patch-ac
+++ b/games/ivan/patches/patch-ac
@@ -1,14 +1,24 @@
-$NetBSD: patch-ac,v 1.1 2006/05/19 07:15:24 joerg Exp $
+$NetBSD: patch-ac,v 1.2 2011/03/16 11:40:28 obache Exp $
 
---- Makefile.in.orig	2006-05-15 20:18:43.000000000 +0000
+--- Makefile.in.orig	2004-12-10 21:34:29.000000000 +0000
 +++ Makefile.in
-@@ -339,9 +339,6 @@ maintainer-clean-generic clean mostlycle
+@@ -336,19 +336,6 @@ install uninstall-am uninstall all-redir
+ installdirs mostlyclean-generic distclean-generic clean-generic \
+ maintainer-clean-generic clean mostlyclean distclean maintainer-clean
  
- install-data-local:
- 	-./mkinstalldirs -p $(localstatedir) $(bindir) $(datadir)/ivan/Script/ $(datadir)/ivan/Graphics/ $(localstatedir)/ivan/Bones/
+-
+-install-data-local:
+-	-./mkinstalldirs -p $(localstatedir) $(bindir) $(datadir)/ivan/Script/ $(datadir)/ivan/Graphics/ $(localstatedir)/ivan/Bones/
 -	-touch $(localstatedir)/ivan/ivan-highscore.scores
 -	-chown games.games $(localstatedir)/ivan/ivan-highscore.scores
 -	-chmod 664 $(localstatedir)/ivan/ivan-highscore.scores
- 	-chown -R games.games $(localstatedir)/ivan/Bones/
- 	-chmod -R u=rwx $(localstatedir)/ivan/Bones/
- 	-chmod -R g=rwx $(localstatedir)/ivan/Bones/
+-	-chown -R games.games $(localstatedir)/ivan/Bones/
+-	-chmod -R u=rwx $(localstatedir)/ivan/Bones/
+-	-chmod -R g=rwx $(localstatedir)/ivan/Bones/
+-	-chmod -R o=r $(localstatedir)/ivan/Bones/
+-	-chgrp games $(bindir)/ivan 
+-	-chmod 2111 $(bindir)/ivan
+-
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT: