diff --git a/games-simulation/simutrans/patches/simutrans-nightly.patchset b/games-simulation/simutrans/patches/simutrans-nightly.patchset deleted file mode 100644 index 07b314c6b..000000000 --- a/games-simulation/simutrans/patches/simutrans-nightly.patchset +++ /dev/null @@ -1,76 +0,0 @@ -From 03547db5cb4f0ee90d5fa739eabbc182c4445772 Mon Sep 17 00:00:00 2001 -From: none -Date: Fri, 29 May 2015 08:17:51 +0200 -Subject: adjust Makefile for Haiku x86_64 and prepare configure.ac for - enabling multithread in Haiku - - -diff --git a/Makefile b/Makefile -index aa0d57b..1df85ca 100644 ---- a/Makefile -+++ b/Makefile -@@ -53,8 +53,7 @@ else - else - # Haiku (needs to activate the GCC 4x) - ifeq ($(OSTYPE),haiku) -- setarch x86 -- LIBS += -lnetwork -lbe -llocale -+ LIBS += -lnetwork -lbe - endif - endif - endif -@@ -114,7 +113,9 @@ ifneq ($(MULTI_THREAD),) - #use lpthreadGC2d for debug alternatively - LDFLAGS += -lpthreadGC2 - else -- LDFLAGS += -lpthread -+ ifneq ($(OSTYPE),haiku) -+ LDFLAGS += -lpthread -+ endif - endif - endif - endif -diff --git a/configure.ac b/configure.ac -index 85d5afd..d1e9b83 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -16,7 +16,7 @@ AC_CHECK_LIB(bz2, BZ2_bzReadOpen, [], [AC_MSG_WARN([Error, libbz2 is missing!])] - AC_CHECK_LIB(freetype2, load_FT_font, [AC_SUBST(freetype2, '-DUSE_FREETYPE')], [AC_SUBST(freetype2, '')] ) - - # optional (but highly recommended) multithreading --AC_CHECK_LIB(pthread, pthread_mutex_destroy, [AC_SUBST(multithread, 1)], [AC_SUBST(multithread, 0)] ) -+AC_SEARCH_LIBS(pthread_mutex_destroy, pthread, [AC_SUBST(multithread, 1)], [AC_SUBST(multithread, 0)] ) - - # find OS and backend by libs ... - AC_CHECK_LIB(SDL2, SDL_GetRenderDriverInfo) -diff --git a/simsys.cc b/simsys.cc -index e4dc228..2ef7bac 100644 ---- a/simsys.cc -+++ b/simsys.cc -@@ -7,7 +7,9 @@ - #ifdef __HAIKU__ - #include - #include -+#include - #define NO_UINT32_TYPES -+#define NO_UINT64_TYPES - #endif - - #include "macros.h" -diff --git a/simtypes.h b/simtypes.h -index cedbbec..912e95d 100644 ---- a/simtypes.h -+++ b/simtypes.h -@@ -131,7 +131,9 @@ typedef unsigned long uint32; - #endif - #endif - typedef signed long long sint64; -+#ifndef NO_UINT64_TYPES - typedef unsigned long long uint64; -+#endif - #ifdef _MSC_VER - # define GCC_PACKED - # define GCC_ALIGN(a) --- -1.8.3.4 - diff --git a/games-simulation/simutrans/simutrans-nightly.recipe b/games-simulation/simutrans/simutrans-nightly.recipe index 1a6f57f40..bf2af2f7c 100644 --- a/games-simulation/simutrans/simutrans-nightly.recipe +++ b/games-simulation/simutrans/simutrans-nightly.recipe @@ -16,7 +16,7 @@ SOURCE_DIR="trunk" COPYRIGHT="1997-2004 Hj. Malthaner 2005-2015 The Simutrans Team" LICENSE="Artistic" -REVISION="1" +REVISION="2" ARCHITECTURES="?x86 x86_64" if [ $effectiveTargetArchitecture != x86_gcc2 ]; then # x86_gcc2 is fine as primary target architecture as long as we're building @@ -24,7 +24,6 @@ if [ $effectiveTargetArchitecture != x86_gcc2 ]; then ARCHITECTURES="$ARCHITECTURES x86_gcc2" fi SECONDARY_ARCHITECTURES="x86" -PATCHES="simutrans-$portVersion.patchset" PROVIDES=" simutrans$secondaryArchSuffix = $portVersion " diff --git a/games-util/makeobj/makeobj-nightly.recipe b/games-util/makeobj/makeobj-nightly.recipe index ad4f8fe73..9e67584b7 100644 --- a/games-util/makeobj/makeobj-nightly.recipe +++ b/games-util/makeobj/makeobj-nightly.recipe @@ -11,7 +11,7 @@ SOURCE_DIR="trunk" COPYRIGHT="1997-2004 Hj. Malthaner 2005-2015 The Simutrans Team" LICENSE="Artistic" -REVISION="1" +REVISION="2" ARCHITECTURES="?x86 x86_64" if [ $effectiveTargetArchitecture != x86_gcc2 ]; then # x86_gcc2 is fine as primary target architecture as long as we're building @@ -19,7 +19,6 @@ if [ $effectiveTargetArchitecture != x86_gcc2 ]; then ARCHITECTURES="$ARCHITECTURES x86_gcc2" fi SECONDARY_ARCHITECTURES="x86" -PATCHES="makeobj-$portVersion.patchset" PROVIDES=" makeobj$secondaryArchSuffix = $portVersion cmd:makeobj$secondaryArchSuffix = 55.4 diff --git a/games-util/makeobj/patches/makeobj-nightly.patchset b/games-util/makeobj/patches/makeobj-nightly.patchset deleted file mode 100644 index 07b314c6b..000000000 --- a/games-util/makeobj/patches/makeobj-nightly.patchset +++ /dev/null @@ -1,76 +0,0 @@ -From 03547db5cb4f0ee90d5fa739eabbc182c4445772 Mon Sep 17 00:00:00 2001 -From: none -Date: Fri, 29 May 2015 08:17:51 +0200 -Subject: adjust Makefile for Haiku x86_64 and prepare configure.ac for - enabling multithread in Haiku - - -diff --git a/Makefile b/Makefile -index aa0d57b..1df85ca 100644 ---- a/Makefile -+++ b/Makefile -@@ -53,8 +53,7 @@ else - else - # Haiku (needs to activate the GCC 4x) - ifeq ($(OSTYPE),haiku) -- setarch x86 -- LIBS += -lnetwork -lbe -llocale -+ LIBS += -lnetwork -lbe - endif - endif - endif -@@ -114,7 +113,9 @@ ifneq ($(MULTI_THREAD),) - #use lpthreadGC2d for debug alternatively - LDFLAGS += -lpthreadGC2 - else -- LDFLAGS += -lpthread -+ ifneq ($(OSTYPE),haiku) -+ LDFLAGS += -lpthread -+ endif - endif - endif - endif -diff --git a/configure.ac b/configure.ac -index 85d5afd..d1e9b83 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -16,7 +16,7 @@ AC_CHECK_LIB(bz2, BZ2_bzReadOpen, [], [AC_MSG_WARN([Error, libbz2 is missing!])] - AC_CHECK_LIB(freetype2, load_FT_font, [AC_SUBST(freetype2, '-DUSE_FREETYPE')], [AC_SUBST(freetype2, '')] ) - - # optional (but highly recommended) multithreading --AC_CHECK_LIB(pthread, pthread_mutex_destroy, [AC_SUBST(multithread, 1)], [AC_SUBST(multithread, 0)] ) -+AC_SEARCH_LIBS(pthread_mutex_destroy, pthread, [AC_SUBST(multithread, 1)], [AC_SUBST(multithread, 0)] ) - - # find OS and backend by libs ... - AC_CHECK_LIB(SDL2, SDL_GetRenderDriverInfo) -diff --git a/simsys.cc b/simsys.cc -index e4dc228..2ef7bac 100644 ---- a/simsys.cc -+++ b/simsys.cc -@@ -7,7 +7,9 @@ - #ifdef __HAIKU__ - #include - #include -+#include - #define NO_UINT32_TYPES -+#define NO_UINT64_TYPES - #endif - - #include "macros.h" -diff --git a/simtypes.h b/simtypes.h -index cedbbec..912e95d 100644 ---- a/simtypes.h -+++ b/simtypes.h -@@ -131,7 +131,9 @@ typedef unsigned long uint32; - #endif - #endif - typedef signed long long sint64; -+#ifndef NO_UINT64_TYPES - typedef unsigned long long uint64; -+#endif - #ifdef _MSC_VER - # define GCC_PACKED - # define GCC_ALIGN(a) --- -1.8.3.4 -