- Pet portlint

- Switch to USES=localbase
- Fix build with clang 6
- Add desktop entry
- Switch to options helpers

4 files changed, 41 insertions, 10 deletions

diff --git a/games/flyhard/Makefile b/games/flyhard/Makefile
index 1389a87987fa..f0d1e4b5327d 100644
--- a/games/flyhard/Makefile
+++ b/games/flyhard/Makefile
@@ -14,27 +14,36 @@ COMMENT=	Game resembling Thrust, but with lots of shooting and puzzles
 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>
diff --git a/games/flyhard/files/patch-src-Makefile.in b/games/flyhard/files/patch-src_Makefile.in
index e6225bde6b9d..ffead66d51d2 100644
--- a/games/flyhard/files/patch-src-Makefile.in
+++ b/games/flyhard/files/patch-src_Makefile.in
@@ -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"
diff --git a/games/flyhard/files/patch-src_arena.h b/games/flyhard/files/patch-src_arena.h
new file mode 100644
index 000000000000..60e85087f70d
--- /dev/null
+++ b/games/flyhard/files/patch-src_arena.h
@@ -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;}
diff --git a/games/flyhard/files/patch-src_loadimag.cpp b/games/flyhard/files/patch-src_loadimag.cpp
new file mode 100644
index 000000000000..7806f4292bb6
--- /dev/null
+++ b/games/flyhard/files/patch-src_loadimag.cpp
@@ -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"?