games/rocksndiamonds-data: Remove nop options

The symlinks are not staged and never packaged.

- Fix it to always install the symlinks instead
- Remove bad advice from pkg-message
- Remove useless pkg-deinstall script
- Clean up cruft in extract phase

games/rocksndiamonds-data/Makefile

@@ -3,7 +3,7 @@
 
 PORTNAME=	rocksndiamonds-data
 PORTVERSION=	20131106
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://www.artsoft.org/RELEASES/rocksndiamonds/levels/:levels \
 		http://www.artsoft.org/RELEASES/unix/rocksndiamonds/levels/:unix_levels \
@@ -22,20 +22,14 @@ DISTFILES=	BD2K3-1.0.0.zip:levels \
 		Puzzles_v1.8.zip \
 		Veysi_Orak_2006.zip
 DIST_SUBDIR=	rocksndiamonds
-EXTRACT_ONLY=	#empty
-EXTRACT_ONLY_7z=Emerald_Mine_Club-2.1.1.7z
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Additional Player Levels for Rocks'n'Diamonds and R'n'D jue
 
-EXTRACT_DEPENDS+=${UNZIP_CMD}:archivers/unzip
+DATADIR=	${PREFIX}/share/rocksndiamonds
-
+NO_ARCH=	yes
-USES=		7z:partial
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME} # for EXTRACT_WRKDIR
-
-SUB_FILES=	pkg-message pkg-deinstall
 
 LEVELS_ARTSOFT=	BD2K3 Boulder_Dash_Dream DX_Boulderdash Emerald_Mine_Club \
 		Snake_Bite Supaplex zelda zelda2
@@ -53,81 +47,24 @@ LEVELS_BD_FANS=	42_Steps Alexanders_Levels Arcade_Levels Be_a_bug \
 		Super_BD-Rock Super_Comic_Levels Venatir Warparound_Murphy \
 		Time_Gate_Rush
 
-OPTIONS_SINGLE=	SYMLINK
+post-extract:
-OPTIONS_SINGLE_SYMLINK=	RnD RnD_jue
+	@cd ${WRKSRC}/levels && ${MV} * .. && cd .. && ${RMDIR} levels
-
+	@cd ${WRKSRC} && ${MV} "Alan's_Random_Levels" Alans_Random_Levels
-OPTIONS_DEFAULT=	RnD_jue
+	@cd ${WRKSRC} && ${MV} "Gavin Davidson 2006" Gavin_Davidson_2006
-
+	@cd ${WRKSRC} && ${MV} "Veysi Orak 2006" Veysi_Orak_2006
-RnD_DESC=	Levels default for Rocks'n'Diamonds
+	@cd ${WRKSRC} && ${RM} Readme.txt levelinfo.conf
-RnD_jue_DESC=	Levels default for R'n'D jue
-
-PREFIX=		/usr/local
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MRnD}
-RUN_DEPENDS+=	rocksndiamonds:games/rocksndiamonds
-DATADIR=	${PREFIX}/share/rocksndiamonds
-DATADIR1=	${PREFIX}/share/rnd_jue
-.endif
-
-.if ${PORT_OPTIONS:MRnD_jue}
-RUN_DEPENDS+=	rnd_jue:games/rnd_jue
-DATADIR=	${PREFIX}/share/rnd_jue
-DATADIR1=	${PREFIX}/share/rocksndiamonds
-.endif
-
-post-extract-script:
-.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-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} go-w
-.endfor
-
-.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
-
-	@(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)
-	@(cd ${WRKDIR}/${PORTNAME} && ${RM} Readme.txt levelinfo.conf)
 
 do-install:
-	@(cd ${WRKDIR}/${PORTNAME} && ${COPYTREE_SHARE} . \
+	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/levels
-		${STAGEDIR}${DATADIR}/levels)
-
 	@cd ${STAGEDIR}${PREFIX} && ${FIND} ${DATADIR_REL}/levels \
 		-type f >> ${TMPPLIST}
-
+# Create symlinks to the levels for games/rnd_jue
-# Symlink Levels which can use Rocks'n'Diamonds and R'n'D jue
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/rnd_jue/levels
-.if exists(${PREFIX}/share/rocksndiamonds) && ${PORT_OPTIONS:MRnD_jue}
 .for l in ${LEVELS_ARTSOFT} ${LEVELS_BD_FANS} Alans_Random_Levels \
-	Gavin_Davidson_2006 Puzzles Veysi_Orak_2006
+		Gavin_Davidson_2006 Puzzles Veysi_Orak_2006
-		@${LN} -sf ${DATADIR}/levels/${l} \
+	@${RLN} ${STAGEDIR}${DATADIR}/levels/${l} \
-			${DATADIR1}/levels/
+		${STAGEDIR}${PREFIX}/share/rnd_jue/levels
+	@${ECHO_CMD} share/rnd_jue/levels/${l} >> ${TMPPLIST}
 .endfor
-.endif
-
-.if exists(${PREFIX}/share/rnd_jue) && ${PORT_OPTIONS:MRnD}
-.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
-.endif
 
 .include <bsd.port.mk>

games/rocksndiamonds-data/files/pkg-deinstall.in

@@ -1,11 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-if [ "$2" = "POST-DEINSTALL" ]; then
-    set -x
-    find %%PREFIX%%/share/rocksndiamonds -type l -exec rm -- {} +
-    find %%PREFIX%%/share/rnd_jue -type l -exec rm -- {} +
-fi
-

games/rocksndiamonds-data/files/pkg-message.in

@@ -1,38 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-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 extra Levels here:
-
-    https://web.archive.org/web/20140110211740/http://www.bd-fans.com/RnD.html
-
-    http://www.artsoft.org/forum/
-
-and other Sites and put it in:
-
-    ~/.rocksndiamonds/levels/yours_username
-    ~/.rnd_jue/levels/yours_username
-
-
-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
-EOM
-}
-]

games/rocksndiamonds-data/pkg-message

@@ -0,0 +1,18 @@
+[
+{ type: install
+  message: <<EOM
+These levels can be used with games/rnd_jue or games/rocksndiamonds.
+
+You can find more levels at
+
+    https://web.archive.org/web/20140110211740/http://www.bd-fans.com/RnD.html
+    http://www.artsoft.org/forum/
+
+and other sites.  Copy them to:
+
+    ~/.rocksndiamonds/levels/yours_username
+    ~/.rnd_jue/levels/yours_username
+
+EOM
+}
+]