Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 8 Dec 2013 15:14:05 +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: r335903 - in head/games/nelly: . files
Message-ID:  <201312081514.rB8FE59M019505@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.port.mk>

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



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