From 9a93917c76654a09bf79df053d6f59c1cb49ce71 Mon Sep 17 00:00:00 2001
From: bra1nwave <brainwave@openmailbox.org>
Date: Wed, 25 Jul 2018 17:18:29 +0000
Subject: [PATCH] freeciv: update to 2.6.0. (#1184)

---
 srcpkgs/freeciv/template | 52 +++++++++++++++++++---------------------
 1 file changed, 25 insertions(+), 27 deletions(-)

diff --git a/srcpkgs/freeciv/template b/srcpkgs/freeciv/template
index e833f4b8935..01058d672aa 100644
--- a/srcpkgs/freeciv/template
+++ b/srcpkgs/freeciv/template
@@ -1,21 +1,19 @@
 # Template file for 'freeciv'
 pkgname=freeciv
-version=2.5.11
+version=2.6.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --enable-fcdb=sqlite3 --enable-fcmp=all
- --enable-sys-lua --enable-client=all"
+ --enable-client=all"
 hostmakedepends="pkg-config"
-makedepends="bzip2-devel liblzma-devel sqlite-devel freetype-devel
- libXpm-devel libXaw-devel libXt-devel libXmu-devel
- SDL_mixer-devel SDL_image-devel SDL_gfx-devel SDL_ttf-devel
- gtk+-devel gtk+3-devel libcurl-devel lua52-devel"
+makedepends="SDL2_gfx-devel SDL2_image-devel SDL2_mixer-devel SDL2_ttf-devel gtk+-devel
+ gtk+3-devel libXaw-devel libcurl-devel lua-devel"
 short_desc="Free and Open Source empire-building strategy game - server/data"
 maintainer="bra1nwave <brainwave@openmailbox.org>"
 license="GPL-2.0-or-later"
 homepage="http://freeciv.org/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=4c9c526952fe977cb4b302b8ccf75798fd066c6dde670f72f677fe4964259aad
+checksum=7c20399198d6c7d846fed9a69b02e01134ae5340a3ae0f99d1e38063ade6c999
 
 subpackages="freeciv-gtk2 freeciv-gtk3 freeciv-sdl freeciv-xaw"
 if [ -z "$CROSS_BUILD" ]; then
@@ -32,48 +30,48 @@ freeciv-gtk2_package() {
 	short_desc="Free and Open Source empire-building strategy game - GTK+ client"
 	depends="${sourcepkg}-${version}_${revision}"
 	pkg_install() {
-		vmove usr/bin/*gtk2*
-		vmove usr/share/appdata/*gtk2*
-		vmove usr/share/man/man6/*gtk2*
-		vmove usr/share/applications/*gtk2*
+		vmove "usr/bin/*gtk2*"
+		vmove "usr/share/appdata/*gtk2*"
+		vmove "usr/share/man/man6/*gtk2*"
+		vmove "usr/share/applications/*gtk2*"
 	}
 }
 freeciv-gtk3_package() {
 	short_desc="Free and Open Source empire-building strategy game - GTK+3 client"
 	depends="${sourcepkg}-${version}_${revision}"
 	pkg_install() {
-		vmove usr/bin/*gtk3*
-		vmove usr/share/appdata/*gtk3*
-		vmove usr/share/man/man6/*gtk3*
-		vmove usr/share/applications/*gtk3*
-		vmove usr/share/applications/freeciv.desktop
+		vmove "usr/bin/*gtk3*"
+		vmove "usr/share/appdata/*gtk3*"
+		vmove "usr/share/man/man6/*gtk3*"
+		vmove "usr/share/applications/*gtk3*"
+		vmove "usr/share/applications/freeciv.desktop"
 	}
 }
 freeciv-qt5_package() {
 	short_desc="Free and Open Source empire-building strategy game - Qt5 client"
 	depends="${sourcepkg}-${version}_${revision}"
 	pkg_install() {
-		vmove usr/bin/*qt*
-		vmove usr/share/appdata/*qt*
-		vmove usr/share/man/man6/*qt*
-		vmove usr/share/applications/*qt*
+		vmove "usr/bin/*qt*"
+		vmove "usr/share/appdata/*qt*"
+		vmove "usr/share/man/man6/*qt*"
+		vmove "usr/share/applications/*qt*"
 	}
 }
 freeciv-sdl_package() {
-	short_desc="Free and Open Source empire-building strategy game - SDL client"
+	short_desc="Free and Open Source empire-building strategy game - SDL2 client"
 	depends="${sourcepkg}-${version}_${revision}"
 	pkg_install() {
-		vmove usr/bin/*sdl*
-		vmove usr/share/appdata/*sdl*
-		vmove usr/share/man/man6/*sdl*
-		vmove usr/share/applications/*sdl*
+		vmove "usr/bin/*sdl*"
+		vmove "usr/share/appdata/*sdl*"
+		vmove "usr/share/man/man6/*sdl*"
+		vmove "usr/share/applications/*sdl*"
 	}
 }
 freeciv-xaw_package() {
 	short_desc="Free and Open Source empire-building strategy game - X11 client"
 	depends="${sourcepkg}-${version}_${revision}"
 	pkg_install() {
-		vmove usr/bin/*xaw*
-		vmove usr/share/man/man6/*xaw*
+		vmove "usr/bin/*xaw*"
+		vmove "usr/share/man/man6/*xaw*"
 	}
 }