Updated to version 3.2.0.

Pkgsrc changes:
  - Cleaned up COMMENT: There are no more separate packages for x11 and sdl.
  - INSTALLATION_DIRS should be extended, not set absolutely.
  - Simplified PLIST handling: no more @exec in PLIST, replaced by OWN_DIRS_PERMS.
  - Simplified installation of sounds/graphics/levels etc. All the files are now
    dynamically added to the PLIST, so the static PLIST is really short now.
  - Use GAMEOWN and GAMEGRP as user and group now.
  - No more substitutions in the pre-configure target and no more patch-aa:
    Replaced by overriding GNU make variables with MAKE_FLAGS.
  - Simplified patch-ab, also with MAKE_FLAGS.
  - Changed mode of top-level score directory so that users cannot see
    the score files. This prevents tampering with high scores :).
  - The do-install target uses now INSTALL_GAME to honor SETGIDGAME (from mk.conf).

Relevant changes since version 3.1.2:
=====================================
- finished new native game engine for Emerald Mine (Club) levels
- added all new elements from EMC engine also to R'n'D engine
- added selection between ECS and AGA graphics for EMC levels to setup
- added multi-player support for EMC game engine (with up to four players)
- added player switching (visual and quick) to R'n'D and EM game engine
- added key shortcut settings for switching player focus to setup menu
- added custom element actions for CE change page in level editor
- added "CE value" and "CE score" counters for custom elements
- added cascaded element lists to element list in level editor
- added dynamic element list with all elements used in current level
- added special Supaplex animations for Murphy being bored and sleeping
- added setup option to display element token name in level editor
- added up to five title screens for each level set to show after loading
- added credits pages to the "credits" section that were really missing
- lots of bugfixes and internal engine changes (see ChangeLog file)

5 files changed, 62 insertions, 129 deletions

diff --git a/games/rocksndiamonds/Makefile b/games/rocksndiamonds/Makefile
index 3305ac42afe..7e16dab6324 100644
--- a/games/rocksndiamonds/Makefile
+++ b/games/rocksndiamonds/Makefile
@@ -1,73 +1,79 @@
-# $NetBSD: Makefile,v 1.30 2006/06/12 16:28:10 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2006/07/22 23:16:42 heinz Exp $
 
-DISTNAME=	rocksndiamonds-3.1.2
-PKGREVISION=	2
+DISTNAME=	rocksndiamonds-3.2.0
 CATEGORIES=	games x11
 MASTER_SITES=	http://www.artsoft.org/RELEASES/unix/rocksndiamonds/
 
 MAINTAINER=	heinz@NetBSD.org
 HOMEPAGE=	http://www.artsoft.org/rocksndiamonds/
-COMMENT=	Game like Boulder Dash, Emerald Mine, or Sokoban (X11 build)
+COMMENT=	Game like Boulder Dash, Emerald Mine, or Sokoban
 
 USE_TOOLS+=		gmake
 
-INSTALLATION_DIRS=	${PKGMANDIR}/man6
+INSTALLATION_DIRS+=	${PKGMANDIR}/man6
 
-PLIST_SRC=	${WRKDIR}/PLIST PLIST
-PLIST_SUBST+=	SCORE_PATH=${SCORE_PATH:Q}
-PLIST_SUBST+=	ROCK_INSTALL_DIR="${INSTALL} -d -o ${RND_USER} -g ${RND_GROUP} -m 775"
+PKG_GROUPS+=	${GAMEGRP}
+PKG_USERS+=	${GAMEOWN}:${GAMEGRP}
 
-PKG_GROUPS=	${RND_GROUP}
-PKG_USERS=	${RND_USER}:${RND_GROUP}
+SHARESUBDIR=		share/rocksndiamonds
+SHAREDIR=		${PREFIX}/${SHARESUBDIR}
 
-RND_USER=	games
-RND_GROUP=	games
+SCORE_PATH=	${VARBASE}/games/rocksndiamonds
+
+REQD_DIRS+=		${SHARESUBDIR}
+
+OWN_DIRS_PERMS+=	${SCORE_PATH:Q}
+OWN_DIRS_PERMS+=	${GAMEOWN} ${GAMEGRP} ${GAMEDIRMODE}
+OWN_DIRS_PERMS+=	${SCORE_PATH:Q}/scores
+OWN_DIRS_PERMS+=	${GAMEOWN} ${GAMEGRP} 750
+OWN_DIRS_PERMS+=	${SCORE_PATH:Q}/scores/classic_boulderdash
+OWN_DIRS_PERMS+=	${GAMEOWN} ${GAMEGRP} ${GAMEDIRMODE}
+OWN_DIRS_PERMS+=	${SCORE_PATH:Q}/scores/classic_emerald_mine
+OWN_DIRS_PERMS+=	${GAMEOWN} ${GAMEGRP} ${GAMEDIRMODE}
+OWN_DIRS_PERMS+=	${SCORE_PATH:Q}/scores/classic_sokoban
+OWN_DIRS_PERMS+=	${GAMEOWN} ${GAMEGRP} ${GAMEDIRMODE}
+OWN_DIRS_PERMS+=	${SCORE_PATH:Q}/scores/classic_supaplex
+OWN_DIRS_PERMS+=	${GAMEOWN} ${GAMEGRP} ${GAMEDIRMODE}
+OWN_DIRS_PERMS+=	${SCORE_PATH:Q}/scores/rnd_tutorial_aaron_davidson
+OWN_DIRS_PERMS+=	${GAMEOWN} ${GAMEGRP} ${GAMEDIRMODE}
+OWN_DIRS_PERMS+=	${SCORE_PATH:Q}/scores/rnd_tutorial_niko_boehm
+OWN_DIRS_PERMS+=	${GAMEOWN} ${GAMEGRP} ${GAMEDIRMODE}
+
+PLIST_SRC=	PLIST ${WRKDIR}/PLIST.F ${WRKDIR}/PLIST.D
 
 .if ( ${MACHINE} == "i386" || ${MACHINE} == "prep" || ${MACHINE} == "cats" || \
       ${MACHINE} == "shark" )
-MAKE_ENV+=	HAVE_JOYSTICK=1
+MAKE_FLAGS+=	JOYSTICK=-DHAVE_JOYSTICK
 .endif
 
-.include "options.mk"
-
-SCORE_PATH=	${VARBASE}/games/rocksndiamonds
+MAKE_FLAGS+=	CC=${CC:Q}
+MAKE_FLAGS+=	MAKE=${MAKE_PROGRAM:Q}
+MAKE_FLAGS+=	X11_PATH=${X11BASE:Q}
+MAKE_FLAGS+=	RO_GAME_DIR=${PREFIX:Q}/share/rocksndiamonds
+MAKE_FLAGS+=	RW_GAME_DIR=${SCORE_PATH:Q}
+MAKE_FLAGS+=	X11_INCL=
+MAKE_FLAGS+=	X11_LIBS=-lX11
 
-pre-configure:
-	@${SED} -e "s,@SCORE_PATH@,${SCORE_PATH},g" \
-		${WRKSRC}/Makefile > ${WRKSRC}/Makefile.fixed && \
-	  ${MV} ${WRKSRC}/Makefile.fixed ${WRKSRC}/Makefile
+.include "options.mk"
 
 do-install:
-	${INSTALL_PROGRAM} -o ${RND_USER} -g ${RND_GROUP} -m 2755 \
-		${WRKSRC}/rocksndiamonds ${PREFIX}/bin/
+	${INSTALL_GAME} ${WRKSRC}/rocksndiamonds ${PREFIX}/bin/
 	${INSTALL_MAN} ${WRKSRC}/rocksndiamonds.1 \
 		${PREFIX}/${PKGMANDIR}/man6/rocksndiamonds.6
-	${INSTALL_DATA_DIR} ${PREFIX}/share/rocksndiamonds
-	cd ${WRKSRC} && ${PAX} -rw sounds graphics levels music \
-		${PREFIX}/share/rocksndiamonds/
-	${CHOWN} -R ${RND_USER}:${RND_GROUP} ${PREFIX}/share/rocksndiamonds
-	${CHMOD} -R a-w ${PREFIX}/share/rocksndiamonds
-	${INSTALL_DATA_DIR} ${SCORE_PATH}/scores
-	${CHMOD} 755 ${SCORE_PATH}
-	${CHMOD} 775 ${SCORE_PATH}/scores
-	# extract basenames of level subdirectories, levelinfo.conf is a file
-	LEVELDIRS=`${LS} -d ${WRKSRC}/levels/*/* | \
-		${SED} -e 's@^.*/\([^/]*\)$$@\1@' -e '/levelinfo\.conf/d'` && \
-	  for directory in $${LEVELDIRS}; do \
-	    ${INSTALL_DATA_DIR} ${SCORE_PATH}/scores/$${directory}; \
-	    ${CHMOD} 775 ${SCORE_PATH}/scores/$${directory}; \
-	  done
-	${CHOWN} -R ${RND_USER}:${RND_GROUP} ${SCORE_PATH}
+	${INSTALL_DATA_DIR} ${SHAREDIR}
 	# auto-generated PLIST
-	${RM} -f ${WRKDIR}/PLIST
-.for levdir in Classic_Games Tutorials
-	cd ${PREFIX} && \
-	${FIND} share/rocksndiamonds/levels/${levdir} -type f -print >>${WRKDIR}/PLIST
-.endfor
-.for directory in graphics music sounds
-	cd ${PREFIX} && \
-	${FIND} share/rocksndiamonds/${directory} -type f -print >>${WRKDIR}/PLIST
-.endfor
+	-${RM} -f ${WRKDIR}/PLIST.F ${WRKDIR}/PLIST.D
+	cd ${WRKSRC} &&							\
+	for d in sounds graphics levels music; do 			\
+		${FIND} $${d} -type d -print | { while read subdir; do	\
+			${INSTALL_DATA_DIR}  ${SHAREDIR}/$${subdir};	\
+			${ECHO} "@dirrm ${SHARESUBDIR}/$${subdir}";	\
+		done ; } | ${SORT} -r >> ${WRKDIR}/PLIST.D;		\
+		${FIND} $${d} -type f -print | while read f; do		\
+			${INSTALL_DATA} $${f} ${SHAREDIR}/$${f};	\
+			${ECHO} ${SHARESUBDIR}/$${f} >> ${WRKDIR}/PLIST.F;\
+		done ;							\
+	done
 
 .include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/rocksndiamonds/PLIST b/games/rocksndiamonds/PLIST
index 69a06474527..a9efc517c14 100644
--- a/games/rocksndiamonds/PLIST
+++ b/games/rocksndiamonds/PLIST
@@ -1,30 +1,3 @@
-@comment $NetBSD: PLIST,v 1.8 2005/08/16 15:35:51 adam Exp $
+@comment $NetBSD: PLIST,v 1.9 2006/07/22 23:16:42 heinz Exp $
 bin/rocksndiamonds
 man/man6/rocksndiamonds.6
-@dirrm share/rocksndiamonds/sounds/snd_classic
-@dirrm share/rocksndiamonds/sounds
-@dirrm share/rocksndiamonds/music/mus_classic
-@dirrm share/rocksndiamonds/music
-@dirrm share/rocksndiamonds/levels/Tutorials/rnd_tutorial_niko_boehm/tapes
-@dirrm share/rocksndiamonds/levels/Tutorials/rnd_tutorial_niko_boehm
-@dirrm share/rocksndiamonds/levels/Tutorials/rnd_tutorial_aaron_davidson/tapes
-@dirrm share/rocksndiamonds/levels/Tutorials/rnd_tutorial_aaron_davidson
-@dirrm share/rocksndiamonds/levels/Tutorials
-@dirrm share/rocksndiamonds/levels/Classic_Games/classic_supaplex/music
-@dirrm share/rocksndiamonds/levels/Classic_Games/classic_supaplex
-@dirrm share/rocksndiamonds/levels/Classic_Games/classic_sokoban/tapes
-@dirrm share/rocksndiamonds/levels/Classic_Games/classic_sokoban
-@dirrm share/rocksndiamonds/levels/Classic_Games/classic_emerald_mine
-@dirrm share/rocksndiamonds/levels/Classic_Games/classic_boulderdash
-@dirrm share/rocksndiamonds/levels/Classic_Games
-@dirrm share/rocksndiamonds/levels
-@dirrm share/rocksndiamonds/graphics/gfx_classic
-@dirrm share/rocksndiamonds/graphics
-@dirrm share/rocksndiamonds
-@exec ${ROCK_INSTALL_DIR} ${SCORE_PATH}
-@exec ${ROCK_INSTALL_DIR} ${SCORE_PATH}/scores
-@exec ${ROCK_INSTALL_DIR} ${SCORE_PATH}/scores/classic_boulderdash
-@exec ${ROCK_INSTALL_DIR} ${SCORE_PATH}/scores/classic_emerald_mine
-@exec ${ROCK_INSTALL_DIR} ${SCORE_PATH}/scores/classic_sokoban
-@exec ${ROCK_INSTALL_DIR} ${SCORE_PATH}/scores/classic_supaplex
-@unexec echo Delete ${SCORE_PATH}/ if you do not need your hiscores anymore.
diff --git a/games/rocksndiamonds/distinfo b/games/rocksndiamonds/distinfo
index 9758af6bf0d..3917a16f089 100644
--- a/games/rocksndiamonds/distinfo
+++ b/games/rocksndiamonds/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.19 2006/01/20 22:37:05 adam Exp $
+$NetBSD: distinfo,v 1.20 2006/07/22 23:16:42 heinz Exp $
 
-SHA1 (rocksndiamonds-3.1.2.tar.gz) = 842cb743bfede966deb05e0ec5f39b877b28438f
-RMD160 (rocksndiamonds-3.1.2.tar.gz) = 0b4658ec3c8d345b745c4eb350c4d4253172cce7
-Size (rocksndiamonds-3.1.2.tar.gz) = 3120830 bytes
-SHA1 (patch-aa) = 824bf9ef3ee1335a8a412d4cfd3bbf7ea13d3f46
-SHA1 (patch-ab) = 7bcd534d22c2ffef4ca0f32e772cd108ed18ecf3
+SHA1 (rocksndiamonds-3.2.0.tar.gz) = 76d5f4029bf437d94d56d464f05e4a3e32e1307b
+RMD160 (rocksndiamonds-3.2.0.tar.gz) = 396eed9b9bb264b3fcb128f7fd26003ed57876f6
+Size (rocksndiamonds-3.2.0.tar.gz) = 3215788 bytes
+SHA1 (patch-ab) = 9b7b19fee0b6a1ab5ac17f7ec632de738ec88c04
 SHA1 (patch-ac) = 9cbf5ff897cae129455081c941d7ae355b525d1b
 SHA1 (patch-ag) = c9c500490948a03b6f5e2fa409f52112edbf7e92
 SHA1 (patch-ah) = 584b406eef29b2849f7fc42181a7b9f29e6c9c69
diff --git a/games/rocksndiamonds/patches/patch-aa b/games/rocksndiamonds/patches/patch-aa
deleted file mode 100644
index bff1a841cde..00000000000
--- a/games/rocksndiamonds/patches/patch-aa
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2003/11/19 12:48:47 adam Exp $
-
---- Makefile.orig	2003-11-09 23:35:32.000000000 +0100
-+++ Makefile
-@@ -14,21 +14,23 @@ CC = gcc
- 
- # command name of GNU make on your system
- # (this must be set to "gmake" for some systems)
--MAKE = make
-+#MAKE = make
- 
- # path to X11 on your system
--X11_PATH = /usr/X11R6
-+X11_PATH = ${X11BASE}
- 
- # directory for read-only game data (like graphics, sounds, levels)
- # default is '.' to be able to run program without installation
--# RO_GAME_DIR = /usr/games
-+RO_GAME_DIR = ${PREFIX}/share/rocksndiamonds
- 
- # directory for writable game data (like highscore files)
- # default is '.' to be able to run program without installation
--# RW_GAME_DIR = /var/games
-+RW_GAME_DIR = @SCORE_PATH@
- 
- # uncomment if system has no joystick include file
--# JOYSTICK = -DNO_JOYSTICK
-+ifdef HAVE_JOYSTICK
-+JOYSTICK = -DHAVE_JOYSTICK
-+endif
- 
- # choose if more than one global score file entry for one player is allowed
- # (default: MANY_PER_NAME)
diff --git a/games/rocksndiamonds/patches/patch-ab b/games/rocksndiamonds/patches/patch-ab
index c4c6671544c..4e35ea4ff5b 100644
--- a/games/rocksndiamonds/patches/patch-ab
+++ b/games/rocksndiamonds/patches/patch-ab
@@ -1,20 +1,8 @@
-$NetBSD: patch-ab,v 1.8 2005/08/16 15:35:51 adam Exp $
+$NetBSD: patch-ab,v 1.9 2006/07/22 23:16:42 heinz Exp $
 
---- src/Makefile.orig	2005-08-15 22:09:24.000000000 +0000
+--- src/Makefile.orig	2006-07-16 02:29:15.000000000 +0200
 +++ src/Makefile
-@@ -21,8 +21,9 @@ endif
- ifdef X11_PATH			# path to X11 specified by top level Makefile
- XINC_PATH = $(X11_PATH)/include
- XLIB_PATH = $(X11_PATH)/lib
--X11_INCL = -I$(XINC_PATH)
--X11_LIBS = -L$(XLIB_PATH) -lX11
-+# flags for X11 paths will be supplied by pkgsrc
-+X11_INCL = # empty
-+X11_LIBS = -lX11
- endif
- 
- AR = ar
-@@ -141,8 +142,10 @@ ifdef BUILD_DIST				# distribution build
+@@ -141,8 +141,10 @@ ifdef BUILD_DIST				# distribution build
  OPTIONS = -O3 -Wall
  endif