Changes 3.0.4:

- fixed bug in multiple config pages code that caused crash
- fixed bug in custom definition of crumbled element graphics

4 files changed, 75 insertions, 74 deletions

diff --git a/games/rocksndiamonds/DESCR b/games/rocksndiamonds/DESCR
index 26c60071c5b..44f328bdc30 100644
--- a/games/rocksndiamonds/DESCR
+++ b/games/rocksndiamonds/DESCR
@@ -1,10 +1,6 @@
-Rocks'n'Diamonds:
-
-Arcade style game for color X11 with stereo sounds.
-
-A game like "Boulderdash" (C=64) or "Emerald Mine" (Amiga).
-Included are many levels known from the games "Boulderdash",
-"Emerald Mine", "Sokoban", "Supaplex" and "DX-Boulderdash"
+A game like "Boulder Dash" (C=64) or "Emerald Mine" (Amiga).
+Included are many levels known from the games "Boulder Dash",
+"Emerald Mine", "Sokoban", "Supaplex" and "DX-Boulder Dash"
 and a lot of new levels designed by other players.
 
 Some features:
diff --git a/games/rocksndiamonds/Makefile b/games/rocksndiamonds/Makefile
index b7b6a025d30..a7518704722 100644
--- a/games/rocksndiamonds/Makefile
+++ b/games/rocksndiamonds/Makefile
@@ -1,68 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2003/09/09 15:05:30 adam Exp $
+# $NetBSD: Makefile,v 1.16 2003/09/15 15:20:44 adam Exp $
 #
 
-DISTNAME=	rocksndiamonds-3.0.3
-CATEGORIES=	games x11
-MASTER_SITES=	http://www.artsoft.org/RELEASES/unix/rocksndiamonds/
+.include "Makefile.common"
 
-MAINTAINER=	heinz-rnd@NetBSD.org
-HOMEPAGE=	http://www.artsoft.org/rocksndiamonds/
-COMMENT=	Game like Boulderdash, Emerald Mine, or Sokoban
+COMMENT=	Game like Boulder Dash, Emerald Mine, or Sokoban (X11 build)
 
-CONFLICTS?=	rocksndiamonds-sdl-[1-9]*
-
-USE_GMAKE=	YES
-USE_BUILDLINK2=	YES
-USE_X11=	YES
-ALL_TARGET?=	x11
-# leave the relative path for rocksndiamonds-sdl
-PLIST_SRC=	${WRKDIR}/PLIST ../rocksndiamonds/PLIST
-PLIST_SUBST+=	SCORE_PATH=${SCORE_PATH}
-PLIST_SUBST+=	ROCK_INSTALL_DIR="${INSTALL} -d -o games -g games -m 775"
-
-.if ( ${MACHINE} == "i386" || ${MACHINE} == "prep" || ${MACHINE} == "cats" || \
-      ${MACHINE} == "shark" )
-MAKE_ENV+=HAVE_JOYSTICK=1
-.endif
-
-SCORE_PATH=		/var/games/rocksndiamonds
-
-pre-configure:
-	@${SED} -e "s,@SCORE_PATH@,${SCORE_PATH},g" \
-	        ${WRKSRC}/Makefile > ${WRKSRC}/Makefile.fixed && \
-	  ${MV} ${WRKSRC}/Makefile.fixed ${WRKSRC}/Makefile
-
-do-install:
-	${INSTALL_PROGRAM} -o games -g games -m 2755 \
-		${WRKSRC}/rocksndiamonds ${PREFIX}/bin/
-	${INSTALL_MAN} ${WRKSRC}/rocksndiamonds.1 ${PREFIX}/man/man1/
-	${INSTALL_DATA_DIR} ${PREFIX}/share/rocksndiamonds
-	cd ${WRKSRC} && ${PAX} -rw sounds graphics levels music \
-		${PREFIX}/share/rocksndiamonds/
-	${CHOWN} -R games:games ${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 games:games ${SCORE_PATH}
-	# auto-generated PLIST
-	${RM} -f ${WRKDIR}/PLIST
-.for levdir in Boulderdash Classic_Games Contributions_1995-2000 \
-	Contributions_2001 Contributions_2002 Contributions_2003 Examples \
-	Tutorials
-	cd ${PREFIX} && \
-	${FIND} share/rocksndiamonds/levels/${levdir} -type f >>${WRKDIR}/PLIST
-.endfor
-.for directory in graphics music sounds
-	cd ${PREFIX} && \
-	${FIND} share/rocksndiamonds/${directory} -type f >>${WRKDIR}/PLIST
-.endfor
-
-.include "../../mk/bsd.pkg.mk"
+ALL_TARGET=	x11
+CONFLICTS=	rocksndiamonds-sdl-[1-9]*
diff --git a/games/rocksndiamonds/Makefile.common b/games/rocksndiamonds/Makefile.common
new file mode 100644
index 00000000000..406a1adc5c0
--- /dev/null
+++ b/games/rocksndiamonds/Makefile.common
@@ -0,0 +1,64 @@
+# $NetBSD: Makefile.common,v 1.1 2003/09/15 15:20:44 adam Exp $
+#
+
+DISTNAME=	rocksndiamonds-3.0.4
+CATEGORIES=	games x11
+MASTER_SITES=	http://www.artsoft.org/RELEASES/unix/rocksndiamonds/
+
+MAINTAINER=	heinz-rnd@NetBSD.org
+HOMEPAGE=	http://www.artsoft.org/rocksndiamonds/
+
+USE_BUILDLINK2=	YES
+USE_GMAKE=	YES
+USE_X11=	YES
+
+PLIST_SRC=	${WRKDIR}/PLIST ../rocksndiamonds/PLIST
+PLIST_SUBST+=	SCORE_PATH=${SCORE_PATH}
+PLIST_SUBST+=	ROCK_INSTALL_DIR="${INSTALL} -d -o games -g games -m 775"
+
+.if ( ${MACHINE} == "i386" || ${MACHINE} == "prep" || ${MACHINE} == "cats" || \
+      ${MACHINE} == "shark" )
+MAKE_ENV+=HAVE_JOYSTICK=1
+.endif
+
+SCORE_PATH=		/var/games/rocksndiamonds
+
+pre-configure:
+	@${SED} -e "s,@SCORE_PATH@,${SCORE_PATH},g" \
+	        ${WRKSRC}/Makefile > ${WRKSRC}/Makefile.fixed && \
+	  ${MV} ${WRKSRC}/Makefile.fixed ${WRKSRC}/Makefile
+
+do-install:
+	${INSTALL_PROGRAM} -o games -g games -m 2755 \
+		${WRKSRC}/rocksndiamonds ${PREFIX}/bin/
+	${INSTALL_MAN} ${WRKSRC}/rocksndiamonds.1 ${PREFIX}/man/man1/
+	${INSTALL_DATA_DIR} ${PREFIX}/share/rocksndiamonds
+	cd ${WRKSRC} && ${PAX} -rw sounds graphics levels music \
+		${PREFIX}/share/rocksndiamonds/
+	${CHOWN} -R games:games ${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 games:games ${SCORE_PATH}
+	# auto-generated PLIST
+	${RM} -f ${WRKDIR}/PLIST
+.for levdir in Boulderdash Classic_Games Contributions_1995-2000 \
+	Contributions_2001 Contributions_2002 Contributions_2003 Examples \
+	Tutorials
+	cd ${PREFIX} && \
+	${FIND} share/rocksndiamonds/levels/${levdir} -type f >>${WRKDIR}/PLIST
+.endfor
+.for directory in graphics music sounds
+	cd ${PREFIX} && \
+	${FIND} share/rocksndiamonds/${directory} -type f >>${WRKDIR}/PLIST
+.endfor
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/games/rocksndiamonds/distinfo b/games/rocksndiamonds/distinfo
index 092456d9531..d159a85797c 100644
--- a/games/rocksndiamonds/distinfo
+++ b/games/rocksndiamonds/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.10 2003/09/09 15:05:31 adam Exp $
+$NetBSD: distinfo,v 1.11 2003/09/15 15:20:45 adam Exp $
 
-SHA1 (rocksndiamonds-3.0.3.tar.gz) = a98366902933bba6f97feae88adc7676222f0f10
-Size (rocksndiamonds-3.0.3.tar.gz) = 6828235 bytes
+SHA1 (rocksndiamonds-3.0.4.tar.gz) = 31048e31db956085c86a1e339e526bf0173ed236
+Size (rocksndiamonds-3.0.4.tar.gz) = 6827364 bytes
 SHA1 (patch-aa) = 5e85dc67f26a2f461f4281f539db44164b9ad34a
 SHA1 (patch-ab) = 565c2fc72b5d9144a8c453745021c2220d23d729
 SHA1 (patch-ag) = 8a80c7d96e508b66ec2ff998f65cbf1b4db45815