- Update to 2.14.7

- Add .desktop entry

6 files changed, 17 insertions, 55 deletions

diff --git a/games/7kaa/Makefile b/games/7kaa/Makefile
index 66a881a35a06..55d6c1e27371 100644
--- a/games/7kaa/Makefile
+++ b/games/7kaa/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	7kaa
-PORTVERSION=	2.14.6
-PORTREVISION=	1
+PORTVERSION=	2.14.7
 CATEGORIES=	games
 MASTER_SITES=	SF/skfans/7KAA%20${PORTVERSION}
 
@@ -13,20 +12,30 @@ COMMENT=	Seven Kingdoms: Ancient Adversaries
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libenet.so:net/enet
+LIB_DEPENDS=	libenet.so:net/enet \
+		libcurl.so:ftp/curl
 
-USES=		gmake localbase openal:al tar:xz
+USES=		compiler:c++11-lib gmake localbase openal:al pkgconfig tar:xz
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-nls # no translations ATM
 USE_SDL=	sdl2
 
-PLIST_FILES=	bin/${PORTNAME}
+PLIST_FILES=	bin/${PORTNAME} \
+		share/pixmaps/${PORTNAME}.ico
 PORTDOCS=	*
 PORTDATA=	*
 
 OPTIONS_DEFINE=	DOCS
 
+DESKTOP_ENTRIES="7KAA" \
+		"" \
+		"${PREFIX}/share/pixmaps/${PORTNAME}.ico" \
+		"${PORTNAME}" \
+		"Game;StrategyGame;" \
+		""
+
 post-install:
 	@${RM} ${STAGEDIR}${DOCSDIR}/COPYING
+	${INSTALL_DATA} ${WRKSRC}/src/7k.ico ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.ico
 
 .include <bsd.port.mk>
diff --git a/games/7kaa/distinfo b/games/7kaa/distinfo
index f6bf5a053880..9b120f547f86 100644
--- a/games/7kaa/distinfo
+++ b/games/7kaa/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1473115708
-SHA256 (7kaa-2.14.6.tar.xz) = fcbe2d7fc12fab7a2c08a14317264c9f96a6ebca18b28f3fee78925442bdd573
-SIZE (7kaa-2.14.6.tar.xz) = 31220676
+TIMESTAMP = 1496913552
+SHA256 (7kaa-2.14.7.tar.xz) = 9425cfb7f11a915e82d4696649db35a4d53969a9479a4705b403206df462e543
+SIZE (7kaa-2.14.7.tar.xz) = 31342092
diff --git a/games/7kaa/files/patch-src_audio_openal_openal__audio.cpp b/games/7kaa/files/patch-src_audio_openal_openal__audio.cpp
deleted file mode 100644
index c1497fa1725a..000000000000
--- a/games/7kaa/files/patch-src_audio_openal_openal__audio.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/audio/openal/openal_audio.cpp.orig	2016-09-04 17:31:41 UTC
-+++ src/audio/openal/openal_audio.cpp
-@@ -168,7 +168,8 @@ OpenALAudio::OpenALAudio()
- 
- OpenALAudio::~OpenALAudio()
- {
--	this->deinit();
-+	if (this->init_flag != 0)
-+		this->deinit();
- }
- 
- // Initialize the mid driver
diff --git a/games/7kaa/files/patch-src_client_OMUSIC.cpp b/games/7kaa/files/patch-src_client_OMUSIC.cpp
deleted file mode 100644
index 9617ee26ea8f..000000000000
--- a/games/7kaa/files/patch-src_client_OMUSIC.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/client/OMUSIC.cpp.orig	2015-05-19 01:00:20 UTC
-+++ src/client/OMUSIC.cpp
-@@ -81,7 +81,8 @@ Music::Music()
- // -------- begin of function Music::~Music ---------//
- Music::~Music()
- {
--	deinit();
-+	if (init_flag != 0)
-+		deinit();
- }
- // -------- end of function Music::~Music ---------//
- 
diff --git a/games/7kaa/files/patch-src_client_OSYS.cpp b/games/7kaa/files/patch-src_client_OSYS.cpp
deleted file mode 100644
index 13271ba44644..000000000000
--- a/games/7kaa/files/patch-src_client_OSYS.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/client/OSYS.cpp.orig	2016-09-04 17:31:41 UTC
-+++ src/client/OSYS.cpp
-@@ -240,6 +240,8 @@ void Sys::deinit()
- 
-    //-------------------------------------//
- 
-+   deinit_directx();
-+
-    init_flag = 0;
- }
- //--------- End of function Sys::deinit ---------//
diff --git a/games/7kaa/files/patch-src_video_sdl_vga__sdl.cpp b/games/7kaa/files/patch-src_video_sdl_vga__sdl.cpp
deleted file mode 100644
index 4ca7b3994035..000000000000
--- a/games/7kaa/files/patch-src_video_sdl_vga__sdl.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/video/sdl/vga_sdl.cpp.orig	2016-09-04 17:31:41 UTC
-+++ src/video/sdl/vga_sdl.cpp
-@@ -58,7 +58,8 @@ VgaSDL::VgaSDL()
- 
- VgaSDL::~VgaSDL()
- {
--   deinit();
-+   if (window != NULL)
-+      deinit();
- }
- //-------- End of function VgaSDL::~VgaSDL ----------//
-