Date: Tue, 3 Jul 2018 16:35: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: r473844 - in head/games/flyhard: . files Message-ID: <201807031635.w63GZ6Aj063450@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Tue Jul 3 16:35:06 2018 New Revision: 473844 URL: https://svnweb.freebsd.org/changeset/ports/473844 Log: - Pet portlint - Switch to USES=localbase - Fix build with clang 6 - Add desktop entry - Switch to options helpers Added: head/games/flyhard/files/patch-src_Makefile.in - copied, changed from r473843, head/games/flyhard/files/patch-src-Makefile.in head/games/flyhard/files/patch-src_arena.h (contents, props changed) head/games/flyhard/files/patch-src_loadimag.cpp (contents, props changed) Deleted: head/games/flyhard/files/patch-src-Makefile.in Modified: head/games/flyhard/Makefile Modified: head/games/flyhard/Makefile ============================================================================== --- head/games/flyhard/Makefile Tue Jul 3 15:35:43 2018 (r473843) +++ head/games/flyhard/Makefile Tue Jul 3 16:35:06 2018 (r473844) @@ -14,27 +14,36 @@ COMMENT= Game resembling Thrust, but with lots of shoo LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING +BROKEN_armv6= dumps core: Assertion failed: (!NodePtr->isKnownSentinel()), function operator*, file ilist_iterator.h +BROKEN_armv7= dumps core: Assertion failed: (!NodePtr->isKnownSentinel()), function operator*, file ilist_iterator.h + LIB_DEPENDS= libpng.so:graphics/png BUILD_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs -BROKEN_armv6= dumps core: Assertion failed: (!NodePtr->isKnownSentinel()), function operator*, file ilist_iterator.h -BROKEN_armv7= dumps core: Assertion failed: (!NodePtr->isKnownSentinel()), function operator*, file ilist_iterator.h - +USES= gmake localbase GNU_CONFIGURE= yes -USES= gmake USE_SDL= sdl mixer -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +CXXFLAGS+= -Wno-c++11-narrowing PLIST_FILES= bin/${PORTNAME} PORTDOCS= AUTHORS ChangeLog README PORTDATA= * +DESKTOP_ENTRIES="Fly Hard" \ + "" \ + "${DATADIR}/images/ship.png" \ + "${PORTNAME}" \ + "Game;ArcadeGame;" \ + false + OPTIONS_DEFINE= DOCS post-install: - ${MKDIR} ${STAGEDIR}${DOCSDIR} + @${FIND} ${STAGEDIR}${DATADIR} -type f -exec ${CHMOD} 644 {} + + +post-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/ .include <bsd.port.mk> Copied and modified: head/games/flyhard/files/patch-src_Makefile.in (from r473843, head/games/flyhard/files/patch-src-Makefile.in) ============================================================================== --- head/games/flyhard/files/patch-src-Makefile.in Tue Jul 3 15:35:43 2018 (r473843, copy source) +++ head/games/flyhard/files/patch-src_Makefile.in Tue Jul 3 16:35:06 2018 (r473844) @@ -1,6 +1,6 @@ ---- src/Makefile.in.orig 2009-02-15 18:44:02.000000000 +0300 -+++ src/Makefile.in 2013-09-30 06:52:38.221519372 +0400 -@@ -597,9 +597,9 @@ +--- src/Makefile.in.orig 2009-02-15 15:44:02 UTC ++++ src/Makefile.in +@@ -597,9 +597,9 @@ uninstall-am: uninstall-binPROGRAMS unin #since automake doesn't directly put anything in $(savedir), it may not exist install-data-hook: @echo "Creating blank hi-score file" Added: head/games/flyhard/files/patch-src_arena.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/flyhard/files/patch-src_arena.h Tue Jul 3 16:35:06 2018 (r473844) @@ -0,0 +1,11 @@ +--- src/arena.h.orig 2008-11-23 10:56:52 UTC ++++ src/arena.h +@@ -60,7 +60,7 @@ class arena_ptr + { + friend class arena; + public: +- operator bool() const {return m_ptr.lock();} ++ operator bool() const {return m_ptr.lock() != nullptr;} + T &operator *() const {return **(m_ptr.lock());} + T *get() const {return *(m_ptr.lock());} + arena_ptr<T>(const arena_ptr<T> &_){m_ptr=_.m_ptr;} Added: head/games/flyhard/files/patch-src_loadimag.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/flyhard/files/patch-src_loadimag.cpp Tue Jul 3 16:35:06 2018 (r473844) @@ -0,0 +1,11 @@ +--- src/loadimag.cpp.orig 2009-02-15 14:06:42 UTC ++++ src/loadimag.cpp +@@ -65,7 +65,7 @@ SDL_Surface *load_image(const std::strin + DBG_WHINE("Unknown image extension: "+extension); + } + +- return false; ++ return NULL; + } + + //should this be extern "C"?
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201807031635.w63GZ6Aj063450>