Date: Thu, 21 Nov 2019 11:43:06 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r518095 - in head/games/bastet: . files Message-ID: <201911211143.xALBh6fq064773@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Thu Nov 21 11:43:06 2019 New Revision: 518095 URL: https://svnweb.freebsd.org/changeset/ports/518095 Log: - Update to 0.43.2 - Take maintainership - Install desktop entry, icon, appdata file, documentation - Add support for global highscore table Added: head/games/bastet/files/patch-Makefile (contents, props changed) head/games/bastet/pkg-plist (contents, props changed) Deleted: head/games/bastet/files/patch-Ui.cpp Modified: head/games/bastet/Makefile head/games/bastet/distinfo head/games/bastet/files/patch-BastetBlockChooser.hpp Modified: head/games/bastet/Makefile ============================================================================== --- head/games/bastet/Makefile Thu Nov 21 11:25:56 2019 (r518094) +++ head/games/bastet/Makefile Thu Nov 21 11:43:06 2019 (r518095) @@ -2,12 +2,11 @@ # $FreeBSD$ PORTNAME= bastet -PORTVERSION= 0.43 -PORTREVISION= 14 +PORTVERSION= 0.43.2 CATEGORIES= games MASTER_SITES= http://fph.altervista.org/prog/files/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= amdmi3@FreeBSD.org COMMENT= Ncurses Tetris clone which is harder than every other Tetris LICENSE= GPLv3+ @@ -17,18 +16,27 @@ BROKEN_powerpc64= does not build LIB_DEPENDS= libboost_program_options.so:devel/boost-libs +USE_GITHUB= yes +GH_ACCOUNT= fph + USES= gmake localbase:ldflags ncurses tar:tgz -PLIST_FILES= bin/bastet man/man6/bastet.6.gz +PORTDOCS= AUTHORS README NEWS -post-patch: - @${REINPLACE_CMD} -e \ - 's|^CXXFLAGS+=-D|CXXFLAGS+=$$(CPPFLAGS) -D| ; \ - s|$$(CXX) -MM|$$(CXX) $$(CXXFLAGS) -MM| ; \ - s| -ggdb | |' ${WRKSRC}/Makefile +OPTIONS_DEFINE= DOCS do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bastet ${STAGEDIR}${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/bastet.6 ${STAGEDIR}${MAN6PREFIX}/man/man6 + ${INSTALL_MAN} ${WRKSRC}/bastet.6 ${STAGEDIR}${MAN6PREFIX}/man/man6/ + @${MKDIR} ${STAGEDIR}/var/games + ${TOUCH} ${STAGEDIR}/var/games/bastet.scores2.sample + ${INSTALL_DATA} ${WRKSRC}/bastet.png ${STAGEDIR}${PREFIX}/share/pixmaps/ + ${INSTALL_DATA} ${WRKSRC}/bastet.desktop ${STAGEDIR}${PREFIX}/share/applications/ + @${MKDIR} ${STAGEDIR}${PREFIX}/share/appdata/ + ${INSTALL_DATA} ${WRKSRC}/bastet.appdata.xml ${STAGEDIR}${PREFIX}/share/appdata/ + +do-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/ .include <bsd.port.mk> Modified: head/games/bastet/distinfo ============================================================================== --- head/games/bastet/distinfo Thu Nov 21 11:25:56 2019 (r518094) +++ head/games/bastet/distinfo Thu Nov 21 11:43:06 2019 (r518095) @@ -1,2 +1,3 @@ -SHA256 (bastet-0.43.tgz) = e208c68684cc9b818a08b0d3f5f1e7ef381b1e4d8bc801a90b5ff6a8f00d8168 -SIZE (bastet-0.43.tgz) = 29115 +TIMESTAMP = 1574284007 +SHA256 (fph-bastet-0.43.2_GH0.tar.gz) = f219510afc1d83e4651fbffd5921b1e0b926d5311da4f8fa7df103dc7f2c403f +SIZE (fph-bastet-0.43.2_GH0.tar.gz) = 87496 Modified: head/games/bastet/files/patch-BastetBlockChooser.hpp ============================================================================== --- head/games/bastet/files/patch-BastetBlockChooser.hpp Thu Nov 21 11:25:56 2019 (r518094) +++ head/games/bastet/files/patch-BastetBlockChooser.hpp Thu Nov 21 11:43:06 2019 (r518095) @@ -1,47 +1,20 @@ ---- BastetBlockChooser.hpp.orig 2009-03-21 06:49:31.000000000 +0900 -+++ BastetBlockChooser.hpp 2013-11-29 22:35:48.000000000 +0900 -@@ -23,19 +23,32 @@ +--- BastetBlockChooser.hpp.orig 2015-08-30 07:04:24 UTC ++++ BastetBlockChooser.hpp +@@ -23,7 +23,7 @@ #include "Well.hpp" -+#if !defined(_LIBCPP_VERSION) - #include <tr1/unordered_set> -+#else -+#include <unordered_set> -+#endif +-#include <boost/tr1/tr1/unordered_set> ++#include <boost/unordered_set.hpp> #include <set> #include <boost/functional/hash.hpp> -+#if !defined(_LIBCPP_VERSION) - //boilerplate to use boost::hash as std::tr1::hash - namespace std{namespace tr1{ -+#else -+//boilerplate to use boost::hash as std::hash -+namespace std{ -+#endif - template<> struct hash<Bastet::BlockPosition>{ - size_t operator()(const Bastet::BlockPosition &fb) const{ - static boost::hash<Bastet::BlockPosition> h; - return h(fb); - } - }; -+#if !defined(_LIBCPP_VERSION) - }} -+#else -+ } -+#endif - - namespace Bastet{ - -@@ -83,7 +96,11 @@ +@@ -75,7 +75,7 @@ namespace Bastet{ public: Searcher(BlockType b, const Well *well, Vertex v, WellVisitor *visitor); private: -+#if !defined(_LIBCPP_VERSION) - std::tr1::unordered_set<Vertex> _visited; -+#else -+ std::unordered_set<Vertex> _visited; -+#endif +- std::tr1::unordered_set<Vertex> _visited; ++ boost::unordered_set<Vertex> _visited; //std::set<Vertex> _visited; ^^ the above is more efficient, we need to do many inserts BlockType _block; const Well *_well; Added: head/games/bastet/files/patch-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/bastet/files/patch-Makefile Thu Nov 21 11:43:06 2019 (r518095) @@ -0,0 +1,28 @@ +--- Makefile.orig 2015-08-30 07:04:24 UTC ++++ Makefile +@@ -5,22 +5,17 @@ PROGNAME=bastet + BOOST_PO?=-lboost_program_options + LDFLAGS+=-lncurses $(BOOST_PO) + #CXXFLAGS+=-ggdb -Wall +-CXXFLAGS+=-DNDEBUG -Wall ++CXXFLAGS+=-Wall + #CXXFLAGS+=-pg + #LDFLAGS+=-pg + + all: $(PROGNAME) $(TESTS:.cpp=) + + Test: $(SOURCES:.cpp=.o) $(TESTS:.cpp=.o) +- $(CXX) -ggdb -o $(TESTS:.cpp=) $(SOURCES:.cpp=.o) $(TESTS:.cpp=.o) $(LDFLAGS) ++ $(CXX) -o $(TESTS:.cpp=) $(SOURCES:.cpp=.o) $(TESTS:.cpp=.o) $(LDFLAGS) + +-depend: *.hpp $(SOURCES) $(MAIN) $(TESTS) +- $(CXX) -MM $(SOURCES) $(MAIN) $(TESTS)> depend +- +-include depend +- + $(PROGNAME): $(SOURCES:.cpp=.o) $(MAIN:.cpp=.o) +- $(CXX) -ggdb -o $(PROGNAME) $(SOURCES:.cpp=.o) $(MAIN:.cpp=.o) $(LDFLAGS) ++ $(CXX) -o $(PROGNAME) $(SOURCES:.cpp=.o) $(MAIN:.cpp=.o) $(LDFLAGS) + + clean: + rm -f $(SOURCES:.cpp=.o) $(TESTS:.cpp=.o) $(MAIN:.cpp=.o) $(PROGNAME) Added: head/games/bastet/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/bastet/pkg-plist Thu Nov 21 11:43:06 2019 (r518095) @@ -0,0 +1,6 @@ +@(,games,2555) bin/bastet +man/man6/bastet.6.gz +share/appdata/bastet.appdata.xml +share/applications/bastet.desktop +share/pixmaps/bastet.png +@sample(,games,664) /var/games/bastet.scores2.sample
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201911211143.xALBh6fq064773>