From owner-svn-ports-head@FreeBSD.ORG Wed Aug 6 20:58:17 2014 Return-Path: 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 55F7DF16 for ; Wed, 6 Aug 2014 20:58:17 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3690525BA for ; Wed, 6 Aug 2014 20:58:17 +0000 (UTC) Received: from nemysis (uid 1324) (envelope-from nemysis@FreeBSD.org) id 5533 by svn.freebsd.org (DragonFly Mail Agent v0.9+); Wed, 06 Aug 2014 20:58:16 +0000 From: Rusmir Dusko Date: Wed, 6 Aug 2014 20:58:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r364220 - in head/games/bubbros: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <53e296e8.5533.4e137f7@svn.freebsd.org> X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 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: Wed, 06 Aug 2014 20:58:17 -0000 Author: nemysis Date: Wed Aug 6 20:58:15 2014 New Revision: 364220 URL: http://svnweb.freebsd.org/changeset/ports/364220 QAT: https://qat.redports.org/buildarchive/r364220/ Log: - Update to 1.6.2 - Transfer maintainership to games@ team - Add license (MIT) - Use PYGAME instead of devel/py-game - Support STAGEDIR - Simplify DOCS installation handling, change and add Option - Fix the usage of 'python' to get rid of the implicit lang/python dependency - Add symlink for the icon and add Desktop entry file - Remove not needed files and directories - Cleanup port, simplify installation handling - Strip libraries - Change manual pages, install to proper location - Add files/bubbros.in - Remove obsolete patch, changed by upstream - Change pkg-descr, use whitespace instead of tabulator - Change pkg-plist, remove DOCS, add MAN Added: head/games/bubbros/files/bubbros.in (contents, props changed) Deleted: head/games/bubbros/files/patch-bubbob-statesaver.c Modified: head/games/bubbros/Makefile head/games/bubbros/distinfo head/games/bubbros/pkg-descr head/games/bubbros/pkg-plist Modified: head/games/bubbros/Makefile ============================================================================== --- head/games/bubbros/Makefile Wed Aug 6 20:44:55 2014 (r364219) +++ head/games/bubbros/Makefile Wed Aug 6 20:58:15 2014 (r364220) @@ -2,46 +2,64 @@ # $FreeBSD$ PORTNAME= bubbros -PORTVERSION= 1.6 -PORTREVISION= 6 +PORTVERSION= 1.6.2 CATEGORIES= games MASTER_SITES= SF/bub-n-bros/bub-n-bros/${PORTVERSION} +DIST_SUBDIR= python -MAINTAINER= ports@FreeBSD.org +MAINTAINER= games@FreeBSD.org COMMENT= Multiplayer clone of the famous Bubble Bobble game -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pygame/__init__.py:${PORTSDIR}/devel/py-game +LICENSE= MIT + +RUN_DEPENDS= ${PYGAME} BUILD_DEPENDS:= ${RUN_DEPENDS} USE_PYTHON= yes -USES= tar:bzip2 -NO_STAGE= yes +PORTDOCS= *.html +OPTIONS_DEFINE= DOCS + +SUB_FILES= ${PORTNAME} + +DESKTOP_ENTRIES="Bub-n-Bros" "" "${PORTNAME}" \ + "${PORTNAME}" "Game;ArcadeGame;" "" + post-patch: @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' \ ${WRKSRC}/display/setup.py + @${FIND} ${WRKSRC} -name "*.bak" -delete -or -name "*.orig" -delete \ + -or -name "*.cvsignore" -delete + @${FIND} ${WRKSRC} -name CVS -print0 | ${XARGS} -0 ${RM} -fr do-build: # Compile the statesaver extension module cd ${WRKSRC}/bubbob; ${PYTHON_CMD} setup.py build_ext -i # Compile the X-window client extension module cd ${WRKSRC}/display; ${PYTHON_CMD} setup.py build_ext -i +.for d in bubbob display + @(cd ${WRKSRC}/${d} && ${RM} -fr build) +.endfor do-install: - @${MKDIR} ${DATADIR} - (cd ${WRKSRC}; tar --exclude build --exclude "*.orig" --exclude "*.bak" -cf - bubbob common display http2 java metaserver BubBob.py) | \ - (cd ${DATADIR}; tar --unlink -xf -) - @${PRINTF} "#!/bin/sh\ncd ${DATADIR} && \ - exec ${PYTHON_CMD} ${DATADIR}/BubBob.py\n" > ${WRKDIR}/bubbros.sh + @${REINPLACE_CMD} -e 's|%%PYTHON_CMD%%|${PYTHON_CMD}|' \ + ${WRKDIR}/${PORTNAME} + ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ +.for d in bubbob common display http2 java metaserver + @(cd ${WRKSRC} && ${COPYTREE_SHARE} ${d} ${STAGEDIR}${DATADIR}) +.endfor + ${INSTALL_SCRIPT} ${WRKSRC}/BubBob.py ${STAGEDIR}${DATADIR} # build different colors - @${PYTHON_CMD} ${DATADIR}/bubbob/images/buildcolors.py - @${INSTALL_SCRIPT} ${WRKDIR}/bubbros.sh ${PREFIX}/bin/bubbros - -post-install: -.ifndef(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - (cd ${WRKSRC}/doc; tar -cf - .) | \ - (cd ${DOCSDIR}; tar --unlink -xf -) -.endif + @${PYTHON_CMD} ${STAGEDIR}${DATADIR}/bubbob/images/buildcolors.py + ${LN} -sf ${DATADIR}/http2/data/bob.png \ + ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png + +.for l in bubbob/statesaver.so display/xshm.so + ${STRIP_CMD} ${STAGEDIR}${DATADIR}/${l} +.endfor + + ${INSTALL_MAN} ${WRKSRC}/doc/*.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/ + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${STAGEDIR}${DOCSDIR} .include Modified: head/games/bubbros/distinfo ============================================================================== --- head/games/bubbros/distinfo Wed Aug 6 20:44:55 2014 (r364219) +++ head/games/bubbros/distinfo Wed Aug 6 20:58:15 2014 (r364220) @@ -1,2 +1,2 @@ -SHA256 (bubbros-1.6.tar.bz2) = dd197e60a23e09800010f3a5906feb77847e6eeaa7cfd47d803a85daa0bcf255 -SIZE (bubbros-1.6.tar.bz2) = 9052959 +SHA256 (python/bubbros-1.6.2.tar.gz) = 0ad8a359c4632071a9c85c2684bae32aa0fa278632c49f092dc4078cfb9858c4 +SIZE (python/bubbros-1.6.2.tar.gz) = 11568771 Added: head/games/bubbros/files/bubbros.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/bubbros/files/bubbros.in Wed Aug 6 20:58:15 2014 (r364220) @@ -0,0 +1,7 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +cd "%%DATADIR%%" +exec %%PYTHON_CMD%% ./BubBob.py "${@}" Modified: head/games/bubbros/pkg-descr ============================================================================== --- head/games/bubbros/pkg-descr Wed Aug 6 20:44:55 2014 (r364219) +++ head/games/bubbros/pkg-descr Wed Aug 6 20:58:15 2014 (r364220) @@ -6,4 +6,4 @@ Features: * Capture other players in a bubble! * New levels, including a random level generator! -WWW: http://bub-n-bros.sourceforge.net/ +WWW: http://bub-n-bros.sourceforge.net/ Modified: head/games/bubbros/pkg-plist ============================================================================== --- head/games/bubbros/pkg-plist Wed Aug 6 20:44:55 2014 (r364219) +++ head/games/bubbros/pkg-plist Wed Aug 6 20:58:15 2014 (r364220) @@ -1,4 +1,7 @@ bin/bubbros +man/man1/BubBob.py.1.gz +man/man1/Client.py.1.gz +man/man1/bb.py.1.gz %%DATADIR%%/BubBob.py %%DATADIR%%/bubbob/Makefile %%DATADIR%%/bubbob/bb.py @@ -86,6 +89,7 @@ bin/bubbros %%DATADIR%%/bubbob/ext7/image1-8.ppm %%DATADIR%%/bubbob/ext7/image1-9.ppm %%DATADIR%%/bubbob/ext7/music.wav +%%DATADIR%%/bubbob/images.py %%DATADIR%%/bubbob/images/10000_0.ppm %%DATADIR%%/bubbob/images/10000_1.ppm %%DATADIR%%/bubbob/images/10000_2.ppm @@ -293,7 +297,6 @@ bin/bubbros %%DATADIR%%/bubbob/images/water_still.ppm %%DATADIR%%/bubbob/images/water_surface.ppm %%DATADIR%%/bubbob/images/yellow_Hurry_up.ppm -%%DATADIR%%/bubbob/images.py %%DATADIR%%/bubbob/levels/Arena.bin %%DATADIR%%/bubbob/levels/CompactLevels.py %%DATADIR%%/bubbob/levels/HouseOfFun.bin @@ -315,6 +318,7 @@ bin/bubbros %%DATADIR%%/bubbob/patmap.py %%DATADIR%%/bubbob/player.py %%DATADIR%%/bubbob/ranking.py +%%DATADIR%%/bubbob/save_rnglevel.py %%DATADIR%%/bubbob/setup.py %%DATADIR%%/bubbob/sounds/die.wav %%DATADIR%%/bubbob/sounds/extra.wav @@ -329,9 +333,10 @@ bin/bubbros %%DATADIR%%/bubbob/sounds/yippee.wav %%DATADIR%%/bubbob/sprmap.py %%DATADIR%%/bubbob/statesaver.c +%%DATADIR%%/bubbob/statesaver.py %%DATADIR%%/bubbob/statesaver.so %%DATADIR%%/bubbob/test_rnglevel.py -%%DATADIR%%/bubbob/save_rnglevel.py +%%DATADIR%%/bubbob/test_statesaver.py %%DATADIR%%/bubbob/tmp/pat00.ppm %%DATADIR%%/bubbob/tmp/pat01.ppm %%DATADIR%%/bubbob/tmp/pat02.ppm @@ -444,6 +449,7 @@ bin/bubbros %%DATADIR%%/metaserver/metastruct.py %%DATADIR%%/metaserver/pipelayer.py %%DATADIR%%/metaserver/socketoverudp.py +share/pixmaps/bubbros.png @dirrm %%DATADIR%%/bubbob/doc/images @dirrm %%DATADIR%%/bubbob/doc @dirrm %%DATADIR%%/bubbob/ext1 @@ -468,14 +474,3 @@ bin/bubbros @dirrm %%DATADIR%%/java @dirrm %%DATADIR%%/metaserver @dirrm %%DATADIR%% -%%PORTDOCS%%%%DOCSDIR%%/BubBob.py.1 -%%PORTDOCS%%%%DOCSDIR%%/Client.py.1 -%%PORTDOCS%%%%DOCSDIR%%/Introduction.html -%%PORTDOCS%%%%DOCSDIR%%/Makefile -%%PORTDOCS%%%%DOCSDIR%%/authors.html -%%PORTDOCS%%%%DOCSDIR%%/bb.py.1 -%%PORTDOCS%%%%DOCSDIR%%/crazybonuses.html -%%PORTDOCS%%%%DOCSDIR%%/download.html -%%PORTDOCS%%%%DOCSDIR%%/help.html -%%PORTDOCS%%%%DOCSDIR%%/sshots.html -%%PORTDOCS%%@dirrm %%DOCSDIR%%