From owner-svn-ports-all@freebsd.org Mon Nov 25 10:50:13 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C69A11A833C; Mon, 25 Nov 2019 10:50:13 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47M3hj3RXRz4HTP; Mon, 25 Nov 2019 10:50:13 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 59249B7B8; Mon, 25 Nov 2019 10:50:13 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xAPAoD6p052431; Mon, 25 Nov 2019 10:50:13 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xAPAoDAv052430; Mon, 25 Nov 2019 10:50:13 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201911251050.xAPAoDAv052430@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Mon, 25 Nov 2019 10:50:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r518396 - in head/games/rocksndiamonds-data: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: in head/games/rocksndiamonds-data: . files X-SVN-Commit-Revision: 518396 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Nov 2019 10:50:13 -0000 Author: tobik Date: Mon Nov 25 10:50:12 2019 New Revision: 518396 URL: https://svnweb.freebsd.org/changeset/ports/518396 Log: 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 Added: head/games/rocksndiamonds-data/pkg-message - copied, changed from r518395, head/games/rocksndiamonds-data/files/pkg-message.in Deleted: head/games/rocksndiamonds-data/files/ Modified: head/games/rocksndiamonds-data/Makefile Modified: head/games/rocksndiamonds-data/Makefile ============================================================================== --- head/games/rocksndiamonds-data/Makefile Mon Nov 25 10:37:38 2019 (r518395) +++ head/games/rocksndiamonds-data/Makefile Mon Nov 25 10:50:12 2019 (r518396) @@ -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,21 +22,15 @@ 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 - -USES= 7z:partial +DATADIR= ${PREFIX}/share/rocksndiamonds +NO_ARCH= yes 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_Leve Super_BD-Rock Super_Comic_Levels Venatir Warparound_Murphy \ Time_Gate_Rush -OPTIONS_SINGLE= SYMLINK -OPTIONS_SINGLE_SYMLINK= RnD RnD_jue +post-extract: + @cd ${WRKSRC}/levels && ${MV} * .. && cd .. && ${RMDIR} levels + @cd ${WRKSRC} && ${MV} "Alan's_Random_Levels" Alans_Random_Levels + @cd ${WRKSRC} && ${MV} "Gavin Davidson 2006" Gavin_Davidson_2006 + @cd ${WRKSRC} && ${MV} "Veysi Orak 2006" Veysi_Orak_2006 + @cd ${WRKSRC} && ${RM} Readme.txt levelinfo.conf -OPTIONS_DEFAULT= RnD_jue - -RnD_DESC= Levels default for Rocks'n'Diamonds -RnD_jue_DESC= Levels default for R'n'D jue - -PREFIX= /usr/local - -.include - -.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} . \ - ${STAGEDIR}${DATADIR}/levels) - + @cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/levels @cd ${STAGEDIR}${PREFIX} && ${FIND} ${DATADIR_REL}/levels \ -type f >> ${TMPPLIST} - -# Symlink Levels which can use Rocks'n'Diamonds and R'n'D jue -.if exists(${PREFIX}/share/rocksndiamonds) && ${PORT_OPTIONS:MRnD_jue} +# Create symlinks to the levels for games/rnd_jue + @${MKDIR} ${STAGEDIR}${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/ + Gavin_Davidson_2006 Puzzles Veysi_Orak_2006 + @${RLN} ${STAGEDIR}${DATADIR}/levels/${l} \ + ${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 Copied and modified: head/games/rocksndiamonds-data/pkg-message (from r518395, head/games/rocksndiamonds-data/files/pkg-message.in) ============================================================================== --- head/games/rocksndiamonds-data/files/pkg-message.in Mon Nov 25 10:37:38 2019 (r518395, copy source) +++ head/games/rocksndiamonds-data/pkg-message Mon Nov 25 10:50:12 2019 (r518396) @@ -1,38 +1,18 @@ [ { type: install message: <