From 9222e4c9f6b6f994f71fd2d3d8e24ef442580f6c Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Sat, 25 May 2019 18:40:48 +0200
Subject: [PATCH] freegish, fix reference for libpng16, cleanup (#3865)

* freegish, fix reference for libpng16, cleanup
---
 .../freegish/additional-files/freegish.rdef   | 39 +++++++++
 games-arcade/freegish/freegish-1.0.recipe     | 58 --------------
 .../freegish/freegish-1.0~20170110.recipe     | 79 +++++++++++++++++++
 3 files changed, 118 insertions(+), 58 deletions(-)
 create mode 100644 games-arcade/freegish/additional-files/freegish.rdef
 delete mode 100644 games-arcade/freegish/freegish-1.0.recipe
 create mode 100644 games-arcade/freegish/freegish-1.0~20170110.recipe

diff --git a/games-arcade/freegish/additional-files/freegish.rdef b/games-arcade/freegish/additional-files/freegish.rdef
new file mode 100644
index 000000000..131358646
--- /dev/null
+++ b/games-arcade/freegish/additional-files/freegish.rdef
@@ -0,0 +1,39 @@
+resource app_flags B_SINGLE_LAUNCH | B_ARGV_ONLY;
+
+resource app_version {
+	major  = @MAJOR@,
+	middle = @MIDDLE@,
+	minor  = @MINOR@,
+	variety = B_APPV_FINAL,
+	internal = 0,
+	short_info = "FreeGish",
+	long_info = "A free version of the game Gish"
+};
+
+resource app_signature "application/x-vnd.freegish";
+
+resource vector_icon {
+	$"6E636966070400AB05000398959503FF003B03FF000004FF460400460A0204BF"
+	$"99C656B9DFC656C553C656C9D3C748C9D3C6C1C9D3C7D0BF99C83BC553C83BB9"
+	$"DFC83BB55FC748B55FC7D0B55FC6C10204BF99C656B9DFC656C553C656C9D3C7"
+	$"48C9D3C6C1C9D3C7D0BF99C83BC553C83BB9DFC83BB55FC748B55FC7D0B55FC6"
+	$"C10208C677BB67C553BA0BC820BD62CAECC222CB07BF6BCAD2C4A1C66AC721C8"
+	$"B8C71FC26DC722BA11C730BE21C774B523C6DFB41BC1DAB417C4E0B41FBF17B8"
+	$"8CBB87B635BD7ABAC8B9AABDDFB718BBDCB7EBBF73B674C2E6B77CC15EB6B6C4"
+	$"6BB83F0208C677BB67C553BA0BC820BD62CAECC222CB07BF6BCAD2C4A1C66AC7"
+	$"21C8B8C71FC26DC722BA11C730BE21C774B523C6DFB41BC1DAB417C4E0B41FBF"
+	$"17B88CBB87B635BD7ABAC8B9AABDDFB718BBDCB7EBBF73B674C2E6B77CC15EB6"
+	$"B6C46BB83F0802BAB9C041BDBEC0740802BAB9C041BDBEC0740802C1F6C138C4"
+	$"7CC1880802C1F6C138C47CC188020CC577BE5DC5B0BE22C53BBE9AC485BEB6C4"
+	$"DBBEB9C423BEB1C37BBE38C3C3BE7AC2DFBDA9C23DBC13C2D7BCA5C19CBB7BBF"
+	$"ECBAE5C091BB7ABFB2BAB1BF6CBA21BF7BBA6D3FB9CABF9DB91BBF6430BFDAB8"
+	$"D0C0ABB8AAC049B8AEC112B8A7C1D0B90EC17FB8CEC279B994C32ABB34C292BA"
+	$"99C3C3BBD0C54EBC9EC4BABBFDC585BCDAC5C4BD74C5BCBD23C5CBBDC5020CC5"
+	$"77BE5DC5B0BE22C53BBE9AC485BEB6C4DBBEB9C423BEB1C37BBE38C3C3BE7AC2"
+	$"DFBDA9C23DBC13C2D7BCA5C19CBB7BBFECBAE5C091BB7ABFB2BAB1BF6CBA21BF"
+	$"7BBA6D3FB9CABF9DB91BBF6430BFDAB8D0C0ABB8AAC049B8AEC112B8A7C1D0B9"
+	$"0EC17FB8CEC279B994C32ABB34C292BA99C3C3BBD0C54EBC9EC4BABBFDC585BC"
+	$"DAC5C4BD74C5BCBD23C5CBBDC50A0A000100000A0001011001178320040A0101"
+	$"02000A0201031001178120040A030104000A0401051001178520040A04010600"
+	$"0A0401071001178520040A050108000A060109100117842004"
+};
diff --git a/games-arcade/freegish/freegish-1.0.recipe b/games-arcade/freegish/freegish-1.0.recipe
deleted file mode 100644
index 1ba3504c5..000000000
--- a/games-arcade/freegish/freegish-1.0.recipe
+++ /dev/null
@@ -1,58 +0,0 @@
-SUMMARY="A free version of the game Gish"
-DESCRIPTION="FreeGish is an open-source, freely redistributable version of Gish, a \
-physics-based platforming game featuring a ball of tar."
-HOMEPAGE="https://github.com/freegish/freegish"
-COPYRIGHT="2012-2014 Joris van de Donk"
-LICENSE="GNU GPL v2"
-REVISION="2"
-SOURCE_URI="https://github.com/freegish/freegish/archive/f53d9153.zip"
-CHECKSUM_SHA256="2d5e0f9d24ddc648e4cdf45adf50043ec13ecd991da61166d670f4be74447665"
-SOURCE_DIR="freegish-f53d915381c2dd9889dbebdff0541b04c6065067"
-PATCHES="freegish-1.0.patchset"
-
-ARCHITECTURES="?x86 ?x86_gcc2 ?x86_64"
-
-PROVIDES="
-	freegish = $portVersion
-	app:FreeGish = $portVersion
-	"
-REQUIRES="
-	haiku
-	lib:libogg
-	lib:libopenal
-	lib:libpng
-	lib:libsdl
-	lib:libvorbis
-	lib:libz
-	"
-
-BUILD_REQUIRES="
-	haiku_devel
-	devel:libogg
-	devel:libopenal
-	devel:libpng
-	devel:libsdl
-	devel:libvorbis
-	devel:libz
-	"
-BUILD_PREREQUIRES="
-	cmd:cmake
-	cmd:gcc
-	cmd:make
-	"
-
-BUILD()
-{
-	mkdir -p build && cd build
-	cmake .. -DDATAPATH='"$appsDir"'
-	make
-}
-
-INSTALL()
-{
-	cd ..
-	mkdir -p $appsDir/FreeGish
-	cp -r  freegish-f53d915381c2dd9889dbebdff0541b04c6065067/* $appsDir/FreeGish
-	mv $appsDir/FreeGish/freegish $appsDir/FreeGish/FreeGish
-	addAppDeskbarSymlink $appsDir/FreeGish/FreeGish
-}
diff --git a/games-arcade/freegish/freegish-1.0~20170110.recipe b/games-arcade/freegish/freegish-1.0~20170110.recipe
new file mode 100644
index 000000000..d0a8b89ec
--- /dev/null
+++ b/games-arcade/freegish/freegish-1.0~20170110.recipe
@@ -0,0 +1,79 @@
+SUMMARY="A free version of the game Gish"
+DESCRIPTION="FreeGish is an open-source, freely redistributable version of Gish, a \
+physics-based platforming game featuring a ball of tar."
+HOMEPAGE="https://github.com/freegish/freegish"
+COPYRIGHT="2012-2014 Joris van de Donk"
+LICENSE="GNU GPL v2"
+REVISION="1"
+srcGitRev="8795cd7adc95957883f2d3465eb9036a774667a7"
+SOURCE_URI="https://github.com/freegish/freegish/archive/$srcGitRev.tar.gz"
+CHECKSUM_SHA256="d19dfb679832e55fba50479455badc22e44e572131651198b7d9e411f7e589e8"
+SOURCE_FILENAME="freegish-$portVersion-$srGitRev.tar.gz"
+SOURCE_DIR="freegish-8795cd7adc95957883f2d3465eb9036a774667a7"
+PATCHES="freegish-1.0.patchset"
+ADDITIONAL_FILES="freegish.rdef"
+
+ARCHITECTURES="?x86 ?x86_gcc2 ?x86_64"
+
+PROVIDES="
+	freegish = $portVersion
+	app:FreeGish = $portVersion
+	"
+REQUIRES="
+	haiku
+	lib:libGL
+	lib:libogg
+	lib:libopenal
+	lib:libpng16
+	lib:libSDL_1.2
+	lib:libvorbis
+	lib:libz
+	"
+
+BUILD_REQUIRES="
+	haiku_devel
+	devel:libogg
+	devel:libopenal
+	devel:libpng16
+	devel:libSDL
+	devel:libvorbis
+	devel:libz
+	"
+BUILD_PREREQUIRES="
+	cmd:cmake
+	cmd:gcc
+	cmd:make
+	"
+
+BUILD()
+{
+	mkdir -p build && cd build
+	cmake .. -DCMAKE_INSTALL_PREFIX=$prefix \
+		-DBIN_DIR=$appsDir \
+		-DDATA_DIR=$dataDir/freegish \
+		-DMAN_DIR=$manDir
+	make
+}
+
+INSTALL()
+{
+	cd build
+	make install
+	rm -rf $prefix/share
+
+	mv $appsDir/freegish $appsDir/FreeGish
+
+	local MAJOR="1"
+	local MIDDLE="0"
+	local MINOR="0"
+	sed \
+		-e "s|@MAJOR@|$MAJOR|" \
+		-e "s|@MIDDLE@|$MIDDLE|" \
+		-e "s|@MINOR@|$MINOR|" \
+		$portDir/additional-files/freegish.rdef > freegish.rdef
+
+	addResourcesToBinaries freegish.rdef \
+		$appsDir/FreeGish
+
+	addAppDeskbarSymlink $appsDir/FreeGish
+}