From owner-svn-ports-head@FreeBSD.ORG Fri Oct 4 21:54:55 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id A4E74759; Fri, 4 Oct 2013 21:54:55 +0000 (UTC) (envelope-from lme@FreeBSD.org) 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 838C32907; Fri, 4 Oct 2013 21:54: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 r94LstFt000148; Fri, 4 Oct 2013 21:54:55 GMT (envelope-from lme@svn.freebsd.org) Received: (from lme@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r94LssZ0000140; Fri, 4 Oct 2013 21:54:54 GMT (envelope-from lme@svn.freebsd.org) Message-Id: <201310042154.r94LssZ0000140@svn.freebsd.org> From: Lars Engels Date: Fri, 4 Oct 2013 21:54:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r329394 - in head/games/thudboard: . files 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.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Oct 2013 21:54:55 -0000 Author: lme Date: Fri Oct 4 21:54:54 2013 New Revision: 329394 URL: http://svnweb.freebsd.org/changeset/ports/329394 Log: - Support staging - Use REINPLACE_CMD, COPYTREE_SHARE and SUB_FILES instead of copying, chmodding, chowning and replacing manually Added: head/games/thudboard/files/thudboard.in (contents, props changed) - copied, changed from r329317, head/games/thudboard/files/thudboard Deleted: head/games/thudboard/files/thudboard Modified: head/games/thudboard/Makefile (contents, props changed) head/games/thudboard/pkg-plist (contents, props changed) Modified: head/games/thudboard/Makefile ============================================================================== --- head/games/thudboard/Makefile Fri Oct 4 21:54:39 2013 (r329393) +++ head/games/thudboard/Makefile Fri Oct 4 21:54:54 2013 (r329394) @@ -15,23 +15,25 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkin NO_WRKSUBDIR= yes USE_PYTHON= yes -NO_STAGE= yes -do-configure: - @${SED} -e "s#%%PREFIX%%#${PREFIX}# ; s#%%PYTHON_CMD%%#${PYTHON_CMD}#" \ - ${FILESDIR}/thudboard > ${WRKDIR}/thudboard.tmp +SUB_FILES= thudboard + +post-patch: + ${REINPLACE_CMD} -e 's|file:.*/docs|file://${DOCSDIR}|' \ + ${WRKDIR}/thud.py do-build: @${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC} 2>/dev/null do-install: - ${INSTALL_SCRIPT} ${WRKDIR}/thudboard.tmp ${PREFIX}/bin/thudboard - @${MKDIR} ${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/*.py ${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/*.pyc ${DATADIR} - @${TAR} -C ${WRKSRC} -cf - docs koomvalley img | \ - ${TAR} -C ${DATADIR} --unlink -xf - - @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DATADIR} - @${FIND} ${DATADIR} -type f | ${XARGS} ${CHMOD} ${SHAREMODE} - @${FIND} ${DATADIR} -type d | ${XARGS} ${CHMOD} a+rx + ${INSTALL_SCRIPT} ${WRKDIR}/thudboard ${STAGEDIR}${PREFIX}/bin/thudboard + @${MKDIR} ${STAGEDIR}${DATADIR} + @${INSTALL_DATA} ${WRKSRC}/*.py ${STAGEDIR}${DATADIR} + @${INSTALL_DATA} ${WRKSRC}/*.pyc ${STAGEDIR}${DATADIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + @(cd ${WRKDIR}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) +. for d in koomvalley img + @${MKDIR} ${STAGEDIR}${DATADIR}/${d} + @(cd ${WRKDIR}/${d} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/${d}) +. endfor .include Copied and modified: head/games/thudboard/files/thudboard.in (from r329317, head/games/thudboard/files/thudboard) ============================================================================== --- head/games/thudboard/files/thudboard Fri Oct 4 14:41:19 2013 (r329317, copy source) +++ head/games/thudboard/files/thudboard.in Fri Oct 4 21:54:54 2013 (r329394) @@ -1,2 +1,2 @@ #!/bin/sh -cd %%PREFIX%%/share/thudboard && %%PYTHON_CMD%% thud.pyc $* +cd %%PREFIX%%/share/thudboard && python thud.pyc $* Modified: head/games/thudboard/pkg-plist ============================================================================== --- head/games/thudboard/pkg-plist Fri Oct 4 21:54:39 2013 (r329393) +++ head/games/thudboard/pkg-plist Fri Oct 4 21:54:54 2013 (r329394) @@ -1,34 +1,34 @@ bin/thudboard +%%PORTDOCS%%%%DOCSDIR%%/about.html +%%PORTDOCS%%%%DOCSDIR%%/download.html +%%PORTDOCS%%%%DOCSDIR%%/howto.html +%%PORTDOCS%%%%DOCSDIR%%/img/battleline.gif +%%PORTDOCS%%%%DOCSDIR%%/img/bcktile.gif +%%PORTDOCS%%%%DOCSDIR%%/img/copyicon.gif +%%PORTDOCS%%%%DOCSDIR%%/img/dwarf.gif +%%PORTDOCS%%%%DOCSDIR%%/img/filemenu.gif +%%PORTDOCS%%%%DOCSDIR%%/img/helpmenu.gif +%%PORTDOCS%%%%DOCSDIR%%/img/moveinprogress.gif +%%PORTDOCS%%%%DOCSDIR%%/img/movepiece.gif +%%PORTDOCS%%%%DOCSDIR%%/img/optionsmenu.gif +%%PORTDOCS%%%%DOCSDIR%%/img/pasteicon.gif +%%PORTDOCS%%%%DOCSDIR%%/img/quicksavemenu.gif +%%PORTDOCS%%%%DOCSDIR%%/img/quit.gif +%%PORTDOCS%%%%DOCSDIR%%/img/rock.gif +%%PORTDOCS%%%%DOCSDIR%%/img/selectname.gif +%%PORTDOCS%%%%DOCSDIR%%/img/singleline.gif +%%PORTDOCS%%%%DOCSDIR%%/img/thudpreview.gif +%%PORTDOCS%%%%DOCSDIR%%/img/thudscreen.jpg +%%PORTDOCS%%%%DOCSDIR%%/img/thudscroll.gif +%%PORTDOCS%%%%DOCSDIR%%/img/troll.gif +%%PORTDOCS%%%%DOCSDIR%%/img/valid-xhtml11.gif +%%PORTDOCS%%%%DOCSDIR%%/img/vcss.gif +%%PORTDOCS%%%%DOCSDIR%%/index.html +%%PORTDOCS%%%%DOCSDIR%%/thudboard.css %%DATADIR%%/battle.py %%DATADIR%%/battle.pyc %%DATADIR%%/bugfix_askyesno.py %%DATADIR%%/bugfix_askyesno.pyc -%%DATADIR%%/docs/about.html -%%DATADIR%%/docs/download.html -%%DATADIR%%/docs/howto.html -%%DATADIR%%/docs/img/battleline.gif -%%DATADIR%%/docs/img/bcktile.gif -%%DATADIR%%/docs/img/copyicon.gif -%%DATADIR%%/docs/img/dwarf.gif -%%DATADIR%%/docs/img/filemenu.gif -%%DATADIR%%/docs/img/helpmenu.gif -%%DATADIR%%/docs/img/moveinprogress.gif -%%DATADIR%%/docs/img/movepiece.gif -%%DATADIR%%/docs/img/optionsmenu.gif -%%DATADIR%%/docs/img/pasteicon.gif -%%DATADIR%%/docs/img/quicksavemenu.gif -%%DATADIR%%/docs/img/quit.gif -%%DATADIR%%/docs/img/rock.gif -%%DATADIR%%/docs/img/selectname.gif -%%DATADIR%%/docs/img/singleline.gif -%%DATADIR%%/docs/img/thudpreview.gif -%%DATADIR%%/docs/img/thudscreen.jpg -%%DATADIR%%/docs/img/thudscroll.gif -%%DATADIR%%/docs/img/troll.gif -%%DATADIR%%/docs/img/valid-xhtml11.gif -%%DATADIR%%/docs/img/vcss.gif -%%DATADIR%%/docs/index.html -%%DATADIR%%/docs/thudboard.css %%DATADIR%%/img/banner.gif %%DATADIR%%/img/bcktile.gif %%DATADIR%%/img/board-grid.gif @@ -64,8 +64,8 @@ bin/thudboard %%DATADIR%%/texts.pyc %%DATADIR%%/thud.py %%DATADIR%%/thud.pyc -@dirrm %%DATADIR%%/img -@dirrm %%DATADIR%%/koomvalley -@dirrm %%DATADIR%%/docs/img -@dirrm %%DATADIR%%/docs -@dirrm %%DATADIR%% +@dirrmtry %%DATADIR%%/koomvalley +@dirrmtry %%DATADIR%%/img +@dirrmtry %%DATADIR%% +%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/img +%%PORTDOCS%%@dirrmtry %%DOCSDIR%%