fheroes2: bump version

games-rpg/fheroes2/fheroes2-r3279.recipe

@@ -4,20 +4,19 @@ SDL is used. Free Heroes 2 is a turn based strategy video game.
 The original game was voted the sixth best PC game of all time by PC Gamer \
 magazine in May 1997."
 HOMEPAGE="https://sourceforge.net/projects/fheroes2/"
-COPYRIGHT="2006-2013 Andrey Afletdinov"
+COPYRIGHT="2006-2015 Andrey Afletdinov"
 LICENSE="GNU GPL v2"
-REVISION="2"
-SOURCE_URI="https://sourceforge.net/projects/fheroes2/files/fheroes2/fheroes2-src-r3182.tgz/download"
-CHECKSUM_SHA256="1a64dafc5b9e6c37683509f151fa7fdbc6fe0ad95da437a15d275f24b93bda2e"
-SOURCE_DIR="fheroes-src"
-PATCHES="fheroes2-r3182.patch"
+REVISION="1"
+SOURCE_URI="https://sourceforge.net/code-snapshots/svn/f/fh/fheroes2/code/fheroes2-code-$portVersion-trunk.zip"
+CHECKSUM_SHA256="250bf73ce8f4b1ab69b3d63ecd0727e10196f86d5e42b34bae78ce574e34c3c1"
+SOURCE_DIR="fheroes2-code-$portVersion-trunk"
+PATCHES="fheroes2-$portVersion.patchset"
 
-ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	fheroes2$secondaryArchSuffix = $portVersion
-	app:fheroes2$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -25,11 +24,11 @@ REQUIRES="
 	lib:libiconv$secondaryArchSuffix
 	lib:libintl$secondaryArchSuffix
 	lib:libogg$secondaryArchSuffix
-	lib:libpng$secondaryArchSuffix
-	lib:libsdl$secondaryArchSuffix
+	lib:libpng16$secondaryArchSuffix
+	lib:libsdl_1.2$secondaryArchSuffix
 	lib:libsdl_image$secondaryArchSuffix
 	lib:libsdl_mixer$secondaryArchSuffix
-	lib:libsdl_net$secondaryArchSuffix
+	lib:libsdl_net_1.2$secondaryArchSuffix
 	lib:libsdl_ttf$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
@@ -40,30 +39,35 @@ BUILD_REQUIRES="
 	devel:libgettextlib$secondaryArchSuffix
 	devel:libiconv$secondaryArchSuffix
 	devel:libogg$secondaryArchSuffix
-	devel:libpng$secondaryArchSuffix
-	devel:libsdl$secondaryArchSuffix
+	devel:libpng16$secondaryArchSuffix
+	devel:libsdl_1.2$secondaryArchSuffix
 	devel:libsdl_image$secondaryArchSuffix
 	devel:libsdl_mixer$secondaryArchSuffix
-	devel:libsdl_net$secondaryArchSuffix
+	devel:libsdl_net_1.2$secondaryArchSuffix
 	devel:libsdl_ttf$secondaryArchSuffix
+	devel:libvorbis$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
-	cmd:libpng_config$secondaryArchSuffix
 	cmd:make
 	"
 
 BUILD()
 {
-	make
+	cd fheroes2
+	make $jobArgs
 }
 
 INSTALL()
 {
-	fhDir=$appsDir/fheroes2/
-	mkdir -p $fhDir
-	cp -rf data files image maps README fheroes2* $fhDir
-	addAppDeskbarSymlink $fhDir/fheroes2 "Free Heroes 2"
+	mkdir -p $appsDir/FHeroes2
+
+	cd fheroes2
+	cp -rf fheroes2* README $appsDir/FHeroes2
+	cp -rf files $appsDir/FHeroes2
+	mv $appsDir/FHeroes2/fheroes2 "$appsDir/FHeroes2/Free Heroes 2"
+
+	addAppDeskbarSymlink "$appsDir/FHeroes2/Free Heroes 2"
 }

games-rpg/fheroes2/patches/fheroes2-r3182.patch

@@ -1,15 +0,0 @@
-diff --git a/src/Makefile b/src/Makefile
-index 430c5ab..481eecf 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -70,6 +70,10 @@ endif
- ifeq ($(OS),Linux)
- PLATFORM := all
- endif
-+ifeq ($(OS),Haiku)
-+PLATFORM := all
-+LIBS := -lintl -liconv
-+endif
- endif
- 
- include Makefile.$(PLATFORM)

games-rpg/fheroes2/patches/fheroes2-r3279.patchset

@@ -0,0 +1,22 @@
+From 93a2bfd4f37f0b337a3d498b1c63ad93313f09a4 Mon Sep 17 00:00:00 2001
+From: Sergei Reznikov <diver@gelios.net>
+Date: Wed, 30 Jan 2019 15:37:22 +0300
+Subject: Add missing libs
+
+
+diff --git a/fheroes2/src/Makefile b/fheroes2/src/Makefile
+index 967b32f..72f9a86 100644
+--- a/fheroes2/src/Makefile
++++ b/fheroes2/src/Makefile
+@@ -94,7 +94,7 @@ PLATFORM := all
+ endif
+ ifeq ($(OS),Haiku)
+ PLATFORM := all
+-LIBS := -liconv
++LIBS := -liconv -lpng -lz -lSDL -lSDL_mixer -lSDL_image -lSDL_ttf
+ endif
+ endif
+ 
+-- 
+2.19.1
+