Christian Weisgerber writes:
> Martin Vahlensieck:
>
> > Rather mechanical fix for -fno-common.
>
> This would be a great opportunity to update the port to the latest
> release 1.90 instead of letting the obsolete version sit there.
I gave it a try, but got stuck at link time.
undefined reference to `__stack_chk_fail'?
undefined reference to `__errno_location'??
undefined reference to `stdin'???
I have no idea.
Index: Makefile
===================================================================
RCS file: /cvs/ports/games/oolite/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- Makefile 26 Feb 2021 18:20:33 -0000 1.24
+++ Makefile 7 Mar 2021 08:31:15 -0000
@@ -1,21 +1,20 @@
-# $OpenBSD: Makefile,v 1.24 2021/02/26 18:20:33 naddy Exp $
+# $OpenBSD: Makefile.template,v 1.90 2021/02/25 21:59:27 sthen Exp $
COMMENT= space combat and trading game in the style of Elite
-VERSION= 1.73.4
-REVISION = 16
-DISTNAME= oolite-dev-source-${VERSION}
+VERSION = 1.90
+DISTNAME = oolite-source-${VERSION}
PKGNAME= oolite-${VERSION}
CATEGORIES= games
HOMEPAGE= http://www.oolite.org/
-MAINTAINER= Nicholas Marriott <n...@openbsd.org>
-
# GPLv2
PERMIT_PACKAGE= Yes
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=oolite-linux.berlios/}
+FIX_EXTRACT_PERMISSIONS = Yes
+
+MASTER_SITES = https://github.com/OoliteProject/oolite/releases/download/$V/
EXTRACT_SUFX= .tar.bz2
MODULES= x11/gnustep
@@ -27,26 +26,9 @@ LIB_DEPENDS= devel/sdl-mixer \
WANTLIB += c GL GLU SDL SDL_mixer png
WANTLIB += ${COMPILER_LIBCXX}
-MAKE_FILE = Makefile
MAKE_FLAGS = LD="${CC}"
-ALL_TARGET= release
-FIX_CRLF_FILES = GNUmakefile.postamble \
- Makefile \
- src/Core/Debug/OODebugTCPConsoleClient.m \
- src/Core/Materials/OOPNGTextureLoader.m \
- src/Core/OOAsyncQueue.m \
- src/Core/OOCPUInfo.h \
- src/Core/OOCacheManager.m \
- src/Core/OOLogHeader.m \
- src/Core/OOLogOutputHandler.m \
- src/Core/OOMaths.h \
- src/Core/OOPriorityQueue.m \
- src/Core/OXPVerifier/OOCheckRequiresPListVerifierStage.m \
- src/Core/OXPVerifier/OOOXPVerifierStage.m \
- src/Core/OldSchoolPropertyListWriting.m \
- src/Core/Scripting/OOJSOolite.m \
- src/SDL/OOSDLSoundMixer.m
+USE_GMAKE = Yes
do-install:
${INSTALL_PROGRAM} ${WRKBUILD}/oolite.app/oolite ${PREFIX}/bin
Index: distinfo
===================================================================
RCS file: /cvs/ports/games/oolite/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 25 Apr 2013 16:40:44 -0000 1.2
+++ distinfo 7 Mar 2021 08:31:15 -0000
@@ -1,2 +1,2 @@
-SHA256 (oolite-dev-source-1.73.4.tar.bz2) =
na/9vog5IHJSIvI+wqoQGSa97ygc/mLEE7PP9KEMMAc=
-SIZE (oolite-dev-source-1.73.4.tar.bz2) = 37486680
+SHA256 (oolite-source-1.90.tar.bz2) =
dJAjlL5fbbFUQM5M9FSfQAnFDX4zUS+MmhV9lX/ay5E=
+SIZE (oolite-source-1.90.tar.bz2) = 151686958
Index: patches/patch-GNUmakefile
===================================================================
RCS file: /cvs/ports/games/oolite/patches/patch-GNUmakefile,v
retrieving revision 1.3
diff -u -p -r1.3 patch-GNUmakefile
--- patches/patch-GNUmakefile 4 Jun 2013 15:41:19 -0000 1.3
+++ patches/patch-GNUmakefile 7 Mar 2021 08:31:15 -0000
@@ -1,17 +1,14 @@
-$OpenBSD: patch-GNUmakefile,v 1.3 2013/06/04 15:41:19 naddy Exp $
---- GNUmakefile.orig Sun Aug 30 13:46:42 2009
-+++ GNUmakefile Fri Jan 14 11:12:36 2011
-@@ -20,10 +20,11 @@ ifeq ($(GNUSTEP_HOST_OS),mingw32)
- else
- LIBJS_SRC_DIR = deps/Cross-platform-deps/SpiderMonkey/js/src
- LIBJS_BIN_DIR = $(LIBJS_SRC_DIR)/Linux_All_OPT.OBJ
-- ADDITIONAL_INCLUDE_DIRS = -I$(LIBJS_SRC_DIR) -I$(LIBJS_BIN_DIR)
-Isrc/SDL -Isrc/Core -Isrc/BSDCompat -Isrc/Core/Scripting -Isrc/Core/Materials
-Isrc/Core/Entities -Isrc/Core/OXPVerifier -Isrc/Core/Debug
-+ LIBJS_XCODE_DIR = deps/Cross-platform-deps/SpiderMonkey/js/xcode
-+ ADDITIONAL_INCLUDE_DIRS = -I$(LIBJS_SRC_DIR) -I$(LIBJS_BIN_DIR)
-I$(LIBJS_XCODE_DIR) -Isrc/SDL -Isrc/Core -Isrc/BSDCompat -Isrc/Core/Scripting
-Isrc/Core/Materials -Isrc/Core/Entities -Isrc/Core/OXPVerifier -Isrc/Core/Debug
- ADDITIONAL_OBJC_LIBS = -lpng $(LIBJS_BIN_DIR)/libjs.a -lGLU -lGL -lSDL
-lSDL_mixer -lgnustep-base
- ADDITIONAL_CFLAGS = -DLINUX -DNEED_STRLCPY `sdl-config --cflags`
-- ADDITIONAL_OBJCFLAGS = -std=c99 -DLOADSAVEGUI -DLINUX -DXP_UNIX
-Wno-import `sdl-config --cflags`
-+ ADDITIONAL_OBJCFLAGS = -std=c99 -DLOADSAVEGUI -DLINUX -DXP_UNIX
-Wno-import -DBUNDLE_PATH='@"$(LOCALBASE)/share/oolite"' `sdl-config --cflags`
- oolite_LIB_DIRS += -L/usr/X11R6/lib/
- endif
- ifeq ($(libespeak),yes)
+$OpenBSD$
+
+Index: GNUmakefile
+--- GNUmakefile.orig
++++ GNUmakefile
+@@ -69,7 +69,7 @@ else
+ endif
+
+ ADDITIONAL_INCLUDE_DIRS = -I$(LIBJS_INC_DIR) -Isrc/SDL -Isrc/Core
-Isrc/BSDCompat -Isrc/Core/Scripting -Isrc/Core/Materials -Isrc/Core/Entities
-Isrc/Core/OXPVerifier -Isrc/Core/Debug -Isrc/Core/Tables -Isrc/Core/MiniZip
-Ideps/Linux-deps/include
+- ADDITIONAL_OBJC_LIBS = $(OOLITE_SHARED_LIBS) -lGLU -lGL -lX11
-lSDL -lgnustep-base -L$(LIBJS_DIR) -l$(LIBJS) -lopenal -lz -lvorbisfile -lpng
`nspr-config --libs` -lstdc++
++ ADDITIONAL_OBJC_LIBS = $(OOLITE_SHARED_LIBS) `pkg-config --libs
glu` -lX11 -lSDL -lgnustep-base -L$(LIBJS_DIR) -l$(LIBJS) -lopenal -lz
-lvorbisfile -lpng `nspr-config --libs` -lstdc++
+ ADDITIONAL_OBJCFLAGS = -Wall -std=gnu99 -DLOADSAVEGUI -DLINUX
-DXP_UNIX -Wno-import `sdl-config --cflags` `nspr-config --cflags`
+ ADDITIONAL_CFLAGS = -Wall -DLINUX -DNEED_STRLCPY `sdl-config
--cflags` `nspr-config --cflags`
+
Index: patches/patch-GNUmakefile_postamble
===================================================================
RCS file: patches/patch-GNUmakefile_postamble
diff -N patches/patch-GNUmakefile_postamble
--- patches/patch-GNUmakefile_postamble 26 Feb 2021 18:20:33 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,24 +0,0 @@
-$OpenBSD: patch-GNUmakefile_postamble,v 1.2 2021/02/26 18:20:33 naddy Exp $
---- GNUmakefile.postamble.orig Tue Mar 30 22:22:40 2010
-+++ GNUmakefile.postamble Tue Mar 30 22:22:48 2010
-@@ -18,15 +18,15 @@ PROGDIR=$(OBJC_PROGRAM_NAME).app
- after-all::
- $(MKDIRS) $(PROGDIR)
- $(MKDIRS) $(PROGDIR)/Resources
-- $(CP) -r -u -f Resources $(PROGDIR)
-- $(CP) -r -u -f Schemata $(PROGDIR)/Resources
-- $(CP) -u -f src/Cocoa/Info-Oolite.plist
$(PROGDIR)/Resources/Info-gnustep.plist
-- $(CP) -u -f $(GNUSTEP_OBJ_DIR_NAME)/$(SRC_BIN) $(PROGDIR)/$(DEST_BIN)
-+ $(CP) -r -f Resources $(PROGDIR)
-+ $(CP) -r -f Schemata $(PROGDIR)/Resources
-+ $(CP) -f src/Cocoa/Info-Oolite.plist
$(PROGDIR)/Resources/Info-gnustep.plist
-+ $(CP) -f $(GNUSTEP_OBJ_DIR_NAME)/$(SRC_BIN) $(PROGDIR)/$(DEST_BIN)
- ifeq ($(debug),no)
- strip $(PROGDIR)/$(DEST_BIN)
- endif
- ifeq ($(GNUSTEP_HOST_OS),mingw32)
-- $(CP) -r -u -f deps/Windows-x86-deps/DLLs/*.dll $(PROGDIR)
-+ $(CP) -r -f deps/Windows-x86-deps/DLLs/*.dll $(PROGDIR)
- endif
-
- after-clean::
Index: patches/patch-Makefile
===================================================================
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- patches/patch-Makefile 26 Feb 2021 18:20:33 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,39 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.2 2021/02/26 18:20:33 naddy Exp $
---- Makefile.orig Tue Mar 30 21:28:52 2010
-+++ Makefile Tue Mar 30 21:35:58 2010
-@@ -4,7 +4,7 @@ VER_MAJ := $(shell echo "${VERSION}" | cut -d '.'
- VER_MIN := $(shell echo "${VERSION}" | cut -d '.' -f 2)
- VER_REV := $(shell echo "${VERSION}" | cut -d '.' -f 3)
- VER_REV := $(if ${VER_REV},${VER_REV},0)
--SVNREVISION := $(shell svn info | grep Revision | cut -d ' ' -f 2)
-+#SVNREVISION := $(shell svn info | grep Revision | cut -d ' ' -f 2)
- VER := $(shell echo "${VER_MAJ}.${VER_MIN}.${VER_REV}.${SVNREVISION}")
- BUILDTIME := $(shell date "+%Y.%m.%d %H:%M")
- DEB_BUILDTIME := $(shell date "+%a, %d %b %Y %H:%M:%S %z")
-@@ -36,8 +36,8 @@ DEPS=$(LIBJS)
- # Here are our default targets
- #
- .PHONY: release
--release: $(DEPS)
-- make -f GNUmakefile debug=no
-+release: libjs $(DEPS)
-+ ${MAKE} -f GNUmakefile debug=no
-
- .PHONY: release-snapshot
- release-snapshot: $(DEPS)
-@@ -47,13 +47,13 @@ release-snapshot: $(DEPS)
- debug: $(DEPS)
- make -f GNUmakefile debug=yes
-
--$(LIBJS):
-+libjs:
- ifeq ($(GNUSTEP_HOST_OS),mingw32)
- @echo "ERROR - this Makefile can't (yet) build the Javascript DLL"
- @echo " Please build it yourself and copy it to $(LIBJS)."
- false
- endif
-- make -C $(LIBJS_SRC_DIR) -f Makefile.ref BUILD_OPT=1
-+ ${MAKE} -C $(LIBJS_SRC_DIR) -f Makefile.ref BUILD_OPT=1
-
- .PHONY: clean
- clean:
Index:
patches/patch-deps_Cross-platform-deps_SpiderMonkey_js_src_config_Linux_All_mk
===================================================================
RCS file:
patches/patch-deps_Cross-platform-deps_SpiderMonkey_js_src_config_Linux_All_mk
diff -N
patches/patch-deps_Cross-platform-deps_SpiderMonkey_js_src_config_Linux_All_mk
---
patches/patch-deps_Cross-platform-deps_SpiderMonkey_js_src_config_Linux_All_mk
19 Apr 2010 23:44:55 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,35 +0,0 @@
-$OpenBSD:
patch-deps_Cross-platform-deps_SpiderMonkey_js_src_config_Linux_All_mk,v
1.1.1.1 2010/04/19 23:44:55 nicm Exp $
---- deps/Cross-platform-deps/SpiderMonkey/js/src/config/Linux_All.mk.orig
Sun Aug 30 12:41:18 2009
-+++ deps/Cross-platform-deps/SpiderMonkey/js/src/config/Linux_All.mk Tue Mar
30 21:59:00 2010
-@@ -41,9 +41,9 @@
- # Config for all versions of Linux
- #
-
--CC = gcc
--CCC = g++
--CFLAGS += -Wall -Wno-format
-+#CC = gcc
-+#CCC = g++
-+#CFLAGS += -Wall -Wno-format
- OS_CFLAGS = -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE
-DHAVE_LOCALTIME_R
-
- RANLIB = echo
-@@ -90,14 +90,14 @@ endif
- # Use the editline library to provide line-editing support.
- JS_EDITLINE = 1
-
--ifeq ($(CPU_ARCH),x86_64)
-+#ifeq ($(CPU_ARCH),x86_64)
- # Use VA_COPY() standard macro on x86-64
- # FIXME: better use it everywhere
- OS_CFLAGS += -DHAVE_VA_COPY -DVA_COPY=va_copy
--endif
-+#endif
-
--ifeq ($(CPU_ARCH),x86_64)
-+#ifeq ($(CPU_ARCH),x86_64)
- # We need PIC code for shared libraries
- # FIXME: better patch rules.mk & fdlibm/Makefile*
- OS_CFLAGS += -DPIC -fPIC
--endif
-+#endif
Index: patches/patch-deps_Cross-platform-deps_SpiderMonkey_js_src_config_mk
===================================================================
RCS file: patches/patch-deps_Cross-platform-deps_SpiderMonkey_js_src_config_mk
diff -N patches/patch-deps_Cross-platform-deps_SpiderMonkey_js_src_config_mk
--- patches/patch-deps_Cross-platform-deps_SpiderMonkey_js_src_config_mk
19 Apr 2010 23:44:55 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,30 +0,0 @@
-$OpenBSD: patch-deps_Cross-platform-deps_SpiderMonkey_js_src_config_mk,v
1.1.1.1 2010/04/19 23:44:55 nicm Exp $
---- deps/Cross-platform-deps/SpiderMonkey/js/src/config.mk.orig Sun Aug
30 12:41:24 2009
-+++ deps/Cross-platform-deps/SpiderMonkey/js/src/config.mk Tue Mar 30
22:01:54 2010
-@@ -94,6 +94,9 @@ endif
- ifeq ($(OS_ARCH),Linux)
- OS_CONFIG := Linux_All
- else
-+ifeq ($(OS_ARCH),OpenBSD)
-+OS_CONFIG := Linux_All
-+else
- ifeq ($(OS_ARCH),dgux)
- OS_CONFIG := dgux
- else
-@@ -104,6 +107,7 @@ OS_CONFIG := $(OS_ARCH)$(OS_OBJTYPE)$(OS_RELEASE
- endif
- endif
- endif
-+endif
-
- ASFLAGS =
- DEFINES =
-@@ -117,7 +121,7 @@ CP = cp
- endif
-
- ifdef BUILD_OPT
--OPTIMIZER = -O
-+#OPTIMIZER = -O
- DEFINES += -UDEBUG -DNDEBUG -UDEBUG_$(USER)
- OBJDIR_TAG = _OPT
- else
Index: patches/patch-src_Core_Debug_OODebugTCPConsoleClient_m
===================================================================
RCS file: patches/patch-src_Core_Debug_OODebugTCPConsoleClient_m
diff -N patches/patch-src_Core_Debug_OODebugTCPConsoleClient_m
--- patches/patch-src_Core_Debug_OODebugTCPConsoleClient_m 26 Feb 2021
18:20:33 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_Core_Debug_OODebugTCPConsoleClient_m,v 1.5 2021/02/26
18:20:33 naddy Exp $
---- src/Core/Debug/OODebugTCPConsoleClient.m.orig Sun Aug 30 05:40:23 2009
-+++ src/Core/Debug/OODebugTCPConsoleClient.m Mon Aug 18 18:28:09 2014
-@@ -157,7 +157,7 @@ OOINLINE BOOL StatusIsSendable(OOTCPClientConnectionSt
- // Attempt to connect
- parameters = [NSDictionary dictionaryWithObjectsAndKeys:
- [NSNumber
numberWithUnsignedInt:kOOTCPProtocolVersion_1_1_0], kOOTCPProtocolVersion,
-- [[[NSBundle mainBundle]
infoDictionary] objectForKey:@"CFBundleVersion"], kOOTCPOoliteVersion,
-+ [[[NSBundle
bundleWithPath: BUNDLE_PATH] infoDictionary] objectForKey:@"CFBundleVersion"],
kOOTCPOoliteVersion,
- nil];
- [self sendPacket:kOOTCPPacket_RequestConnection
- withParameters:parameters];
Index: patches/patch-src_Core_Entities_PlanetEntity_h
===================================================================
RCS file: patches/patch-src_Core_Entities_PlanetEntity_h
diff -N patches/patch-src_Core_Entities_PlanetEntity_h
--- patches/patch-src_Core_Entities_PlanetEntity_h 22 Oct 2013 16:52:09
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,28 +0,0 @@
-$OpenBSD: patch-src_Core_Entities_PlanetEntity_h,v 1.1 2013/10/22 16:52:09
sebastia Exp $
---- src/Core/Entities/PlanetEntity.h.orig Tue Oct 22 07:36:42 2013
-+++ src/Core/Entities/PlanetEntity.h Tue Oct 22 07:37:19 2013
-@@ -65,6 +65,12 @@ typedef struct
- GLuint index_array[MAX_TRI_INDICES];
- } VertexData;
-
-+// straight c
-+double corona_speed_factor; // multiply delta_t by this
before adding it to corona_stage
-+double corona_stage; // 0.0 -> 1.0
-+GLfloat rvalue[729]; // stores random values
for adjusting colors in the corona
-+
-+
- @interface PlanetEntity: OOSelfDrawingEntity
- {
- @public
-@@ -121,11 +127,6 @@ typedef struct
-
- Vector rotationAxis;
- }
--
--// straight c
--double corona_speed_factor; // multiply delta_t by this
before adding it to corona_stage
--double corona_stage; // 0.0 -> 1.0
--GLfloat rvalue[729]; // stores random values
for adjusting colors in the corona
-
- - (id) initSunWithColor:(OOColor*)sun_color andDictionary:(NSDictionary*)
dict;
- - (id) initWithSeed:(Random_Seed) p_seed;
Index: patches/patch-src_Core_Entities_PlayerEntity_m
===================================================================
RCS file: patches/patch-src_Core_Entities_PlayerEntity_m
diff -N patches/patch-src_Core_Entities_PlayerEntity_m
--- patches/patch-src_Core_Entities_PlayerEntity_m 19 Apr 2010 23:44:55
-0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-$OpenBSD: patch-src_Core_Entities_PlayerEntity_m,v 1.1.1.1 2010/04/19 23:44:55
nicm Exp $
---- src/Core/Entities/PlayerEntity.m.orig Wed Mar 31 21:43:01 2010
-+++ src/Core/Entities/PlayerEntity.m Wed Mar 31 21:43:50 2010
-@@ -306,7 +306,7 @@ static PlayerEntity *sSharedPlayer = nil;
- {
- NSMutableDictionary *result = [NSMutableDictionary dictionary];
-
-- [result setObject:[[[NSBundle mainBundle] infoDictionary]
objectForKey:@"CFBundleVersion"] forKey:@"written_by_version"];
-+ [result setObject:[[[NSBundle bundleWithPath: BUNDLE_PATH]
infoDictionary] objectForKey:@"CFBundleVersion"] forKey:@"written_by_version"];
-
- NSString *gal_seed = [NSString stringWithFormat:@"%d %d %d %d %d
%d",galaxy_seed.a, galaxy_seed.b, galaxy_seed.c, galaxy_seed.d, galaxy_seed.e,
galaxy_seed.f];
- NSString *gal_coords = [NSString stringWithFormat:@"%d
%d",(int)galaxy_coordinates.x,(int)galaxy_coordinates.y];
-@@ -5361,7 +5361,7 @@ static int last_outfitting_index;
- if ([[arguments objectAtIndex:i]
isEqual:@"-showversion"])
- {
- int ms_start = msgLine;
-- NSString *version = [NSString
stringWithFormat:@"Version %@", [[[NSBundle mainBundle] infoDictionary]
objectForKey:@"CFBundleVersion"]];
-+ NSString *version = [NSString
stringWithFormat:@"Version %@", [[[NSBundle bundleWithPath: BUNDLE_PATH]
infoDictionary] objectForKey:@"CFBundleVersion"]];
- int i = msgLine = [gui addLongText:version
startingAtRow:ms_start align:GUI_ALIGN_CENTER];
- for (i-- ; i >= ms_start; i--) [gui
setColor:[OOColor magentaColor] forRow:i];
- }
Index: patches/patch-src_Core_GameController_h
===================================================================
RCS file: patches/patch-src_Core_GameController_h
diff -N patches/patch-src_Core_GameController_h
--- patches/patch-src_Core_GameController_h 19 Apr 2010 23:44:55 -0000
1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-$OpenBSD: patch-src_Core_GameController_h,v 1.1.1.1 2010/04/19 23:44:55 nicm
Exp $
---- src/Core/GameController.h.orig Tue Mar 30 23:56:11 2010
-+++ src/Core/GameController.h Tue Mar 30 23:55:57 2010
-@@ -34,7 +34,7 @@ MA 02110-1301, USA.
- #define DISPLAY_MIN_WIDTH 640
- #define DISPLAY_MIN_HEIGHT 480
-
--#ifndef GNUSTEP
-+//#ifndef GNUSTEP
- /* OS X apps are permitted to assume 800x600 screens. Under OS X, we always
- start up in windowed mode. Therefore, the default size fits an 800x600
- screen and leaves space for the menu bar and title bar.
-@@ -42,7 +42,7 @@ MA 02110-1301, USA.
- #define DISPLAY_DEFAULT_WIDTH 800
- #define DISPLAY_DEFAULT_HEIGHT 540
- #define DISPLAY_DEFAULT_REFRESH 75
--#endif
-+//#endif
-
- #define DISPLAY_MAX_WIDTH 2400
- #define DISPLAY_MAX_HEIGHT 1800
Index: patches/patch-src_Core_GameController_m
===================================================================
RCS file: patches/patch-src_Core_GameController_m
diff -N patches/patch-src_Core_GameController_m
--- patches/patch-src_Core_GameController_m 19 Apr 2010 23:44:55 -0000
1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_Core_GameController_m,v 1.1.1.1 2010/04/19 23:44:55 nicm
Exp $
---- src/Core/GameController.m.orig Wed Mar 31 00:04:47 2010
-+++ src/Core/GameController.m Wed Mar 31 00:18:38 2010
-@@ -855,7 +855,7 @@ static NSComparisonResult CompareDisplayModes(id arg1,
- NSString *path = nil;
-
- // Set contents of Help window
-- path = [[NSBundle mainBundle] pathForResource:@"ReadMe" ofType:@"rtfd"];
-+ path = [[NSBundle bundleWithPath: BUNDLE_PATH]
pathForResource:@"ReadMe" ofType:@"rtfd"];
- if (path != nil)
- {
- [helpView readRTFDFromFile:path];
Index: patches/patch-src_Core_Materials_OOPNGTextureLoader_m
===================================================================
RCS file: patches/patch-src_Core_Materials_OOPNGTextureLoader_m
diff -N patches/patch-src_Core_Materials_OOPNGTextureLoader_m
--- patches/patch-src_Core_Materials_OOPNGTextureLoader_m 26 Feb 2021
18:20:33 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,40 +0,0 @@
-$OpenBSD: patch-src_Core_Materials_OOPNGTextureLoader_m,v 1.4 2021/02/26
18:20:33 naddy Exp $
-
-* Missing header.
-* Fix build with png-1.6; __attribute__((noreturn)) already set in <png.h>.
-
---- src/Core/Materials/OOPNGTextureLoader.m.orig Mon Sep 21 20:53:30 2009
-+++ src/Core/Materials/OOPNGTextureLoader.m Fri Jun 7 22:33:31 2013
-@@ -50,11 +50,11 @@ SOFTWARE.
- #import "OOFunctionAttributes.h"
- #import "OOLogging.h"
- #import "OOCPUInfo.h"
-+
-+#include <assert.h>
-+
-
-
--void png_error(png_structp, png_const_charp) NO_RETURN_FUNC;
--
--
- static void PNGError(png_structp png, png_const_charp message);
- static void PNGWarning(png_structp png, png_const_charp message);
- static void PNGRead(png_structp png, png_bytep bytes, png_size_t size);
-@@ -242,7 +242,7 @@ static void PNGError(png_structp png, png_const_charp
- {
- OOPNGTextureLoader *loader = nil;
-
-- loader = png->error_ptr;
-+ loader = png_get_error_ptr(png);
- OOLog(@"texture.load.png.error", @"***** A PNG loading error occurred
for %@: %s", [loader path], message);
- }
-
-@@ -251,7 +251,7 @@ static void PNGWarning(png_structp png, png_const_char
- {
- OOPNGTextureLoader *loader = nil;
-
-- loader = png->error_ptr;
-+ loader = png_get_error_ptr(png);
- OOLog(@"texture.load.png.warning", @"***** A PNG loading warning
occurred for %@: %s", [loader path], message);
- }
-
Index: patches/patch-src_Core_MiniZip_ioapi_h
===================================================================
RCS file: patches/patch-src_Core_MiniZip_ioapi_h
diff -N patches/patch-src_Core_MiniZip_ioapi_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_Core_MiniZip_ioapi_h 7 Mar 2021 08:31:15 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/Core/MiniZip/ioapi.h
+--- src/Core/MiniZip/ioapi.h.orig
++++ src/Core/MiniZip/ioapi.h
+@@ -50,7 +50,7 @@
+ #define OF _Z_OF
+ #endif
+
+-#if defined(USE_FILE32API)
++#if 1
+ #define fopen64 fopen
+ #define ftello64 ftell
+ #define fseeko64 fseek
Index: patches/patch-src_Core_OOAsyncQueue_m
===================================================================
RCS file: patches/patch-src_Core_OOAsyncQueue_m
diff -N patches/patch-src_Core_OOAsyncQueue_m
--- patches/patch-src_Core_OOAsyncQueue_m 26 Feb 2021 18:20:33 -0000
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-src_Core_OOAsyncQueue_m,v 1.2 2021/02/26 18:20:33 naddy Exp $
-
-missing header
-
---- src/Core/OOAsyncQueue.m.orig Fri Jan 14 13:19:13 2011
-+++ src/Core/OOAsyncQueue.m Fri Jan 14 13:19:29 2011
-@@ -52,6 +52,9 @@ SOFTWARE.
- #import "OOLogging.h"
- #import "NSThreadOOExtensions.h"
- #import <stdlib.h>
-+
-+#include <assert.h>
-+
-
-
- enum
Index: patches/patch-src_Core_OOCPUInfo_h
===================================================================
RCS file: patches/patch-src_Core_OOCPUInfo_h
diff -N patches/patch-src_Core_OOCPUInfo_h
--- patches/patch-src_Core_OOCPUInfo_h 26 Feb 2021 18:20:33 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_Core_OOCPUInfo_h,v 1.2 2021/02/26 18:20:33 naddy Exp $
-alpha is LE
---- src/Core/OOCPUInfo.h.orig Mon Aug 18 23:45:42 2014
-+++ src/Core/OOCPUInfo.h Mon Aug 18 23:46:09 2014
-@@ -55,7 +55,7 @@ unsigned OOCPUCount(void);
-
-
- #if !defined(OOLITE_BIG_ENDIAN) && !defined(OOLITE_LITTLE_ENDIAN)
--#if defined(__i386__) || defined(__amd64__) || defined(__x86_64__)
-+#if defined(__i386__) || defined(__amd64__) || defined(__x86_64__) ||
defined(__alpha__)
- #define OOLITE_LITTLE_ENDIAN 1
- #endif
-
Index: patches/patch-src_Core_OOCacheManager_m
===================================================================
RCS file: patches/patch-src_Core_OOCacheManager_m
diff -N patches/patch-src_Core_OOCacheManager_m
--- patches/patch-src_Core_OOCacheManager_m 26 Feb 2021 18:20:33 -0000
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-$OpenBSD: patch-src_Core_OOCacheManager_m,v 1.2 2021/02/26 18:20:33 naddy Exp $
---- src/Core/OOCacheManager.m.orig Wed Mar 31 00:04:56 2010
-+++ src/Core/OOCacheManager.m Wed Mar 31 00:19:13 2010
-@@ -306,7 +306,7 @@ static OOCacheManager *sSingleton = nil;
- BOOL accept = YES;
- uint64_t endianTagValue = 0;
-
-- ooliteVersion = [[[NSBundle mainBundle] infoDictionary]
objectForKey:kCacheKeyVersion];
-+ ooliteVersion = [[[NSBundle bundleWithPath: BUNDLE_PATH]
infoDictionary] objectForKey:kCacheKeyVersion];
-
- [self clear];
-
-@@ -385,7 +385,7 @@ static OOCacheManager *sSingleton = nil;
- #endif
-
- OOLog(@"dataCache.willWrite", @"About to write data cache."); //
Added for 1.69 to detect possible write-related crash. -- Ahruman
-- ooliteVersion = [[[NSBundle mainBundle] infoDictionary]
objectForKey:kCacheKeyVersion];
-+ ooliteVersion = [[[NSBundle bundleWithPath: BUNDLE_PATH]
infoDictionary] objectForKey:kCacheKeyVersion];
- endianTag = [NSData dataWithBytes:&endianTagValue length:sizeof
endianTagValue];
- formatVersion = [NSNumber numberWithUnsignedInt:kFormatVersionValue];
-
Index: patches/patch-src_Core_OOLogHeader_m
===================================================================
RCS file: patches/patch-src_Core_OOLogHeader_m
diff -N patches/patch-src_Core_OOLogHeader_m
--- patches/patch-src_Core_OOLogHeader_m 26 Feb 2021 18:20:33 -0000
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_Core_OOLogHeader_m,v 1.2 2021/02/26 18:20:33 naddy Exp $
---- src/Core/OOLogHeader.m.orig Wed Mar 31 00:05:05 2010
-+++ src/Core/OOLogHeader.m Wed Mar 31 00:19:27 2010
-@@ -130,7 +130,7 @@ void OOPrintLogHeader(void)
- #define systemString @OS_TYPE_STRING
- #endif
-
-- NSString *versionString = [[[NSBundle mainBundle] infoDictionary]
objectForKey:@"CFBundleVersion"];
-+ NSString *versionString = [[[NSBundle bundleWithPath: BUNDLE_PATH]
infoDictionary] objectForKey:@"CFBundleVersion"];
- if (versionString == nil) versionString = @"<unknown version>";
-
- NSMutableString *miscString = [NSMutableString
stringWithFormat:@"Opening log for Oolite version %@ (" CPU_TYPE_STRING
RELEASE_VARIANT_STRING ") under %@ at %@.\n", versionString, systemString,
[NSDate date]];
Index: patches/patch-src_Core_OOLogOutputHandler_m
===================================================================
RCS file: patches/patch-src_Core_OOLogOutputHandler_m
diff -N patches/patch-src_Core_OOLogOutputHandler_m
--- patches/patch-src_Core_OOLogOutputHandler_m 26 Feb 2021 18:20:33 -0000
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_Core_OOLogOutputHandler_m,v 1.2 2021/02/26 18:20:33 naddy
Exp $
---- src/Core/OOLogOutputHandler.m.orig Wed Mar 31 00:04:42 2010
-+++ src/Core/OOLogOutputHandler.m Wed Mar 31 00:18:24 2010
-@@ -634,7 +634,7 @@ static NSString *GetAppName(void)
-
- if (appName == nil)
- {
-- bundle = [NSBundle mainBundle];
-+ bundle = [NSBundle bundleWithPath: BUNDLE_PATH];
- appName = [bundle objectForInfoDictionaryKey:@"CFBundleName"];
- if (appName == nil) appName = [bundle bundleIdentifier];
- if (appName == nil) appName = @"<unknown application>";
Index: patches/patch-src_Core_OOMaths_h
===================================================================
RCS file: patches/patch-src_Core_OOMaths_h
diff -N patches/patch-src_Core_OOMaths_h
--- patches/patch-src_Core_OOMaths_h 26 Feb 2021 18:20:33 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-src_Core_OOMaths_h,v 1.2 2021/02/26 18:20:33 naddy Exp $
---- src/Core/OOMaths.h.orig Fri Jan 14 12:36:10 2011
-+++ src/Core/OOMaths.h Fri Jan 14 12:36:45 2011
-@@ -37,6 +37,7 @@ extern "C" {
-
- #ifdef __OBJC__
- #import <Foundation/Foundation.h>
-+#import <assert.h>
- #endif
-
- #include "OOFunctionAttributes.h"
Index: patches/patch-src_Core_OOPriorityQueue_m
===================================================================
RCS file: patches/patch-src_Core_OOPriorityQueue_m
diff -N patches/patch-src_Core_OOPriorityQueue_m
--- patches/patch-src_Core_OOPriorityQueue_m 26 Feb 2021 18:20:33 -0000
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-src_Core_OOPriorityQueue_m,v 1.2 2021/02/26 18:20:33 naddy Exp
$
-
-missing header
-
---- src/Core/OOPriorityQueue.m.orig Fri Jan 14 13:03:08 2011
-+++ src/Core/OOPriorityQueue.m Fri Jan 14 13:03:25 2011
-@@ -28,6 +28,9 @@ SOFTWARE.
-
- #import "OOPriorityQueue.h"
- #import "OOFunctionAttributes.h"
-+
-+#include <assert.h>
-+
-
-
- /* Capacity grows by 50% each time. kMinCapacity must be at least 2 or Bad
Index: patches/patch-src_Core_OXPVerifier_OOCheckRequiresPListVerifierStage_m
===================================================================
RCS file: patches/patch-src_Core_OXPVerifier_OOCheckRequiresPListVerifierStage_m
diff -N patches/patch-src_Core_OXPVerifier_OOCheckRequiresPListVerifierStage_m
--- patches/patch-src_Core_OXPVerifier_OOCheckRequiresPListVerifierStage_m
26 Feb 2021 18:20:33 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_Core_OXPVerifier_OOCheckRequiresPListVerifierStage_m,v 1.2
2021/02/26 18:20:33 naddy Exp $
---- src/Core/OXPVerifier/OOCheckRequiresPListVerifierStage.m.orig Wed Mar
31 21:55:41 2010
-+++ src/Core/OXPVerifier/OOCheckRequiresPListVerifierStage.m Wed Mar 31
21:56:38 2010
-@@ -114,7 +114,7 @@ static NSString * const kStageName = @"Checking requir
-
- if (version != nil || maxVersion != nil)
- {
-- ooVersionComponents = ComponentsFromVersionString([[[NSBundle
mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"]);
-+ ooVersionComponents = ComponentsFromVersionString([[[NSBundle
bundleWithPath: BUNDLE_PATH] infoDictionary] objectForKey:@"CFBundleVersion"]);
- if (ooVersionComponents == nil)
- {
- OOLog(@"verifyOXP.requiresPList.cantFindOoliteVersion",
@"----- WARNING: could not find Oolite's version for requires.plist sanity
check.");
Index: patches/patch-src_Core_OXPVerifier_OOOXPVerifierStage_m
===================================================================
RCS file: patches/patch-src_Core_OXPVerifier_OOOXPVerifierStage_m
diff -N patches/patch-src_Core_OXPVerifier_OOOXPVerifierStage_m
--- patches/patch-src_Core_OXPVerifier_OOOXPVerifierStage_m 26 Feb 2021
18:20:33 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-src_Core_OXPVerifier_OOOXPVerifierStage_m,v 1.2 2021/02/26
18:20:33 naddy Exp $
-
-missing header
-
---- src/Core/OXPVerifier/OOOXPVerifierStage.m.orig Fri Jan 14 12:59:57 2011
-+++ src/Core/OXPVerifier/OOOXPVerifierStage.m Fri Jan 14 13:00:15 2011
-@@ -47,6 +47,9 @@ SOFTWARE.
- */
-
- #import "OOOXPVerifierStageInternal.h"
-+
-+#include <assert.h>
-+
-
- #if OO_OXP_VERIFIER_ENABLED
-
Index: patches/patch-src_Core_OldSchoolPropertyListWriting_m
===================================================================
RCS file: patches/patch-src_Core_OldSchoolPropertyListWriting_m
diff -N patches/patch-src_Core_OldSchoolPropertyListWriting_m
--- patches/patch-src_Core_OldSchoolPropertyListWriting_m 26 Feb 2021
18:20:33 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-src_Core_OldSchoolPropertyListWriting_m,v 1.2 2021/02/26
18:20:33 naddy Exp $
-
-missing header
-
---- src/Core/OldSchoolPropertyListWriting.m.orig Fri Jan 14 13:01:11 2011
-+++ src/Core/OldSchoolPropertyListWriting.m Fri Jan 14 13:01:26 2011
-@@ -19,6 +19,9 @@
- */
-
- #import "OldSchoolPropertyListWriting.h"
-+
-+#include <assert.h>
-+
-
-
- static BOOL IsFloatingPoint(NSNumber *number);
Index: patches/patch-src_Core_ResourceManager_m
===================================================================
RCS file: patches/patch-src_Core_ResourceManager_m
diff -N patches/patch-src_Core_ResourceManager_m
--- patches/patch-src_Core_ResourceManager_m 19 Apr 2010 23:44:55 -0000
1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,30 +0,0 @@
-$OpenBSD: patch-src_Core_ResourceManager_m,v 1.1.1.1 2010/04/19 23:44:55 nicm
Exp $
---- src/Core/ResourceManager.m.orig Sun Sep 6 18:52:33 2009
-+++ src/Core/ResourceManager.m Wed Mar 31 00:56:08 2010
-@@ -153,7 +153,7 @@ static NSMutableDictionary *string_cache;
- */
- return @"Resources";
- #else
-- return [[NSBundle mainBundle] resourcePath];
-+ return [[NSBundle bundleWithPath: BUNDLE_PATH] resourcePath];
- #endif
- }
-
-@@ -276,7 +276,7 @@ static NSMutableDictionary *string_cache;
- if (requirementsMet) [searchPaths addObject:path];
- else
- {
-- NSString *version = [[[NSBundle mainBundle] infoDictionary]
objectForKey:@"CFBundleVersion"];
-+ NSString *version = [[[NSBundle bundleWithPath: BUNDLE_PATH]
infoDictionary] objectForKey:@"CFBundleVersion"];
- OOLog(@"oxp.versionMismatch", @"OXP %@ is incompatible with
version %@ of Oolite.", path, version);
- [self addErrorWithKey:@"oxp-is-incompatible" param1:[path
lastPathComponent] param2:version];
- }
-@@ -296,7 +296,7 @@ static NSMutableDictionary *string_cache;
-
- if (ooVersionComponents == nil)
- {
-- ooVersionComponents = ComponentsFromVersionString([[[NSBundle
mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"]);
-+ ooVersionComponents = ComponentsFromVersionString([[[NSBundle
bundleWithPath: BUNDLE_PATH] infoDictionary] objectForKey:@"CFBundleVersion"]);
- [ooVersionComponents retain];
- }
-
Index: patches/patch-src_Core_Scripting_OOJSOolite_m
===================================================================
RCS file: patches/patch-src_Core_Scripting_OOJSOolite_m
diff -N patches/patch-src_Core_Scripting_OOJSOolite_m
--- patches/patch-src_Core_Scripting_OOJSOolite_m 26 Feb 2021 18:20:33
-0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_Core_Scripting_OOJSOolite_m,v 1.2 2021/02/26 18:20:33
naddy Exp $
---- src/Core/Scripting/OOJSOolite.m.orig Wed Mar 31 21:55:16 2010
-+++ src/Core/Scripting/OOJSOolite.m Wed Mar 31 21:56:45 2010
-@@ -130,7 +130,7 @@ static JSBool OoliteGetProperty(JSContext *context, JS
-
- static NSString *VersionString(void)
- {
-- return [[[NSBundle mainBundle] infoDictionary]
objectForKey:@"CFBundleVersion"];
-+ return [[[NSBundle bundleWithPath: BUNDLE_PATH] infoDictionary]
objectForKey:@"CFBundleVersion"];
- }
-
-
Index: patches/patch-src_SDL_MyOpenGLView_m
===================================================================
RCS file: patches/patch-src_SDL_MyOpenGLView_m
diff -N patches/patch-src_SDL_MyOpenGLView_m
--- patches/patch-src_SDL_MyOpenGLView_m 19 Apr 2010 23:44:55 -0000
1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,30 +0,0 @@
-$OpenBSD: patch-src_SDL_MyOpenGLView_m,v 1.1.1.1 2010/04/19 23:44:55 nicm Exp $
---- src/SDL/MyOpenGLView.m.orig Wed Mar 31 00:27:49 2010
-+++ src/SDL/MyOpenGLView.m Wed Mar 31 00:28:33 2010
-@@ -128,7 +128,7 @@ MA 02110-1301, USA.
-
- // Generate the window caption, containing the version number and the
date the executable was compiled.
- static char windowCaption[128];
-- NSString *versionString = [NSString stringWithFormat:@"Oolite v%@",
[[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"]];
-+ NSString *versionString = [NSString stringWithFormat:@"Oolite v%@",
[[[NSBundle bundleWithPath: BUNDLE_PATH] infoDictionary]
objectForKey:@"CFBundleVersion"]];
-
- strcpy (windowCaption, [versionString UTF8String]);
- strcat (windowCaption, " - "__DATE__);
-@@ -144,7 +144,7 @@ MA 02110-1301, USA.
-
- #endif
-
-- imagesDir = [[[NSBundle mainBundle] resourcePath]
stringByAppendingPathComponent:@"Images"];
-+ imagesDir = [[[NSBundle bundleWithPath: BUNDLE_PATH] resourcePath]
stringByAppendingPathComponent:@"Images"];
- icon = SDL_LoadBMP([[imagesDir
stringByAppendingPathComponent:@"WMicon.bmp"] cString]);
-
- if (icon != NULL)
-@@ -487,7 +487,7 @@ MA 02110-1301, USA.
- #if OOLITE_WINDOWS
- NSString *imagesDir = @"Resources/Images";
- #else
-- NSString *imagesDir = [[[NSBundle mainBundle]
resourcePath] stringByAppendingPathComponent:@"Images"];
-+ NSString *imagesDir = [[[NSBundle bundleWithPath:
BUNDLE_PATH] resourcePath] stringByAppendingPathComponent:@"Images"];
- #endif
-
- image = SDL_LoadBMP([[imagesDir
stringByAppendingPathComponent:@"splash.bmp"] cString]);
Index: patches/patch-src_SDL_OOSDLSoundMixer_m
===================================================================
RCS file: patches/patch-src_SDL_OOSDLSoundMixer_m
diff -N patches/patch-src_SDL_OOSDLSoundMixer_m
--- patches/patch-src_SDL_OOSDLSoundMixer_m 26 Feb 2021 18:20:33 -0000
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-src_SDL_OOSDLSoundMixer_m,v 1.2 2021/02/26 18:20:33 naddy Exp $
-
-missing header
-
---- src/SDL/OOSDLSoundMixer.m.orig Fri Jan 14 13:02:04 2011
-+++ src/SDL/OOSDLSoundMixer.m Fri Jan 14 13:02:16 2011
-@@ -48,6 +48,9 @@ SOFTWARE.
-
- #import "OOCocoa.h"
- #import "OOSDLSoundInternal.h"
-+
-+#include <assert.h>
-+
-
-
- static OOSoundMixer *sSingleton = nil;
