From c65514bab5953d0dcfacb485ae32bbf0c9327a41 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Thu, 24 Aug 2017 10:10:09 +0000
Subject: [PATCH] freeciv: bump version (#1580)

---
 .../{freeciv-2.5.7.recipe => freeciv-2.5.8.recipe}  | 13 ++++++++-----
 ...reeciv-2.5.7.patchset => freeciv-2.5.8.patchset} |  0
 2 files changed, 8 insertions(+), 5 deletions(-)
 rename games-strategy/freeciv/{freeciv-2.5.7.recipe => freeciv-2.5.8.recipe} (91%)
 rename games-strategy/freeciv/patches/{freeciv-2.5.7.patchset => freeciv-2.5.8.patchset} (100%)

diff --git a/games-strategy/freeciv/freeciv-2.5.7.recipe b/games-strategy/freeciv/freeciv-2.5.8.recipe
similarity index 91%
rename from games-strategy/freeciv/freeciv-2.5.7.recipe
rename to games-strategy/freeciv/freeciv-2.5.8.recipe
index 67c8fd161..eab860147 100644
--- a/games-strategy/freeciv/freeciv-2.5.7.recipe
+++ b/games-strategy/freeciv/freeciv-2.5.8.recipe
@@ -13,7 +13,7 @@ COPYRIGHT="1996-2016 The Freeciv Team"
 LICENSE="GNU GPL v2"
 REVISION="1"
 SOURCE_URI="http://downloads.sourceforge.net/project/freeciv/Freeciv%202.5/$portVersion/freeciv-$portVersion.tar.bz2"
-CHECKSUM_SHA256="ffe36736db6a64893681e9eea8b90f7abe05eaebe6b777e82149a98cad6dbed2"
+CHECKSUM_SHA256="6781e655c514d0a86975c87235de24f740cbdf81f33711d68a910b360963bd30"
 ADDITIONAL_FILES="freeciv.rdef.in"
 PATCHES="freeciv-$portVersion.patchset"
 
@@ -36,7 +36,9 @@ REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libbz2$secondaryArchSuffix
 	lib:libcurl$secondaryArchSuffix
+	lib:libcrypto$secondaryArchSuffix
 	lib:libfreetype$secondaryArchSuffix
+	lib:libGL$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
 	lib:libintl$secondaryArchSuffix
 	lib:liblua$secondaryArchSuffix
@@ -47,6 +49,7 @@ REQUIRES="
 	lib:libsdl_image_1.2$secondaryArchSuffix
 	lib:libsdl_mixer_1.2$secondaryArchSuffix
 	lib:libsdl_ttf_2.0$secondaryArchSuffix
+	lib:libssl$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
@@ -90,8 +93,8 @@ INSTALL()
 {
 	make install
 
-	mkdir -p $appsDir/Freeciv
-	mv $binDir/freeciv-sdl $appsDir/Freeciv/Freeciv
+	mkdir -p $appsDir
+	mv $binDir/freeciv-sdl $appsDir/Freeciv
 
 	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
 	local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
@@ -105,9 +108,9 @@ INSTALL()
 		$portDir/additional-files/freeciv.rdef.in > freeciv.rdef
 
 	addResourcesToBinaries freeciv.rdef \
-		$appsDir/Freeciv/Freeciv
+		$appsDir/Freeciv
 
-	addAppDeskbarSymlink $appsDir/Freeciv/Freeciv
+	addAppDeskbarSymlink $appsDir/Freeciv
 	mv $prefix/share/* $dataRootDir
 	rm -rf $prefix/share
 
diff --git a/games-strategy/freeciv/patches/freeciv-2.5.7.patchset b/games-strategy/freeciv/patches/freeciv-2.5.8.patchset
similarity index 100%
rename from games-strategy/freeciv/patches/freeciv-2.5.7.patchset
rename to games-strategy/freeciv/patches/freeciv-2.5.8.patchset