- Update to 20131106

- Change maintainer email to @FreeBSD.org
- Add more levels
- Change pkg-message

Approved by:	pawel / wg (mentors, implicit)

3 files changed, 77 insertions, 60 deletions

diff --git a/games/rocksndiamonds-data/Makefile b/games/rocksndiamonds-data/Makefile
index dabdd36426fa..b3815205afe3 100644
--- a/games/rocksndiamonds-data/Makefile
+++ b/games/rocksndiamonds-data/Makefile
@@ -2,26 +2,28 @@
 # $FreeBSD$
 
 PORTNAME=	rocksndiamonds-data
-PORTVERSION=	20130322
+PORTVERSION=	20131106
 CATEGORIES=	games
-MASTER_SITES+=	http://www.artsoft.org/RELEASES/rocksndiamonds/levels/:levels \
+MASTER_SITES=	http://www.artsoft.org/RELEASES/rocksndiamonds/levels/:levels \
 		http://www.artsoft.org/RELEASES/unix/rocksndiamonds/levels/:unix_levels \
 		http://www.bd-fans.com/Files/RnD/Levels/
-DISTFILES=	ZeldaII-1.0.0.zip:levels \
-		Zelda-1.0.0.zip:levels \
+DISTFILES=	BD2K3-1.0.0.zip:levels \
+		Boulder_Dash_Dream-1.0.0.zip:levels \
 		Emerald_Mine_Club-2.1.1.7z:levels \
 		Snake_Bite-1.0.0.zip:levels \
-		BD2K3-1.0.0.zip:levels \
+		Zelda-1.0.0.zip:levels \
+		ZeldaII-1.0.0.zip:levels \
 		rockslevels-sp-1.0.tar.gz:unix_levels \
 		rockslevels-dx-1.0.tar.gz:unix_levels \
-		Boulder_Dash_Dream-1.0.0.zip:levels \
 		${LEVELS_BD_FANS:S/$/.zip/} \
-		Tutorial_Alpha.zip \
-		Puzzles_v1.8.zip
+		Alans_Random_Levels.zip \
+		Gavin_Davidson_2006.zip \
+		Puzzles_v1.8.zip \
+		Veysi_Orak_2006.zip
 DIST_SUBDIR=	rocksndiamonds
 EXTRACT_ONLY=	#empty
 
-MAINTAINER=	nemysis@gmx.ch
+MAINTAINER=	nemysis@FreeBSD.org
 COMMENT=	Additional Player Levels for Rocks'n'Diamonds and R'n'D jue
 
 EXTRACT_DEPENDS+=${UNZIP_CMD}:${PORTSDIR}/archivers/unzip \
@@ -32,18 +34,19 @@ NO_WRKSUBDIR=	yes
 
 SUB_FILES=	pkg-message pkg-deinstall
 
-LEVELS_ARTSOFT=	zelda zelda2 Emerald_Mine_Club Snake_Bite BD2K3 \
-		DX_Boulderdash Supaplex Boulder_Dash_Dream
-
-LEVELS_BD_FANS=	42_Steps Alans_Random_Levels Alexanders_Levels Arcade_Levels \
-		Be_a_bug Contest_Levels Danilo_Parantar_Serrano Danilo_Parantar_Serrano_2 \
-		Hard_Skills Haspeton  Learning_Maths Little_Games \
-		Magic_CEs Manuel Manuels_Sokoban_Levels Master-Rocks Memory \
-		Mini_Levels_Ryan Missions Mixed_Levels Mixed_Levels_2 MultiRandomLevel \
-		My_Levels_of_Fun Negundo_World_2 Negundo_World_3 P98_Level_Pack_1 \
-		Pacman Random_Games Rocks_n_Diamonds_Fun Ryans_Random_Levels Slippery_Ground \
+LEVELS_ARTSOFT=	BD2K3 Boulder_Dash_Dream DX_Boulderdash Emerald_Mine_Club \
+		Snake_Bite Supaplex zelda zelda2
+
+LEVELS_BD_FANS=	42_Steps Alexanders_Levels Arcade_Levels Be_a_bug \
+		Contest_Levels Danilo_Parantar_Serrano Danilo_Parantar_Serrano_2 \
+		Earth_Shaker_Collection Glasses Hard_Skills Haspeton \
+		Learning_Maths Little_Games Magic_CEs Manuel Manuels_Sokoban_Levels \
+		Master-Rocks Memory Mini_Levels_Ryan Missions Mixed_Levels \
+		Mixed_Levels_2 MultiRandomLevel My_Levels_of_Fun Negundo_World_2 \
+		Negundo_World_3 P98_Level_Pack_1 Pacman Random_Games \
+		Rocks_n_Diamonds_Fun Ryans_Random_Levels Slippery_Ground \
 		Space_Invaders Space_Invaders_2 Springlis_Levels Stinky Super_BD-Rock \
-		Super_Comic_Levels Venatir Veysi_Orak_2006 Warparound_Murphy
+		Super_Comic_Levels Venatir Warparound_Murphy Time_Gate_Rush
 
 OPTIONS_SINGLE=	SYMLINK
 OPTIONS_SINGLE_SYMLINK=	RnD RnD_jue
@@ -72,62 +75,56 @@ DATADIR1=	${PREFIX}/share/rocksndiamonds
 
 post-extract-script:
 	${MKDIR} ${WRKDIR}/${PORTNAME}
-	7z x ${_DISTDIR}/Emerald_Mine_Club-2.1.1.7z -o${WRKDIR}/${PORTNAME}
-.for l in ZeldaII-1.0.0.zip Zelda-1.0.0.zip Snake_Bite-1.0.0.zip BD2K3-1.0.0.zip \
+	7z x ${_DISTDIR}/Emerald_Mine_Club-2.1.1.7z -o${WRKDIR}/${PORTNAME}/levels
+
+.for l in BD2K3-1.0.0.zip Snake_Bite-1.0.0.zip Zelda-1.0.0.zip ZeldaII-1.0.0.zip \
 		Boulder_Dash_Dream-1.0.0.zip
 	@${UNZIP_CMD} -qo -d ${WRKDIR}/${PORTNAME} ${_DISTDIR}/${l}
 .endfor
 
-.for l in rockslevels-sp-1.0.tar.gz rockslevels-dx-1.0.tar.gz
+.for l in rockslevels-dx-1.0.tar.gz rockslevels-sp-1.0.tar.gz
 	@${TAR} xfjp ${_DISTDIR}/${l} -C ${WRKDIR}/${PORTNAME}
 .endfor
 	@(cd ${WRKDIR}/${PORTNAME}/levels && ${MV} * .. && cd .. && ${RMDIR} levels)
+
 .for l in DX_Boulderdash Supaplex
 	@${FIND} ${WRKDIR}/${PORTNAME}/${l} -name '*.level' | ${XARGS} ${CHMOD} 644
 .endfor
 
-.for l in ${LEVELS_BD_FANS:S/$/.zip/} Puzzles_v1.8.zip
+.for l in ${LEVELS_BD_FANS:S/$/.zip/} Alans_Random_Levels.zip Gavin_Davidson_2006.zip Puzzles_v1.8.zip Veysi_Orak_2006.zip
 	@${UNZIP_CMD} -qo -d ${WRKDIR}/${PORTNAME} ${_DISTDIR}/${l}
 .endfor
-	@${UNZIP_CMD} -qo -d ${WRKDIR}/${PORTNAME}/Tutorials ${_DISTDIR}/Tutorial_Alpha.zip
-		@(cd ${WRKDIR}/${PORTNAME}/Tutorials && ${MV} "Tutorial Alpha" rnd_tutorial_alpha)
+
 	@(cd ${WRKDIR}/${PORTNAME} && ${MV} "Alan's_Random_Levels" Alans_Random_Levels)
+	@(cd ${WRKDIR}/${PORTNAME} && ${MV} "Gavin Davidson 2006" Gavin_Davidson_2006)
 	@(cd ${WRKDIR}/${PORTNAME} && ${MV} "Veysi Orak 2006" Veysi_Orak_2006)
-	@${RM} -f ${WRKDIR}/${PORTNAME}/Readme.txt
+	@(cd ${WRKDIR}/${PORTNAME} && ${RM} -f Readme.txt levelinfo.conf)
 
 do-install:
 	@(cd ${WRKDIR}/${PORTNAME} && ${COPYTREE_SHARE} . ${DATADIR}/levels)
 
-post-install:
-# Dynamically generate part of the PLIST, because the Levels are large
-.for l in ${LEVELS_ARTSOFT}
-	@${FIND} ${DATADIR}/levels/${l}/ ! -type d | ${SED} 's|^${PREFIX}/||' >> ${TMPPLIST}
-	@${FIND} -ds ${DATADIR}/levels/${l}/ -type d | \
-		${SED} -E -e 's,(.*),@unexec ${RMDIR} "\1" 2>/dev/null || true,' >> ${TMPPLIST}
-.endfor
-
-.for l in ${LEVELS_BD_FANS} Puzzles
+# Dynamically generate the PLIST, because the Levels are large
+.for l in ${LEVELS_ARTSOFT} ${LEVELS_BD_FANS} Alans_Random_Levels Gavin_Davidson_2006 Puzzles Veysi_Orak_2006
 	@${FIND} ${DATADIR}/levels/${l}/ ! -type d | ${SED} 's|^${PREFIX}/||' >> ${TMPPLIST}
-	@${FIND} -ds ${DATADIR}/levels/${l}/ -type d | \
+	@${FIND} -ds ${DATADIR}/levels/${l} -type d | \
 		${SED} -E -e 's,(.*),@unexec ${RMDIR} "\1" 2>/dev/null || true,' >> ${TMPPLIST}
 .endfor
-	@${FIND} ${DATADIR}/levels/Tutorials/rnd_tutorial_alpha/ ! -type d | ${SED} 's|^${PREFIX}/||' >> ${TMPPLIST}
-	@${FIND} -ds ${DATADIR}/levels/Tutorials/rnd_tutorial_alpha/ -type d | \
+	@${FIND} -ds ${DATADIR} -type d -depth 0 | \
 		${SED} -E -e 's,(.*),@unexec ${RMDIR} "\1" 2>/dev/null || true,' >> ${TMPPLIST}
 
 # Symlink Levels which can use Rocks'n'Diamonds and R'n'D jue
 .if exists(${PREFIX}/share/rocksndiamonds) && ${PORT_OPTIONS:MRnD_jue}
-.for l in ${LEVELS_ARTSOFT} ${LEVELS_BD_FANS} Puzzles
-		@${LN} -sf ${DATADIR}/levels/${l} ${PREFIX}/share/rocksndiamonds/levels
+.for l in ${LEVELS_ARTSOFT} ${LEVELS_BD_FANS} Alans_Random_Levels Gavin_Davidson_2006 Puzzles Veysi_Orak_2006
+		@${LN} -sf ${DATADIR}/levels/${l} \
+			${DATADIR1}/levels/
 .endfor
-		@${LN} -sf ${DATADIR}/levels/Tutorials/rnd_tutorial_alpha ${PREFIX}/share/rocksndiamonds/levels/Tutorials
 .endif
 
 .if exists(${PREFIX}/share/rnd_jue) && ${PORT_OPTIONS:MRnD}
-.for l in ${LEVELS_ARTSOFT} ${LEVELS_BD_FANS} Puzzles
-		@${LN} -sf ${DATADIR}/levels/${l} ${PREFIX}/share/rnd_jue/levels
+.for l in ${LEVELS_ARTSOFT} ${LEVELS_BD_FANS} Alans_Random_Levels Gavin_Davidson_2006 Puzzles Veysi_Orak_2006
+		@${LN} -sf ${DATADIR}/levels/${l} \
+			${DATADIR1}/levels/
 .endfor
-		@${LN} -sf ${DATADIR}/levels/Tutorials/rnd_tutorial_alpha ${PREFIX}/share/rnd_jue/levels/Tutorials
 .endif
 
 	@${ECHO_CMD}
diff --git a/games/rocksndiamonds-data/distinfo b/games/rocksndiamonds-data/distinfo
index c096f9443b2a..decfc5bc1d73 100644
--- a/games/rocksndiamonds-data/distinfo
+++ b/games/rocksndiamonds-data/distinfo
@@ -1,23 +1,21 @@
-SHA256 (rocksndiamonds/ZeldaII-1.0.0.zip) = bec04b0448f18f1b796972cccef736ad250b782d08fad35d1387e5b9a05d3e32
-SIZE (rocksndiamonds/ZeldaII-1.0.0.zip) = 11542241
-SHA256 (rocksndiamonds/Zelda-1.0.0.zip) = 6c50778224d76a0c708eddcb2a505c5a38cc57092f05bee9c4d58e2bb519a5e1
-SIZE (rocksndiamonds/Zelda-1.0.0.zip) = 2175860
+SHA256 (rocksndiamonds/BD2K3-1.0.0.zip) = 5fc5130c859e69d6907bff87e01ff2296d59f7376202a8aacc03e55f359fb351
+SIZE (rocksndiamonds/BD2K3-1.0.0.zip) = 4715324
+SHA256 (rocksndiamonds/Boulder_Dash_Dream-1.0.0.zip) = 6f9dc48023830fbdc318d8f18013b5a7e84ab3c815ba566a4a2c46faeb65c969
+SIZE (rocksndiamonds/Boulder_Dash_Dream-1.0.0.zip) = 10923437
 SHA256 (rocksndiamonds/Emerald_Mine_Club-2.1.1.7z) = a9d69fe3bfb46ff5525e713dadadfb04022b18ab76d0a0f6628e469468ca9841
 SIZE (rocksndiamonds/Emerald_Mine_Club-2.1.1.7z) = 20992125
 SHA256 (rocksndiamonds/Snake_Bite-1.0.0.zip) = 6f6b573d89588f56cb3b326f3a42fb57277307bd709713dbef329885ac4d006d
 SIZE (rocksndiamonds/Snake_Bite-1.0.0.zip) = 6506066
-SHA256 (rocksndiamonds/BD2K3-1.0.0.zip) = 5fc5130c859e69d6907bff87e01ff2296d59f7376202a8aacc03e55f359fb351
-SIZE (rocksndiamonds/BD2K3-1.0.0.zip) = 4715324
+SHA256 (rocksndiamonds/Zelda-1.0.0.zip) = 6c50778224d76a0c708eddcb2a505c5a38cc57092f05bee9c4d58e2bb519a5e1
+SIZE (rocksndiamonds/Zelda-1.0.0.zip) = 2175860
+SHA256 (rocksndiamonds/ZeldaII-1.0.0.zip) = bec04b0448f18f1b796972cccef736ad250b782d08fad35d1387e5b9a05d3e32
+SIZE (rocksndiamonds/ZeldaII-1.0.0.zip) = 11542241
 SHA256 (rocksndiamonds/rockslevels-sp-1.0.tar.gz) = 770d75a5926bb924c6787a6f95ee9f7af743b629ea14005ab0375b57eb488f25
 SIZE (rocksndiamonds/rockslevels-sp-1.0.tar.gz) = 373564
 SHA256 (rocksndiamonds/rockslevels-dx-1.0.tar.gz) = 23f1710710eef1dcd1c490670de16d2d58dc98f3fdd9a2df186bdca590e57579
 SIZE (rocksndiamonds/rockslevels-dx-1.0.tar.gz) = 211151
-SHA256 (rocksndiamonds/Boulder_Dash_Dream-1.0.0.zip) = 6f9dc48023830fbdc318d8f18013b5a7e84ab3c815ba566a4a2c46faeb65c969
-SIZE (rocksndiamonds/Boulder_Dash_Dream-1.0.0.zip) = 10923437
 SHA256 (rocksndiamonds/42_Steps.zip) = b0966ef2e10ed3d92440697ef69f7d8d4f19f03f1ba12cd06289c48c7055f7bf
 SIZE (rocksndiamonds/42_Steps.zip) = 11390
-SHA256 (rocksndiamonds/Alans_Random_Levels.zip) = 1842f94b0085d4e0b20beb043ce58950c504f46a9b6b76076b1ad86cd4938a96
-SIZE (rocksndiamonds/Alans_Random_Levels.zip) = 23430
 SHA256 (rocksndiamonds/Alexanders_Levels.zip) = 80e0afd45b5ff639c5119abb507cf1078f156b1749ce87e4a2aac078cfccdf82
 SIZE (rocksndiamonds/Alexanders_Levels.zip) = 3417
 SHA256 (rocksndiamonds/Arcade_Levels.zip) = dc3a2c99a92b33d4400b5dbafe3fccebec04ecd6fa6f8b798add35e982199811
@@ -30,6 +28,10 @@ SHA256 (rocksndiamonds/Danilo_Parantar_Serrano.zip) = e542e0e96b8f5a2c8684de186b
 SIZE (rocksndiamonds/Danilo_Parantar_Serrano.zip) = 11167
 SHA256 (rocksndiamonds/Danilo_Parantar_Serrano_2.zip) = 8a5edf23c7372d4f0a8b3b9839e784a48fafc9640b7609208835c722eafaa241
 SIZE (rocksndiamonds/Danilo_Parantar_Serrano_2.zip) = 10235
+SHA256 (rocksndiamonds/Earth_Shaker_Collection.zip) = df9fdca68ebad55186cdce79cbad7c9ecceadf8b740771f3f39071c9ea44ed4d
+SIZE (rocksndiamonds/Earth_Shaker_Collection.zip) = 1258188
+SHA256 (rocksndiamonds/Glasses.zip) = 4409de550c9db212e9c6f21d2c6316754c321d0b7a9d93242727e8ec66c3e6d2
+SIZE (rocksndiamonds/Glasses.zip) = 1131107
 SHA256 (rocksndiamonds/Hard_Skills.zip) = 75ec6c337c1f20965919e2a83c47050590a2bd891381d359cc09b087e1c15003
 SIZE (rocksndiamonds/Hard_Skills.zip) = 24312
 SHA256 (rocksndiamonds/Haspeton.zip) = 040ff43ea350db83cbf5d8fb4dea47aea9457f07265a21adf19c474e217000b0
@@ -90,11 +92,15 @@ SHA256 (rocksndiamonds/Super_Comic_Levels.zip) = 14ece96546fdd339e18668199467778
 SIZE (rocksndiamonds/Super_Comic_Levels.zip) = 248862
 SHA256 (rocksndiamonds/Venatir.zip) = 53316ca5bbed11f43521cedb1e639fae5bbe6cb4d5345ff729ba47e72809fcfe
 SIZE (rocksndiamonds/Venatir.zip) = 7371
-SHA256 (rocksndiamonds/Veysi_Orak_2006.zip) = 901fd166cc9c9935f9c9b0638d77cb5bae5756553ac50c633242a5b14f48c60d
-SIZE (rocksndiamonds/Veysi_Orak_2006.zip) = 52817
 SHA256 (rocksndiamonds/Warparound_Murphy.zip) = bb3e01566f08b92d59aff821057d8f78b3fd96ae59dbb4eb6e239f6ac2da0535
 SIZE (rocksndiamonds/Warparound_Murphy.zip) = 4070
-SHA256 (rocksndiamonds/Tutorial_Alpha.zip) = 3e8ac984b7723290939281ad3fdaa1b10e9d1da6bb5439f302a8b755742d113e
-SIZE (rocksndiamonds/Tutorial_Alpha.zip) = 5931
+SHA256 (rocksndiamonds/Time_Gate_Rush.zip) = 38c2695f87ac59ac0401261116249dd800042d5532c7f26ee1c25f32d91d6abf
+SIZE (rocksndiamonds/Time_Gate_Rush.zip) = 1853
+SHA256 (rocksndiamonds/Alans_Random_Levels.zip) = 1842f94b0085d4e0b20beb043ce58950c504f46a9b6b76076b1ad86cd4938a96
+SIZE (rocksndiamonds/Alans_Random_Levels.zip) = 23430
+SHA256 (rocksndiamonds/Gavin_Davidson_2006.zip) = 332c02f48512996f5c5b33dae44ff7b669a138407366bad2f59972228e845195
+SIZE (rocksndiamonds/Gavin_Davidson_2006.zip) = 1253078
 SHA256 (rocksndiamonds/Puzzles_v1.8.zip) = 6cde0cac0a13b174c21d4602ee20c6316d31dfd24d09356fa7c6858d62297a37
 SIZE (rocksndiamonds/Puzzles_v1.8.zip) = 12286
+SHA256 (rocksndiamonds/Veysi_Orak_2006.zip) = 901fd166cc9c9935f9c9b0638d77cb5bae5756553ac50c633242a5b14f48c60d
+SIZE (rocksndiamonds/Veysi_Orak_2006.zip) = 52817
diff --git a/games/rocksndiamonds-data/files/pkg-message.in b/games/rocksndiamonds-data/files/pkg-message.in
index 2906efeee91a..0a1d532ad8c4 100644
--- a/games/rocksndiamonds-data/files/pkg-message.in
+++ b/games/rocksndiamonds-data/files/pkg-message.in
@@ -4,10 +4,12 @@ Rocks'n'Diamonds data has been installed.
 
 These levels can use Rocks'n'Diamonds and R'n'D jue.
 
-In addition, you can search for additional extra Levels here:
+In addition, you can search for extra Levels here:
 
     http://www.bd-fans.com/RnD.html
 
+    http://www.artsoft.org/forum/
+
 and other Sites and put it in:
 
     ~/.rocksndiamonds/levels/yours_username
@@ -19,4 +21,16 @@ You could manually change Permissions these Levels with:
     chmod 444 ~/.rocksndiamonds/levels
     chmod 444 ~/.rnd_jue/levels
 
+
+After deinstalling the main Port, some files may stay in DATADIR,
+please check with
+
+    ls -l %%PREFIX%%/share/rocksndiamonds
+    ls -l %%PREFIX%%/share/rnd_jue
+
+If you wish can delete them with
+
+    /bin/rm -fr %%PREFIX%%/share/rocksndiamonds
+    /bin/rm -fr %%PREFIX%%/share/rnd_jue
+
 ===============================================================================