From c2537b5478f1d9b703493bffa62d0bbe871ec691 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Tue, 18 Sep 2018 22:08:07 +1000
Subject: [PATCH] Neverball: fix build * add icons for apps * remove ald recipe
 * fix settings path

---
 .../additional-files/neverball.rdef.in        | 31 ++++++++++
 .../additional-files/neverputt.rdef.in        | 44 +++++++++++++
 games-puzzle/neverball/neverball-1.5.4.recipe | 62 -------------------
 games-puzzle/neverball/neverball-1.6.0.recipe | 60 +++++++++++++++---
 .../neverball/patches/neverball-1.5.4.patch   | 13 ----
 .../patches/neverball-1.6.0.patchset          | 40 +++++++++++-
 6 files changed, 163 insertions(+), 87 deletions(-)
 create mode 100644 games-puzzle/neverball/additional-files/neverball.rdef.in
 create mode 100644 games-puzzle/neverball/additional-files/neverputt.rdef.in
 delete mode 100644 games-puzzle/neverball/neverball-1.5.4.recipe
 delete mode 100644 games-puzzle/neverball/patches/neverball-1.5.4.patch

diff --git a/games-puzzle/neverball/additional-files/neverball.rdef.in b/games-puzzle/neverball/additional-files/neverball.rdef.in
new file mode 100644
index 000000000..91de2f967
--- /dev/null
+++ b/games-puzzle/neverball/additional-files/neverball.rdef.in
@@ -0,0 +1,31 @@
+resource app_flags B_SINGLE_LAUNCH;
+
+resource app_version {
+	major  = @MAJOR@,
+	middle = @MIDDLE@,
+	minor  = @MINOR@,
+
+	variety = B_APPV_FINAL,
+	internal = 0,
+
+	short_info = "Neverball",
+	long_info = "@LONG_INFO@"
+};
+
+resource app_signature "@APP_SIGNATURE@";
+
+resource vector_icon array {
+	$"6E6369660505E4054F0400330500040084040206BB66B576BA2FB5F9BCC3B4E2"
+	$"BFBBB497BE3FB497392B3649363D2E48B4BCBE0B2746B4B9BE21B4B0BE4DB4B4"
+	$"BE37B4FCBBC2B81AB79BB63DB95AB910B6B40207374B3857434D5842514AC9EA"
+	$"C0B45C3D5C3DCB03BF6ACACEC0CFCAE4BFF2CA9EC2B7C8D3C622C9EFC492C7C4"
+	$"C7A4C4ADC9B2C653C8E0C325CA76BFB9CADBC16FCADB3B57020FBFBBB497392A"
+	$"C1A5B496C539B60CC390B518C79EB766CA4FBC4AC979B9ACCA81BCEBCABFBE36"
+	$"CAABBD8FCABCBE36CAB3BE34CAB6BE34CAB3BE34CAB8BE16CAB8BE165B415843"
+	$"5A414D4A374B444D3854405C3B58BD535CB8F7C892BAE3CA0CB789C77BB5A0C4"
+	$"68B661C609B518C346B4A3C0CEB4C5C20DB490BFF9B4B0BE4DB494BF22B4B4BE"
+	$"37B4BCBE0BB4B9BE21244336492E4ABBC5C0AF02044030C34530BC3A30304030"
+	$"BC3A30C3454050BC3A50C34550504050C34550BC3A050A040103024100000000"
+	$"000000003EA000C600004A08000A0301031241C00000000000000041C000C980"
+	$"00C9800001158100040A000100000A000101000A01010200"
+};
diff --git a/games-puzzle/neverball/additional-files/neverputt.rdef.in b/games-puzzle/neverball/additional-files/neverputt.rdef.in
new file mode 100644
index 000000000..06c5ab51c
--- /dev/null
+++ b/games-puzzle/neverball/additional-files/neverputt.rdef.in
@@ -0,0 +1,44 @@
+resource app_flags B_SINGLE_LAUNCH;
+
+resource app_version {
+	major  = @MAJOR@,
+	middle = @MIDDLE@,
+	minor  = @MINOR@,
+
+	variety = B_APPV_FINAL,
+	internal = 0,
+
+	short_info = "Neverputt",
+	long_info = "@LONG_INFO@"
+};
+
+resource app_signature "@APP_SIGNATURE@";
+
+resource vector_icon array {
+	$"6E6369660705E4054F040033050003E14D4D0400840200160238B64E3BA5EFBB"
+	$"3EF93869C34B2E204A9D0400FFFF81050206BB66B576BA2FB5F9BCC3B4E2BFBB"
+	$"B497BE3FB497392B364A363E2E49B4BCBE0B2746B4B9BE21B4B0BE4DB4B4BE37"
+	$"B4FCBBC2B81AB79BB63DB95AB910B6B40207364B3757424D5842514AC9EAC0B4"
+	$"5C3D5C3DCB03BF6ACACEC0CFCAE4BFF2CA9EC2B7C8D3C622C9EFC492C7C4C7A4"
+	$"C4ADC9B2C653C8E0C325CA76BFB9CADBC16FCADB3B57020FBFBBB497392AC1A5"
+	$"B496C539B60CC390B518C79EB766CA4FBC4AC979B9ACCA81BCEBCABFBE36CAAB"
+	$"BD8FCABCBE36CAB3BE34CAB6BE34CAB3BE34CAB8BE16CAB8BE165B4158435A41"
+	$"4D4A374B444D3854405C3B58BD535CB8F7C892BAE3CA0CB789C77BB5A0C468B6"
+	$"61C609B518C346B4A3C0CEB4C5C20DB490BFF9B4B0BE4DB494BF22B4B4BE37B4"
+	$"BCBE0BB4B9BE21244336492E4ABBC5C0AF02044030C34530BC3A30304030BC3A"
+	$"30C3454050BC3A50C34550504050C34550BC3A021AB7C4B5C8B7DDB648B7A9B4"
+	$"F8B959B4B1B89FB44EB9E7B4ECBA25B612B9FDB591BAC7B844BC0EBCA8BB6BBA"
+	$"76BC39BD39BC8FBE5BBC5FBDCBBCE9BF86BDA4C1DABD31C0B7BE0FC2D1BFB2C4"
+	$"33BEBBC3BAC029C46BC131C475C0AEC47DC291C467C53EC3BAC3EFC428C665C3"
+	$"4EC8D5C2E6C798C2ECC956C2E1CA23C382C9D1C321CABEC444CAB7C640CAF4C5"
+	$"50CA8AC6D0C9E6C7D1CA41C758C91FC8D2C6CAC9E1C7F9C976C4A5CAA1C019CA"
+	$"D1C25ACAC6BDD3CACEB958C9FABB88CA9CB822C99EB5EDC861B6F1C922B560C7"
+	$"F7B4ADC6C3B4DBC772B460C5D9B598C451B4F5C4EFB609C3EBB743C3C2B6A7C3"
+	$"922DC40DB9BDC528B8DAC4CEBA23C550BAF7C4FFBAA3C54BBB55C4A9BB75C3AA"
+	$"BB6CC423BB7BC308BB3BC1CABB6BC265BABDC01AB9C2BCBABA41BE6AB93DBAE6"
+	$"B82CB73FB8B3B913B809B6C3070A050103024100000000000000003EA000C600"
+	$"004A08000A0301031241C00000000000000041C000C98000C980000115810004"
+	$"0A000100000A000101000A040102000A030104123F88150000000000003FDDC6"
+	$"BF11DEBFBDA701158400040A060104023F88150000000000003FDDC6BF11DEBF"
+	$"BDA7"
+};
diff --git a/games-puzzle/neverball/neverball-1.5.4.recipe b/games-puzzle/neverball/neverball-1.5.4.recipe
deleted file mode 100644
index 8117de96d..000000000
--- a/games-puzzle/neverball/neverball-1.5.4.recipe
+++ /dev/null
@@ -1,62 +0,0 @@
-SUMMARY="Tilt the floor to roll a ball through an course before time runs out"
-DESCRIPTION="Neverball is part puzzle game, part action game, and entirely a \
-test of skill. Tilt the floor to roll a ball through an obstacle course \
-before time runs out."
-HOMEPAGE="https://neverball.org"
-COPYRIGHT="2002-2010 The Neverball Team"
-LICENSE="GNU GPL v2"
-REVISION="2"
-SOURCE_URI="http://neverball.org/neverball-1.5.4.tar.gz"
-CHECKSUM_SHA256="ea31ca9f6eec70c8e66eaa20d7ce9e48295fdb077313b97637c503b16b7b0da6"
-PATCHES="neverball-1.5.4.patch"
-
-ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
-SECONDARY_ARCHITECTURES="x86"
-
-PROVIDES="
-	neverball$secondaryArchSuffix = $portVersion
-	app:neverball$secondaryArchSuffix = $portVersion
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	lib:libintl$secondaryArchSuffix
-	lib:libjpeg$secondaryArchSuffix
-	lib:libogg$secondaryArchSuffix
-	lib:libphysfs$secondaryArchSuffix
-	lib:libpng$secondaryArchSuffix
-	lib:libsdl$secondaryArchSuffix
-	lib:libsdl_mixer$secondaryArchSuffix
-	lib:libsdl_ttf$secondaryArchSuffix
-	lib:libvorbis$secondaryArchSuffix
-	"
-
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	devel:libjpeg$secondaryArchSuffix
-	devel:libogg$secondaryArchSuffix
-	devel:libphysfs$secondaryArchSuffix
-	devel:libpng$secondaryArchSuffix
-	devel:libsdl$secondaryArchSuffix
-	devel:libsdl_mixer$secondaryArchSuffix
-	devel:libsdl_ttf$secondaryArchSuffix
-	devel:libvorbis$secondaryArchSuffix
-	"
-BUILD_PREREQUIRES="
-	gettext$secondaryArchSuffix # it's needed
-	cmd:gcc$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix
-	cmd:libpng_config$secondaryArchSuffix
-	cmd:make
-	"
-
-BUILD()
-{
-	make
-}
-
-INSTALL()
-{
-	mkdir -p $appsDir/neverball
-	cp -rf neverball neverputt mapc README COPYING CHANGES data $appsDir/neverball
-	addAppDeskbarSymlink $appsDir/neverball/neverball
-}
diff --git a/games-puzzle/neverball/neverball-1.6.0.recipe b/games-puzzle/neverball/neverball-1.6.0.recipe
index 204aff302..0c6be0eb7 100644
--- a/games-puzzle/neverball/neverball-1.6.0.recipe
+++ b/games-puzzle/neverball/neverball-1.6.0.recipe
@@ -1,16 +1,19 @@
-SUMMARY="Tilt the floor to roll a ball through an course before time runs out"
-DESCRIPTION="Neverball is part puzzle game, part action game, and entirely a \
-test of skill. Tilt the floor to roll a ball through an obstacle course \
-before time runs out."
+SUMMARY="Clone of Super Monkey Ball using SDL/OpenGL"
+DESCRIPTION="Tilt the  floor to roll a  ball through an obstacle  course within the \
+given  time.  If  the  ball falls  or time  expires, a ball is lost. \
+Collect coins to unlock the exit and earn extra balls."
 HOMEPAGE="https://neverball.org"
-COPYRIGHT="2002-2010 The Neverball Team"
+COPYRIGHT="2002-2014 The Neverball Team"
 LICENSE="GNU GPL v2"
-REVISION="3"
+REVISION="4"
 SOURCE_URI="https://neverball.org/neverball-$portVersion.tar.gz"
 CHECKSUM_SHA256="73fe63cca4f96e2d355480d03bc0b2904e83a0abdf65fe8c52db5cc3cca88fa0"
 PATCHES="neverball-$portVersion.patchset"
+ADDITIONAL_FILES="neverball.rdef.in
+	neverputt.rdef.in
+	"
 
-ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
@@ -19,6 +22,7 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
+	lib:libfreetype$secondaryArchSuffix
 	lib:libGL$secondaryArchSuffix
 	lib:libintl$secondaryArchSuffix
 	lib:libjpeg$secondaryArchSuffix
@@ -60,7 +64,43 @@ BUILD()
 
 INSTALL()
 {
-	mkdir -p $appsDir/neverball
-	cp -rf neverball neverputt mapc README.md LICENSE.md data $appsDir/neverball
-	addAppDeskbarSymlink $appsDir/neverball/neverball
+	mkdir -p $appsDir/Neverball
+	cp -rf mapc README.md LICENSE.md data $appsDir/Neverball
+	cp -f neverball $appsDir/Neverball/Neverball
+	cp -f neverputt $appsDir/Neverball/Neverputt
+
+	local APP_SIGNATURE="application/x-vnd.the-neverball"
+	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
+	local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
+	local MINOR="`echo "$portVersion" | cut -d. -f3`"
+	local LONG_INFO="$SUMMARY"
+	sed \
+		-e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \
+		-e "s|@MAJOR@|$MAJOR|" \
+		-e "s|@MIDDLE@|$MIDDLE|" \
+		-e "s|@MINOR@|$MINOR|" \
+		-e "s|@LONG_INFO@|$LONG_INFO|" \
+		$portDir/additional-files/neverball.rdef.in > $sourceDir/neverball.rdef
+
+	addResourcesToBinaries  $sourceDir/neverball.rdef \
+		$appsDir/Neverball/Neverball
+
+	local APP_SIGNATURE="application/x-vnd.the-neverputt"
+	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
+	local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
+	local MINOR="`echo "$portVersion" | cut -d. -f3`"
+	local LONG_INFO="$SUMMARY"
+	sed \
+		-e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \
+		-e "s|@MAJOR@|$MAJOR|" \
+		-e "s|@MIDDLE@|$MIDDLE|" \
+		-e "s|@MINOR@|$MINOR|" \
+		-e "s|@LONG_INFO@|$LONG_INFO|" \
+		$portDir/additional-files/neverputt.rdef.in > $sourceDir/neverputt.rdef
+
+	addResourcesToBinaries  $sourceDir/neverputt.rdef \
+		$appsDir/Neverball/Neverputt	
+
+	addAppDeskbarSymlink $appsDir/Neverball/Neverball
+	addAppDeskbarSymlink $appsDir/Neverball/Neverputt
 }
diff --git a/games-puzzle/neverball/patches/neverball-1.5.4.patch b/games-puzzle/neverball/patches/neverball-1.5.4.patch
deleted file mode 100644
index 60a118e94..000000000
--- a/games-puzzle/neverball/patches/neverball-1.5.4.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Makefile b/Makefile
-index a22fed1..e095a3a 100644
---- a/Makefile
-+++ b/Makefile
-@@ -111,7 +111,7 @@ ifeq ($(ENABLE_WII),1)
-     TILT_LIBS := -lcwiimote -lbluetooth
- endif
- 
--OGL_LIBS := -lGL -lm
-+OGL_LIBS := -lGL -lintl
- 
- ifdef MINGW
-     ifneq ($(ENABLE_NLS),0)
diff --git a/games-puzzle/neverball/patches/neverball-1.6.0.patchset b/games-puzzle/neverball/patches/neverball-1.6.0.patchset
index 6cb2249e7..9b81211a4 100644
--- a/games-puzzle/neverball/patches/neverball-1.6.0.patchset
+++ b/games-puzzle/neverball/patches/neverball-1.6.0.patchset
@@ -1,4 +1,4 @@
-From d1faefc900634563eef70b315a3f0c5662ec0a8a Mon Sep 17 00:00:00 2001
+From 663d56b68aeaaad06dbf701fb80d0d5382e13cf8 Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Thu, 7 Aug 2014 17:17:36 +0000
 Subject: haiku patch
@@ -27,5 +27,41 @@ index 815e50c..39a5dd6 100644
  ALL_LIBS := $(HMD_LIBS) $(TILT_LIBS) $(INTL_LIBS) $(TTF_LIBS) \
  	$(OGG_LIBS) $(SDL_LIBS) $(OGL_LIBS) $(BASE_LIBS)
 -- 
-1.8.3.4
+2.19.0
+
+
+From f9ae82ef990d2c24c92c6841a032a23bf55074a7 Mon Sep 17 00:00:00 2001
+From: Gerasim Troeglazov <3dEyes@gmail.com>
+Date: Tue, 18 Sep 2018 22:04:56 +1000
+Subject: Fix settings path
+
+
+diff --git a/Makefile b/Makefile
+index 39a5dd6..820bb7d 100644
+--- a/Makefile
++++ b/Makefile
+@@ -17,6 +17,10 @@ ifeq ($(shell uname), Darwin)
+ 	PLATFORM := darwin
+ endif
+ 
++ifeq ($(shell uname), Haiku)
++	PLATFORM := haiku
++endif
++
+ #------------------------------------------------------------------------------
+ # Paths (packagers might want to set DATADIR and LOCALEDIR)
+ 
+@@ -24,6 +28,10 @@ USERDIR   := .neverball
+ DATADIR   := ./data
+ LOCALEDIR := ./locale
+ 
++ifeq ($(PLATFORM),haiku)
++	USERDIR := /config/settings/neverball
++endif
++
+ ifeq ($(PLATFORM),mingw)
+ 	USERDIR := Neverball
+ endif
+-- 
+2.19.0