diff --git a/games-simulation/simutrans/patches/simutrans-120.3.patchset b/games-simulation/simutrans/patches/simutrans-120.3.patchset deleted file mode 100644 index 877fcd356..000000000 --- a/games-simulation/simutrans/patches/simutrans-120.3.patchset +++ /dev/null @@ -1,28 +0,0 @@ -From 9a405cc969daa5702721d833f3c7e7f4dde45d70 Mon Sep 17 00:00:00 2001 -From: none -Date: Fri, 4 Jan 2019 23:21:49 +0100 -Subject: Bugfix: add ',' at end of line to re-enable building under Haiku - - -diff --git a/simsys.cc b/simsys.cc -index a0a5f95..ab7fa44 100644 ---- a/simsys.cc -+++ b/simsys.cc -@@ -408,12 +408,12 @@ const char *dr_query_fontpath(int which) - "/boot/system/non-packaged/data/fonts/", - "/boot/home/config/non-packaged/data/fonts/", - "~/config/non-packaged/data/fonts/", -- "/boot/system/data/fonts/ttfonts/" -+ "/boot/system/data/fonts/ttfonts/", - #else - "~/.fonts/", - "~/.local/share/fonts/", - "/usr/share/fonts/truetype/", -- "/usr/X11R6/lib/X11/fonts/ttfonts/" -+ "/usr/X11R6/lib/X11/fonts/ttfonts/", - "/usr/local/sharefonts/truetype/", - "/usr/share/fonts/", - "/usr/X11R6/lib/X11/fonts/", --- -2.19.1 - diff --git a/games-simulation/simutrans/patches/simutrans-120.4.1.patchset b/games-simulation/simutrans/patches/simutrans-120.4.1.patchset deleted file mode 100644 index be3c5a109..000000000 --- a/games-simulation/simutrans/patches/simutrans-120.4.1.patchset +++ /dev/null @@ -1,63 +0,0 @@ -From 66e56fe20495c0ab6a4d6fce498fba137c3812b7 Mon Sep 17 00:00:00 2001 -From: none -Date: Fri, 4 Jan 2019 19:45:50 +0100 -Subject: Bugfix: add ',' at end of line to re-enable building under Haiku - - -diff --git a/simsys.cc b/simsys.cc -index 83a46bc..9e7a939 100644 ---- a/simsys.cc -+++ b/simsys.cc -@@ -406,7 +406,7 @@ const char *dr_query_fontpath(int which) - "/boot/system/non-packaged/data/fonts/", - "/boot/home/config/non-packaged/data/fonts/", - "~/config/non-packaged/data/fonts/", -- "/boot/system/data/fonts/ttfonts/" -+ "/boot/system/data/fonts/ttfonts/", - #else - "~/.fonts/", - "~/.local/share/fonts/", --- -2.26.0 - - -From ba6584cf663d367331cd86a199d6560b1aa72e57 Mon Sep 17 00:00:00 2001 -From: Ken Mays -Date: Tue, 19 Jan 2021 07:23:10 +0100 -Subject: Fix uint handling under Haiku - - -diff --git a/simtypes.h b/simtypes.h -index 482fc50..7eb6430 100644 ---- a/simtypes.h -+++ b/simtypes.h -@@ -7,6 +7,7 @@ - #define SIMTYPES_H - - #include "utils/for.h" -+#include - - #if defined _MSC_VER - # if _MSC_VER <= 1200 -@@ -155,14 +156,18 @@ typedef unsigned int uint32; - #else - // BeOS: int!=long (even though both 32 bit) - typedef signed long sint32; -+#ifndef __HAIKU__ - #ifndef NO_UINT32_TYPES - typedef unsigned long uint32; - #endif - #endif -+#endif - typedef signed long long sint64; -+#ifndef __HAIKU__ - #ifndef NO_UINT64_TYPES - typedef unsigned long long uint64; - #endif -+#endif - #ifdef _MSC_VER - # define GCC_PACKED - # define GCC_ALIGN(a) --- -2.26.0 - diff --git a/games-simulation/simutrans/patches/simutrans-122.0.patchset b/games-simulation/simutrans/patches/simutrans-122.0.patchset new file mode 100644 index 000000000..bb56c77b5 --- /dev/null +++ b/games-simulation/simutrans/patches/simutrans-122.0.patchset @@ -0,0 +1,74 @@ +From fa13abc3706cfa8ea8ef130a026c5e65cfbf4eef Mon Sep 17 00:00:00 2001 +From: Ken Mays +Date: Fri, 4 Jan 2019 19:45:50 +0100 +Subject: Fix DT_DIR handling under Haiku + + +diff --git a/sys/simsys.cc b/sys/simsys.cc +index 1ba72c4..d63a62e 100644 +--- a/sys/simsys.cc ++++ b/sys/simsys.cc +@@ -470,7 +470,12 @@ const char *dr_query_fontpath(int which) + // look for subdirectories + struct dirent *entry; + while( (entry = readdir( dir )) ) { ++#ifdef __HAIKU__ ++ struct stat sp; ++ if( S_ISDIR(sp.st_mode )) { ++#else + if( entry->d_type == DT_DIR ) { ++#endif + if( ((strcmp( entry->d_name, "." )) != 0) && ((strcmp( entry->d_name, ".." )) != 0) ) { + j++; + if( subdir_offset < j ) { +-- +2.30.2 + + +From c29b78f02c8b0ae734a08c8d71294f067feed183 Mon Sep 17 00:00:00 2001 +From: Ken Mays +Date: Fri, 4 Jan 2019 19:45:50 +0100 +Subject: Fix UINT type handling under Haiku + + +diff --git a/simtypes.h b/simtypes.h +index 2f687ec..9fa48aa 100644 +--- a/simtypes.h ++++ b/simtypes.h +@@ -9,6 +9,7 @@ + + #include "utils/for.h" + #include ++#include + + #ifndef PATH_MAX + #ifdef MAX_PATH +@@ -169,19 +170,25 @@ typedef unsigned short uint16; + #ifndef __BEOS__ + typedef signed int sint32; + #ifndef NO_UINT32_TYPES ++#ifndef __HAIKU__ + typedef unsigned int uint32; + #endif ++#endif + #else + // BeOS: int!=long (even though both 32 bit) + typedef signed long sint32; + #ifndef NO_UINT32_TYPES ++#ifndef __HAIKU__ + typedef unsigned long uint32; + #endif + #endif ++#endif + typedef signed long long sint64; + #ifndef NO_UINT64_TYPES ++#ifndef __HAIKU__ + typedef unsigned long long uint64; + #endif ++#endif + #ifdef _MSC_VER + # define GCC_PACKED + # define GCC_ALIGN(a) +-- +2.30.2 + diff --git a/games-simulation/simutrans/simutrans-120.3.recipe b/games-simulation/simutrans/simutrans-120.3.recipe deleted file mode 100644 index 6d7d8fbca..000000000 --- a/games-simulation/simutrans/simutrans-120.3.recipe +++ /dev/null @@ -1,93 +0,0 @@ -SUMMARY="A transport simulation game" -DESCRIPTION="Simutrans is a freeware and open-source transportation \ -simulator. Your goal is to establish a successful transport company. \ -Transport passengers, mail and goods by rail, road, ship, and even air. \ -Interconnect districts, cities, public buildings, industries and \ -tourist attractions by building a transport network you always dreamed \ -of." -HOMEPAGE="http://www.simutrans.com" -COPYRIGHT="1997-2004 Hj. Malthaner - 2005-2018 The Simutrans Team" -LICENSE="Artistic" -REVISION="1" -SvnRevision="8504" -GitRevision="a7b09e3b7af67d14a1602fa4ca809e94172d0db3" -SOURCE_URI="https://github.com/aburch/simutrans/archive/$GitRevision.tar.gz" -CHECKSUM_SHA256="4e1f418fe6efbd85af34176b5c75158943d2248c06366e566a2c91a94e4ace79" -SOURCE_FILENAME="simutrans-$portVersion.tar.gz" -SOURCE_DIR="simutrans-$GitRevision" -PATCHES="simutrans-$portVersion.patchset" -SOURCE_URI_2="https://downloads.sourceforge.net/project/simutrans/simutrans/120-3/simutrans-src-120-3.zip" -CHECKSUM_SHA256_2="6f68785798688bf956b0d7f5971a8d8fa42d12199011665b07b903164cb3929f" -SOURCE_FILENAME_2="simutrans-sf-$portVersion.zip" -SOURCE_DIR_2="" - -ARCHITECTURES="!x86_gcc2 ?x86 x86_64" -SECONDARY_ARCHITECTURES="?x86" - -PROVIDES=" - simutrans$secondaryArchSuffix = $portVersion - app:simutrans$secondaryArchSuffix = $portVersion - " -REQUIRES=" - haiku$secondaryArchSuffix - simutrans_pakset >= 120.3 - timgmsoundfont - lib:libbz2$secondaryArchSuffix - lib:libfreetype$secondaryArchSuffix - lib:libgl$secondaryArchSuffix - lib:libminiupnpc$secondaryArchSuffix - lib:libpng16$secondaryArchSuffix - lib:libSDL_1.2$secondaryArchSuffix - lib:libSDL_mixer_1.2$secondaryArchSuffix - lib:libz$secondaryArchSuffix - " -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - devel:libbz2$secondaryArchSuffix - devel:libfreetype$secondaryArchSuffix - devel:libminiupnpc$secondaryArchSuffix - devel:libpng16$secondaryArchSuffix - devel:libSDL_1.2$secondaryArchSuffix - devel:libSDL_mixer_1.2$secondaryArchSuffix - devel:libz$secondaryArchSuffix - " -BUILD_PREREQUIRES=" - cmd:aclocal - cmd:autoreconf - cmd:g++$secondaryArchSuffix - cmd:gcc$secondaryArchSuffix - cmd:ld$secondaryArchSuffix - cmd:make - cmd:pkg_config$secondaryArchSuffix - cmd:sdl_config$secondaryArchSuffix >= 1.2 - cmd:strip$secondaryArchSuffix - " - -GLOBAL_WRITABLE_FILES=" - non-packaged/$relativeAppsDir/simutrans/config directory keep-old - " - -BUILD() -{ - autoreconf configure.ac - export CFLAGS+=-DREVISION=$SvnRevision - runConfigure ./configure - make $jobArgs - strip sim -} - -INSTALL() -{ - cp $sourceDir2/simutrans/text/*.tab simutrans/text/ - cp sim simutrans/simutrans - mkdir -p $appsDir/simutrans - mkdir -p $prefix/non-packaged/$relativeAppsDir/simutrans/config - cp -r simutrans $appsDir/ - mv $appsDir/simutrans/config \ - $prefix/non-packaged/$relativeAppsDir/simutrans/ - ln -s $prefix/non-packaged/$relativeAppsDir/simutrans/config \ - $appsDir/simutrans/config - - addAppDeskbarSymlink $appsDir/simutrans/simutrans "Simutrans" -} diff --git a/games-simulation/simutrans/simutrans-120.4~nightly.recipe b/games-simulation/simutrans/simutrans-120.4~nightly.recipe deleted file mode 100644 index 77ee719e2..000000000 --- a/games-simulation/simutrans/simutrans-120.4~nightly.recipe +++ /dev/null @@ -1,93 +0,0 @@ -SUMMARY="A transport simulation game" -DESCRIPTION="Simutrans is an open-source transportation simulation game \ -available for Windows, Mac, Linux and BeOS. Your goal is to establish a \ -successful transport company and build the necessary infrastructure to \ -transport passengers, mail and goods between cities, factories and \ -touristic attractions by land, air and water. -Nightly builds are versions only for debugging and testing. They may contain \ -changes which make your savegames unreadable by any official version, or \ -bugs that will destroy your game, or not even run. They are for bug testing \ -only." -HOMEPAGE="http://www.simutrans.com" -COPYRIGHT="1997-2004 Hj. Malthaner - 2005-2019 The Simutrans Team" -LICENSE="Artistic" -REVISION="1" -SOURCE_URI="svn://servers.simutrans.org/simutrans/trunk" -SOURCE_FILENAME="simutrans-$portVersion" -SOURCE_DIR="" - -ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64" -SECONDARY_ARCHITECTURES="?x86" - -GLOBAL_WRITABLE_FILES=" - non-packaged/$relativeAppsDir/simutrans/config directory keep-old - " - -PROVIDES=" - simutrans$secondaryArchSuffix = $portVersion - app:simutrans$secondaryArchSuffix = $portVersion - " -REQUIRES=" - haiku$secondaryArchSuffix - simutrans_pakset$secondaryArchSuffix >= 120.4 - timgmsoundfont - lib:libbz2$secondaryArchSuffix - lib:libfreetype$secondaryArchSuffix - lib:libGL$secondaryArchSuffix - lib:libltdl$secondaryArchSuffix - lib:libminiupnpc$secondaryArchSuffix - lib:libpng16$secondaryArchSuffix - lib:libSDL2_2.0$secondaryArchSuffix - lib:libSDL2_mixer_2.0$secondaryArchSuffix - lib:libtxc_dxtn$secondaryArchSuffix - lib:libz$secondaryArchSuffix - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - devel:libbz2$secondaryArchSuffix - devel:libfreetype$secondaryArchSuffix - devel:libltdl$secondaryArchSuffix - devel:libminiupnpc$secondaryArchSuffix - devel:libpng16$secondaryArchSuffix - devel:libSDL2_2.0$secondaryArchSuffix - devel:libSDL2_mixer_2.0$secondaryArchSuffix - devel:libz$secondaryArchSuffix - " -BUILD_PREREQUIRES=" - cmd:aclocal - cmd:autoreconf - cmd:curl - cmd:g++$secondaryArchSuffix - cmd:gcc$secondaryArchSuffix - cmd:ld$secondaryArchSuffix - cmd:make - cmd:pkg_config$secondaryArchSuffix - cmd:sdl2_config$secondaryArchSuffix >= 2.0 - cmd:strip$secondaryArchSuffix - cmd:svn - " - -BUILD() -{ - autoreconf configure.ac - runConfigure ./configure - ./get_lang_files.sh - make $jobArgs - strip sim -} - -INSTALL() -{ - cp sim simutrans/simutrans - mkdir -p $appsDir/simutrans - mkdir -p $prefix/non-packaged/$relativeAppsDir/simutrans/config - cp -r simutrans $appsDir/ - mv $appsDir/simutrans/config \ - $prefix/non-packaged/$relativeAppsDir/simutrans/ - ln -s $prefix/non-packaged/$relativeAppsDir/simutrans/config \ - $appsDir/simutrans/config - - addAppDeskbarSymlink $appsDir/simutrans/simutrans "Simutrans" -} diff --git a/games-simulation/simutrans/simutrans-120.4.1.recipe b/games-simulation/simutrans/simutrans-122.0.recipe similarity index 78% rename from games-simulation/simutrans/simutrans-120.4.1.recipe rename to games-simulation/simutrans/simutrans-122.0.recipe index 19786bfcf..2ddf64592 100644 --- a/games-simulation/simutrans/simutrans-120.4.1.recipe +++ b/games-simulation/simutrans/simutrans-122.0.recipe @@ -1,4 +1,4 @@ -SUMMARY="A transport simulation game" +SUMMARY="A transportation simulation game" DESCRIPTION="Simutrans is a freeware and open-source transportation \ simulator. Your goal is to establish a successful transport company. \ Transport passengers, mail and goods by rail, road, ship, and even air. \ @@ -7,23 +7,19 @@ tourist attractions by building a transport network you always dreamed \ of." HOMEPAGE="http://www.simutrans.com" COPYRIGHT="1997-2004 Hj. Malthaner - 2005-2018 The Simutrans Team" + 2005-2021 The Simutrans Team" LICENSE="Artistic" -REVISION="2" -SvnRevision="8600" -GitRevision="89498c762ffb8c709167a875b2de836af50f608e" +REVISION="1" +SvnRevision="9901" +GitRevision="f3841f0a7fafc47d4d6d85372bdd2be4335434a0" SOURCE_URI="https://github.com/aburch/simutrans/archive/$GitRevision.tar.gz" -CHECKSUM_SHA256="65ae302ca96aeb25e99b70908e814e82fa411e78143da5ae8a6ceb72d7ce8f9b" -SOURCE_FILENAME="simutrans-$portVersion.tar.gz" +CHECKSUM_SHA256="838feb8a8781001b326c4790f11c84e62d525d1feb137112ed33d0e9d8a111ad" +SOURCE_FILENAME="simutrans-$GitRevision.tar.gz" SOURCE_DIR="simutrans-$GitRevision" PATCHES="simutrans-$portVersion.patchset" -SOURCE_URI_2="https://downloads.sourceforge.net/project/simutrans/simutrans/120-4-1/simutrans-src-120-4-1.zip" -CHECKSUM_SHA256_2="2cee0d067b3b72fa3a8b4ff31ad2bf5fc77521e7ba8cf9aa10e07e56b7dc877b" -SOURCE_FILENAME_2="simutrans-sf-$portVersion.zip" -SOURCE_DIR_2="" -ARCHITECTURES="!x86_gcc2 ?x86 x86_64" -SECONDARY_ARCHITECTURES="x86" +ARCHITECTURES="!x86_gcc2 x86_64" +SECONDARY_ARCHITECTURES="?x86" PROVIDES=" simutrans$secondaryArchSuffix = $portVersion @@ -82,7 +78,6 @@ BUILD() INSTALL() { - cp $sourceDir2/simutrans/text/*.tab simutrans/text/ cp sim simutrans/simutrans mkdir -p $appsDir/simutrans mkdir -p $prefix/non-packaged/$relativeAppsDir/simutrans/config