From owner-svn-ports-head@FreeBSD.ORG  Mon Jan 13 19:56:55 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id ED67310E;
 Mon, 13 Jan 2014 19:56:55 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id D99C311AD;
 Mon, 13 Jan 2014 19:56:55 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0DJutAu041420;
 Mon, 13 Jan 2014 19:56:55 GMT (envelope-from nemysis@svn.freebsd.org)
Received: (from nemysis@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0DJutgb041419;
 Mon, 13 Jan 2014 19:56:55 GMT (envelope-from nemysis@svn.freebsd.org)
Message-Id: <201401131956.s0DJutgb041419@svn.freebsd.org>
From: Rusmir Dusko <nemysis@FreeBSD.org>
Date: Mon, 13 Jan 2014 19:56:55 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r339627 - head/games/rocksndiamonds-data
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 13 Jan 2014 19:56:56 -0000

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>