FreedroidRPG: bump version

games-rpg/freedroidrpg/additional-files/freedroidrpg.rdef.in

@@ -0,0 +1,35 @@
+resource app_flags B_SINGLE_LAUNCH;
+
+resource app_version {
+	major  = @MAJOR@,
+	middle = @MIDDLE@,
+	minor  = 0,
+
+	variety = B_APPV_FINAL,
+	internal = 0,
+
+	short_info = "FreedroidRPG",
+	long_info = "@LONG_INFO@"
+};
+
+resource app_signature "@APP_SIGNATURE@";
+
+resource vector_icon array {
+	$"6E636966080500020006023CEBF13B809ABE0E713F6E504BD5FF4837B8004947"
+	$"47931A1A1A020106033DC0000000000000003DC00049600048400000F8F8F841"
+	$"F7E59BFFEABD0605FF020006033ABDF0B06C7F31F9F33C3FC74A3C824A82B120"
+	$"F3812569BE5805AAF38125020116023B40000000000000003B800048E0004A00"
+	$"0000FF3500020116023B40000000000000003B80004A90004A000000FF340005"
+	$"FF0A0614B6BFD7ECEE2E473E2C3A2A3E2E3630393A323634BDDDB9EB4031BF7D"
+	$"31C005314532C13CB9EB4B354E385239503654BE273D484F4BC69BC3D6C4D0C4"
+	$"6F49464AC2CCC42CC19EC36343474046C06E463E463D473B49BE2BC301BD32C3"
+	$"C8384B304BBA7FC494B88DC3CD0606FE0E364B3A49BCE2C3CFBE0BC2A74045BE"
+	$"AB45C0AC454649C174C2B6C2C3C3E74A4B4051485138510604EE3441383C343C"
+	$"3B3C3B413746BDE4C29233450604EE463F493C473C4D3C4D404B454E44454706"
+	$"082EB027602E542A58B9EEC65D324C37494E5254C5C1C607C816C96858600802"
+	$"533A5C3408022D3A24340604EE2433253425332535243523342335233308023D"
+	$"4A3E4D0802434A424D0C0A000200041001178300040A010104000A020100000A"
+	$"040101000A050102000A060103000A000206051001178200040A000107100117"
+	$"8300040A070107000A00010730582001178300040A0701072058200A01020809"
+	$"100117820004"
+};

games-rpg/freedroidrpg/freedroidrpg-1.0~rc2.recipe

@@ -18,13 +18,14 @@ People having - or trying to acquire - programming, map editing, or writing \
 skills will find FreedroidRPG to be an exciting, fast-moving project in which \
 they can fully express their creativity."
 HOMEPAGE="http://freedroid.org"
-COPYRIGHT="2002-2015 The Freedroid team"
+COPYRIGHT="2002-2019 The Freedroid team"
 LICENSE="GNU GPL v2"
-REVISION="7"
+REVISION="1"
-SOURCE_URI="ftp://ftp.osuosl.org/pub/freedroid/freedroidRPG-0.16/freedroidRPG-$portVersion.tar.gz"
+SOURCE_URI="ftp://ftp.osuosl.org/pub/freedroid/freedroidRPG-${portVersion%\~*}/freedroidRPG-${portVersion//\~}.tar.gz"
-CHECKSUM_SHA256="426df175034b12095e7498fd80c907e507667c960ee1da331d9e5566d1b09358"
+CHECKSUM_SHA256="feb3e8118422ce4a1c4a5b2b0b3095bee08ca8bdbb4ba25791095ed194b25382"
-SOURCE_DIR="freedroidrpg-$portVersion"
+SOURCE_DIR="freedroidrpg-1.0RC2"
 PATCHES="freedroidrpg-$portVersion.patchset"
+ADDITIONAL_FILES="freedroidrpg.rdef.in"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
@@ -43,6 +44,7 @@ REQUIRES="
 	freedroidrpg_data == $portVersion
 	haiku$secondaryArchSuffix
 	lib:libGL$secondaryArchSuffix
+	lib:libglew$secondaryArchSuffix
 	lib:libGLU$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
 	lib:libintl$secondaryArchSuffix
@@ -52,7 +54,6 @@ REQUIRES="
 	lib:libSDL_1.2$secondaryArchSuffix
 	lib:libSDL_gfx$secondaryArchSuffix
 	lib:libSDL_image_1.2$secondaryArchSuffix
-	#lib:libsdl_mixer$secondaryArchSuffix
 	lib:libvorbis$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
@@ -69,6 +70,7 @@ REQUIRES_data="
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libGL$secondaryArchSuffix
+	devel:libglew$secondaryArchSuffix
 	devel:libGLU$secondaryArchSuffix
 	devel:libiconv$secondaryArchSuffix
 	devel:libjpeg$secondaryArchSuffix
@@ -77,7 +79,6 @@ BUILD_REQUIRES="
 	devel:libSDL$secondaryArchSuffix
 	devel:libSDL_gfx$secondaryArchSuffix
 	devel:libSDL_image$secondaryArchSuffix
-	#devel:libsdl_mixer$secondaryArchSuffix
 	devel:libvorbis$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
@@ -118,7 +119,9 @@ BUILD()
 	autoconf
 	echo "=== automake"
 	automake
-	runConfigure ./configure --disable-sdltest --with-embedded-lua
+	runConfigure ./configure \
+		--disable-sdltest \
+		--with-embedded-lua
 	make $jobArgs
 }
 
@@ -127,10 +130,23 @@ INSTALL()
 	make install
 
 	mkdir -p $appsDir
+	mv $binDir/freedroidRPG $appsDir/FreedroidRPG
 
-	mv $binDir/freedroidRPG $appsDir
+	packageEntries data $dataDir
 
-	packageEntries data \
+	local APP_SIGNATURE="application/x-vnd.freedroidrpg"
-		$dataDir
+	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
-	addAppDeskbarSymlink $appsDir/freedroidRPG "FreedroidRPG"
+	local MIDDLE="`echo "$portVersion" | cut -d. -f2 | cut -d~ -f1`"
+	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/freedroidrpg.rdef.in > $sourceDir/freedroidrpg.rdef
+
+	addResourcesToBinaries  $sourceDir/freedroidrpg.rdef $appsDir/FreedroidRPG
+			
+	addAppDeskbarSymlink $appsDir/FreedroidRPG
 }

games-rpg/freedroidrpg/patches/configure.2.ac.patch

@@ -1,94 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 73a762a..faf7cb9 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -51,7 +51,7 @@ case "$target" in
- 
- 	*)
- 	CFLAGS="$CFLAGS  -DFD_DATADIR='\"\$(pkgdatadir)\"'"   #avoid expansion of $pkgdatadir !
--	LDFLAGS="$LDFLAGS -rdynamic"
-+	LDFLAGS="$LDFLAGS -lGL"
- 	SYS_GL_LIB=GL
- 	;;
- esac
-@@ -105,53 +105,24 @@ AM_PATH_SDL($SDL_VERSION,
- CFLAGS="$CFLAGS $SDL_CFLAGS"
- LIBS="$LIBS $SDL_LIBS"
- 
--AC_CHECK_LIB([jpeg], [jpeg_start_compress],,
--	AC_MSG_ERROR([libjpeg needed to run FreedroidRPG!
--see http://www.ijg.org/]))
-+AC_CHECK_LIB([jpeg], [jpeg_start_compress])
- 
--AC_CHECK_LIB([z], [compress],,
--	AC_MSG_ERROR([zlib is needed to run FreedroidRPG!
--see http://www.gzip.org/zlib/]))
-+AC_CHECK_LIB([z], [compress])
- 
--AC_CHECK_LIB([png], [png_read_png],,
--	AC_MSG_ERROR([libpng needed to run FreedroidRPG
--see http://www.libpng.org/pub/png/libpng.html]))
-+AC_CHECK_LIB([png], [png_read_png])
- 
--AC_CHECK_LIB([SDL_image], [IMG_LoadJPG_RW],,
--	AC_MSG_ERROR([SDL_image library needed for FreedroidRPG!
--see http://www.libsdl.org/]))
-+AC_CHECK_LIB([SDL_image], [IMG_LoadJPG_RW])
- 
--AC_CHECK_LIB([SDL_gfx], [zoomSurface],,
--	AC_MSG_ERROR([SDL_gfx library needed for FreedroidRPG!
--Please refer to the INSTALL file]))
-+AC_CHECK_LIB([SDL_gfx], [zoomSurface])
- 
- AC_MSG_NOTICE([[Checking for optional SDL libraries:]])
- summary_sound="yes"
--AC_CHECK_LIB([SDL_mixer], [Mix_ChannelFinished],, AC_MSG_WARN([
----------------------------------------------------
--libSDL_mixer not found!
--You need the SDL_mixer library (version >= 1.2.1) if you want sound!
--(see see http://www.libsdl.org/)
----> compiling without sound support
----------------------------------------------------])
--summary_sound="SDL_mixer not found")
-+AC_CHECK_LIB([SDL_mixer], [Mix_ChannelFinished])
- 
- if test x$want_vorbis = xyes; then
--AC_CHECK_LIB([ogg], [oggpack_read],, AC_MSG_WARN([
----------------------------------------------------
--libogg not found!
--You need the Ogg libs installed if you want
--Freedroid to be able to play Ogg files (e.g. the Intro theme)
----------------------------------------------------])
--summary_sound="no libogg")
-+AC_CHECK_LIB([ogg], [oggpack_read])
- 
--AC_CHECK_LIB([vorbis], [vorbis_block_init],, AC_MSG_WARN([
----------------------------------------------------
--libvorbis not found!
--You need the Vorbis libs installed if you want
--Freedroid to be able to play Ogg files (e.g. the Intro theme)
----------------------------------------------------])
--summary_sound="no libvorbis")
-+AC_CHECK_LIB([vorbis], [vorbis_block_init])
- else
- AC_DEFINE(HAVE_LIBOGG,0, [Define to 1 if ogg libs were found])
- AC_DEFINE(HAVE_LIBVORBIS,0, [Define to 1 if Vorbis libs were found])
-@@ -219,7 +190,17 @@ AC_TYPE_SIZE_T
- AC_HEADER_TIME
- 
- # Checks for library functions.
--AC_CHECK_FUNCS([alarm getcwd gettimeofday memset sqrt strstr strtok alphasort scandir nl_langinfo dirname])
-+AC_DEFINE([HAVE_ALARM],[1],[Haiku has alarm])
-+AC_DEFINE([HAVE_DIRNAME],[1],[Haiku has dirname])
-+AC_DEFINE([HAVE_GETCWD],[1],[Haiku has getcwd])
-+AC_DEFINE([HAVE_GETTIMEOFDAY],[1],[Haiku has gettimeofday])
-+AC_DEFINE([HAVE_STRSTR],[1],[Haiku has strstr])
-+AC_DEFINE([HAVE_STRTOK],[1],[Haiku has strtok])
-+AC_DEFINE([HAVE_SQRT],[1],[Haiku has sqrt])
-+AC_DEFINE([HAVE_MEMSET],[1],[Haiku has memset])
-+AC_DEFINE([HAVE_SCANDIR],[1],[Haiku has scandir])
-+AC_DEFINE([HAVE_ALPHASORT],[1],[Haiku has alphashort])
-+AC_DEFINE([PACKAGE_BUGREPORT],["http://github.com/haikuports/haikuports"],[Haikuports bugs])
- 
- if test x$want_backtrace = xyes; then
-    AC_CHECK_FUNCS([backtrace])

games-rpg/freedroidrpg/patches/configure.ac.patch

@@ -1,25 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index dad2e72..73a762a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -8,7 +8,7 @@ AC_CANONICAL_TARGET
- dnl Setup for automake
- AM_INIT_AUTOMAKE([tar-ustar dist-bzip2])
- 
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- 
- # Checks for programs.
- AC_PROG_CC
-@@ -17,9 +17,8 @@ AC_PROG_MAKE_SET
- 
- AC_HEADER_STDC
- # Checks for libraries.
--AC_CHECK_LIB([m], [sin],, 
--	AC_MSG_ERROR([libm not found!! 
--No maths library?? What kinda crazy system is that??]))
-+AC_CHECK_LIB(m, sin)
-+AC_SUBST(LIBM)
- 
- AC_PATH_X
- AC_PATH_XTRA

games-rpg/freedroidrpg/patches/freedroidrpg-0.16.1.patchset

@@ -1,22 +0,0 @@
-From 43aa0668062fd66325c5733bc3949926a1c7a248 Mon Sep 17 00:00:00 2001
-From: begasus <begasus@gmail.com>
-Date: Sat, 15 Jun 2019 12:25:55 +0200
-Subject: Don't pass -rdynamic on Haiku
-
-
-diff --git a/configure.ac b/configure.ac
-index 7f20cd4..b34b9c8 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -142,7 +142,7 @@ AS_CASE([$target],
- 		],
- 	[
- 		AS_VAR_APPEND([FD_CPPFLAGS], [" -DFD_DATADIR='\"\$(pkgdatadir)\"'"])
--		AS_VAR_APPEND([FD_LDFLAGS], [" -rdynamic -Wl,--as-needed"])
-+		AS_VAR_APPEND([FD_LDFLAGS], [" -Wl,--as-needed"])
- 		default_open_cmd="xdg-open"
- 	]
- )
--- 
-2.21.0
-

games-rpg/freedroidrpg/patches/freedroidrpg-1.0~rc2.patchset

@@ -0,0 +1,50 @@
+From 43aa0668062fd66325c5733bc3949926a1c7a248 Mon Sep 17 00:00:00 2001
+From: begasus <begasus@gmail.com>
+Date: Sat, 15 Jun 2019 12:25:55 +0200
+Subject: Don't pass -rdynamic on Haiku
+
+
+diff --git a/configure.ac b/configure.ac
+index 7f20cd4..b34b9c8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -142,7 +142,7 @@ AS_CASE([$target],
+ 		],
+ 	[
+ 		AS_VAR_APPEND([FD_CPPFLAGS], [" -DFD_DATADIR='\"\$(pkgdatadir)\"'"])
+-		AS_VAR_APPEND([FD_LDFLAGS], [" -rdynamic -Wl,--as-needed"])
++		AS_VAR_APPEND([FD_LDFLAGS], [" -Wl,--as-needed"])
+ 		default_open_cmd="xdg-open"
+ 	]
+ )
+-- 
+2.21.0
+
+
+From d47310759403a89a91dd5c3d0c6d4bc99e117130 Mon Sep 17 00:00:00 2001
+From: Gerasim Troeglazov <3dEyes@gmail.com>
+Date: Wed, 20 May 2020 15:58:43 +1000
+Subject: Fix settings dir
+
+
+diff --git a/src/init.c b/src/init.c
+index 315e107..c85f054 100644
+--- a/src/init.c
++++ b/src/init.c
+@@ -836,6 +836,13 @@ void prepare_execution(int argc, char *argv[])
+ 		sprintf(data_dirs[CONFIG_DIR].path, "./FreedroidRPG");
+ 	}
+ 
++#elif defined(__HAIKU__)
++
++	char *our_homedir = NULL;
++	if ((our_homedir = getenv("HOME")) == NULL)
++		our_homedir = ".";
++	snprintf(data_dirs[CONFIG_DIR].path, sizeof(data_dirs[CONFIG_DIR].path), "%s/config/settings/FreedroidRPG", our_homedir);
++
+ #else
+ 
+ 	char *our_homedir = NULL;
+-- 
+2.26.0
+