Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 13 Jan 2014 19:56:55 +0000 (UTC)
From:      Rusmir Dusko <nemysis@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r339627 - head/games/rocksndiamonds-data
Message-ID:  <201401131956.s0DJutgb041419@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: nemysis
Date: Mon Jan 13 19:56:55 2014
New Revision: 339627
URL: http://svnweb.freebsd.org/changeset/ports/339627

Log:
  - Support STAGEDIR

Modified:
  head/games/rocksndiamonds-data/Makefile

Modified: head/games/rocksndiamonds-data/Makefile
==============================================================================
--- head/games/rocksndiamonds-data/Makefile	Mon Jan 13 19:55:40 2014	(r339626)
+++ head/games/rocksndiamonds-data/Makefile	Mon Jan 13 19:56:55 2014	(r339627)
@@ -58,7 +58,6 @@ RnD_jue_DESC=	Levels default for R'n'D j
 
 PREFIX=		/usr/local
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MRnD}
@@ -101,16 +100,12 @@ post-extract-script:
 	@(cd ${WRKDIR}/${PORTNAME} && ${RM} -f Readme.txt levelinfo.conf)
 
 do-install:
-	@(cd ${WRKDIR}/${PORTNAME} && ${COPYTREE_SHARE} . ${DATADIR}/levels)
+	@(cd ${WRKDIR}/${PORTNAME} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/levels)
 
-# 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 | \
-		${SED} -E -e 's,(.*),@unexec ${RMDIR} "\1" 2>/dev/null || true,' >> ${TMPPLIST}
-.endfor
-	@${FIND} -ds ${DATADIR} -type d -depth 0 | \
-		${SED} -E -e 's,(.*),@unexec ${RMDIR} "\1" 2>/dev/null || true,' >> ${TMPPLIST}
+	@cd ${STAGEDIR}${PREFIX} && ${FIND} ${DATADIR_REL}/levels \
+		-type f >> ${TMPPLIST} && \
+		${FIND} ${DATADIR_REL}/levels -type d -o -type l | ${SORT} -r | \
+		${SED} 's|^|@dirrm |' >> ${TMPPLIST}
 
 # Symlink Levels which can use Rocks'n'Diamonds and R'n'D jue
 .if exists(${PREFIX}/share/rocksndiamonds) && ${PORT_OPTIONS:MRnD_jue}
@@ -127,8 +122,4 @@ do-install:
 .endfor
 .endif
 
-	@${ECHO_CMD}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_CMD}
-
 .include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401131956.s0DJutgb041419>