From owner-svn-ports-all@FreeBSD.ORG Sun Dec 8 15:14:06 2013 Return-Path: Delivered-To: svn-ports-all@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 01358AEA; Sun, 8 Dec 2013 15:14:06 +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 E133819DD; Sun, 8 Dec 2013 15:14:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB8FE50L019509; Sun, 8 Dec 2013 15:14:05 GMT (envelope-from nemysis@svn.freebsd.org) Received: (from nemysis@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB8FE59M019505; Sun, 8 Dec 2013 15:14:05 GMT (envelope-from nemysis@svn.freebsd.org) Message-Id: <201312081514.rB8FE59M019505@svn.freebsd.org> From: Rusmir Dusko Date: Sun, 8 Dec 2013 15:14:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r335903 - in head/games/nelly: . 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-all@freebsd.org X-Mailman-Version: 2.1.17 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: Sun, 08 Dec 2013 15:14:06 -0000 Author: nemysis Date: Sun Dec 8 15:14:04 2013 New Revision: 335903 URL: http://svnweb.freebsd.org/changeset/ports/335903 Log: - Change USE_PYTHON_RUN=yes to USE_PYTHON=yes - Change desktop entry - Remove NO_BUILD=yes, change pkg-plist - Change files/nelly.in Approved by: pawel / wg (mentors, implicit) Modified: head/games/nelly/Makefile head/games/nelly/files/nelly.in head/games/nelly/pkg-plist Modified: head/games/nelly/Makefile ============================================================================== --- head/games/nelly/Makefile Sun Dec 8 15:08:09 2013 (r335902) +++ head/games/nelly/Makefile Sun Dec 8 15:14:04 2013 (r335903) @@ -19,36 +19,43 @@ COMMENT= Nelly's Rooftop Garden, physics RUN_DEPENDS= ${PYGAME} \ ${PYTHON_PKGNAMEPREFIX}opengl>=0:${PORTSDIR}/graphics/py-opengl -USE_PYTHON_RUN= yes -NO_BUILD= yes +USE_PYTHON= yes PORTDOCS= README -SUB_FILES= ${PORTNAME} +OPTIONS_DEFINE= DOCS -DESKTOP_ENTRIES="Nelly's Rooftop Garden" "${COMMENT}" "${PORTNAME}" \ - "${PORTNAME}" "Game;ArcadeGame;" false +SUB_FILES= ${PORTNAME} -OPTIONS_DEFINE= DOCS +DESKTOP_ENTRIES="Nelly's Rooftop Garden" "" "${PORTNAME}" \ + "${PORTNAME}" "Game;ArcadeGame;" "" post-patch: @${REINPLACE_CMD} -e 's|/usr/bin/python|${PYTHON_CMD}|' \ ${WRKSRC}/*.py @${FIND} ${WRKSRC} -name "*.bak" -delete +do-build: + @${PYTHON_CMD} -m compileall ${WRKSRC} + @${PYTHON_CMD} -O -m compileall ${WRKSRC} + do-install: + @${REINPLACE_CMD} -e 's|%%PYTHON_CMD%%|${PYTHON_CMD}|' \ + ${WRKDIR}/${PORTNAME} ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ - @${MKDIR} ${STAGEDIR}${DATADIR} - ${INSTALL_SCRIPT} ${WRKSRC}/*.py ${STAGEDIR}${DATADIR} .for d in fonts levels textures @(cd ${WRKSRC} && ${COPYTREE_SHARE} ${d} ${STAGEDIR}${DATADIR}) .endfor +.for d in *.py *.pyc *.pyo + @(cd ${WRKSRC} ; ${INSTALL_SCRIPT} ${d} ${STAGEDIR}${DATADIR}) +.endfor + ${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/ - ${MKDIR} ${STAGEDIR}${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include Modified: head/games/nelly/files/nelly.in ============================================================================== --- head/games/nelly/files/nelly.in Sun Dec 8 15:08:09 2013 (r335902) +++ head/games/nelly/files/nelly.in Sun Dec 8 15:14:04 2013 (r335903) @@ -4,4 +4,4 @@ # cd "%%DATADIR%%" -exec /usr/bin/env python ./nelly.py "${@}" +exec %%PYTHON_CMD%% ./nelly.py "${@}" Modified: head/games/nelly/pkg-plist ============================================================================== --- head/games/nelly/pkg-plist Sun Dec 8 15:08:09 2013 (r335902) +++ head/games/nelly/pkg-plist Sun Dec 8 15:14:04 2013 (r335903) @@ -1,6 +1,10 @@ bin/nelly %%DATADIR%%/collide.py +%%DATADIR%%/collide.pyc +%%DATADIR%%/collide.pyo %%DATADIR%%/font.py +%%DATADIR%%/font.pyc +%%DATADIR%%/font.pyo %%DATADIR%%/fonts/babelfish.ttf %%DATADIR%%/levels/level01.lvl %%DATADIR%%/levels/level02.lvl @@ -18,7 +22,11 @@ bin/nelly %%DATADIR%%/levels/level14.lvl %%DATADIR%%/levels/level15.lvl %%DATADIR%%/nelly.py +%%DATADIR%%/nelly.pyc +%%DATADIR%%/nelly.pyo %%DATADIR%%/res.py +%%DATADIR%%/res.pyc +%%DATADIR%%/res.pyo %%DATADIR%%/textures/brick.jpg %%DATADIR%%/textures/dialog.png %%DATADIR%%/textures/dialog_ok.png