- Update to 0.4.3

- Pass maintainership to submitter

PR:		134595
Submitted by:	Josh Rickmar <joshua_rickmar@eumx.net>

4 files changed, 92 insertions, 82 deletions

diff --git a/games/odamex/files/patch-Makefile b/games/odamex/files/patch-Makefile
index 17100f4a77db..b39e4ee8f538 100644
--- a/games/odamex/files/patch-Makefile
+++ b/games/odamex/files/patch-Makefile
@@ -1,56 +1,56 @@
---- ./Makefile.orig	Sun Nov  4 12:21:20 2007
-+++ ./Makefile	Sun Feb  3 20:48:01 2008
+--- ./Makefile.orig	2009-03-08 00:28:16.000000000 -0500
++++ ./Makefile	2009-05-16 17:15:11.000000000 -0400
 @@ -3,8 +3,8 @@
- OBJDIR = obj
- # denis - fixme - remove mkdir -p
- MKDIR = mkdir -p
--CC = g++
--LD = g++
-+CC = $(CXX)
-+LD = $(CC)
- INSTALL = cp
- DEUTEX = deutex
- 
+ OBJDIR = obj

+ # denis - fixme - remove mkdir -p

+ MKDIR = mkdir -p

+-CC = g++

+-LD = g++

++CC = $(CXX)

++LD = $(CC)

+ INSTALL = cp

+ DEUTEX = deutex

+ 

 @@ -62,7 +62,7 @@
- DEUTEX_FLAGS = -rgb 0 255 255 
- 
- # Platform and sdl-config flags
--X11_LFLAGS = -L/usr/X11R6/lib -lX11
-+X11_LFLAGS = -L$(LOCALBASE)/lib -lX11
- 
- SDL_CFLAGS_COMMAND = sdl-config --cflags
- SDL_LFLAGS_COMMAND = sdl-config --libs
+ DEUTEX_FLAGS = -rgb 0 255 255 

+ 

+ # Platform and sdl-config flags

+-X11_LFLAGS = -L/usr/X11R6/lib -lX11

++X11_LFLAGS = -L$(LOCALBASE)/lib -lX11

+ 

+ SDL_CFLAGS_COMMAND = sdl-config --cflags

+ SDL_LFLAGS_COMMAND = sdl-config --libs

 @@ -85,8 +85,8 @@
- 
- ifeq ($(strip $(freebsd)), true)
- ifeq ($(SDL_CFLAGS),)
--SDL_CFLAGS_COMMAND = sdl11-config --cflags
--SDL_LFLAGS_COMMAND = sdl11-config --libs
-+SDL_CFLAGS_COMMAND = $(SDL_CONFIG) --cflags
-+SDL_LFLAGS_COMMAND = $(SDL_CONFIG) --libs
- SDL_CFLAGS = $(shell $(SDL_CFLAGS_COMMAND))
- SDL_LFLAGS = $(shell $(SDL_LFLAGS_COMMAND)) $(X11_LFLAGS)
- endif
-@@ -173,7 +173,7 @@
- TARGETS = $(SERVER_TARGET) $(CLIENT_TARGET) $(MASTER_TARGET) $(WADFILE_TARGET)
- 
- # denis - fixme - cflags are quite messy, but removing these is a very delicate act, also use -Wall -Werror
--CFLAGS = $(CFLAGS_PLATFORM) -DNOASM -Icommon -g -Wall -O2
-+CFLAGS += $(CFLAGS_PLATFORM) -DNOASM -Icommon -g -Wall -O2
- LFLAGS = $(LFLAGS_PLATFORM)
- 
- CFLAGS_RELEASE = $(CFLAGS_PLATFORM) -DNOASM -Icommon -O3
-@@ -209,7 +209,12 @@
- # denis - end fixme
- 
- # All
--all: $(SERVER_TARGET) $(CLIENT_TARGET) $(MASTER_TARGET) $(WADFILE_TARGET)
-+all: $(SERVER_TARGET) $(CLIENT_TARGET) $(MASTER_TARGET) $(WADFILE_TARGET) launcher
-+
-+launcher:
-+ifdef WITH_LAUNCHER
-+	$(MAKE) -C odalaunch odalaunch
-+endif
- 
- # Common for server
- $(OBJDIR)/$(COMMON_DIR)/server_%.o: $(COMMON_DIR)/%.cpp $(COMMON_HEADERS) $(SERVER_HEADERS)
+ 

+ ifeq ($(strip $(freebsd)), true)

+ ifeq ($(SDL_CFLAGS),)

+-SDL_CFLAGS_COMMAND = sdl11-config --cflags

+-SDL_LFLAGS_COMMAND = sdl11-config --libs

++SDL_CFLAGS_COMMAND = $(SDL_CONFIG) --cflags

++SDL_LFLAGS_COMMAND = $(SDL_CONFIG) --libs

+ SDL_CFLAGS = $(shell $(SDL_CFLAGS_COMMAND))

+ SDL_LFLAGS = $(shell $(SDL_LFLAGS_COMMAND)) $(X11_LFLAGS)

+ endif

+@@ -174,7 +174,7 @@
+ TARGETS = $(SERVER_TARGET) $(CLIENT_TARGET) $(MASTER_TARGET) $(WADFILE_TARGET)

+ 

+ # denis - fixme - cflags are quite messy, but removing these is a very delicate act, also use -Wall -Werror

+-CFLAGS = $(CFLAGS_PLATFORM) -DNOASM -Icommon -g -Wall -O2

++CFLAGS += $(CFLAGS_PLATFORM) -DNOASM -Icommon -g -Wall -O2

+ LFLAGS = $(LFLAGS_PLATFORM)

+ 

+ CFLAGS_RELEASE = $(CFLAGS_PLATFORM) -DNOASM -Icommon -O3

+@@ -210,7 +210,12 @@
+ # denis - end fixme

+ 

+ # All

+-all: $(SERVER_TARGET) $(CLIENT_TARGET) $(MASTER_TARGET) $(WADFILE_TARGET)

++all: $(SERVER_TARGET) $(CLIENT_TARGET) $(MASTER_TARGET) $(WADFILE_TARGET) launcher

++

++launcher:

++ifdef WITH_LAUNCHER

++	$(MAKE) -C odalaunch odalaunch

++endif

+ 

+ # Common for server

+ $(OBJDIR)/$(COMMON_DIR)/server_%.o: $(COMMON_DIR)/%.cpp $(COMMON_HEADERS) $(SERVER_HEADERS)

diff --git a/games/odamex/files/patch-client__src__d_main.cpp b/games/odamex/files/patch-client__src__d_main.cpp
index aea1616077ce..ea1cd0f09cc2 100644
--- a/games/odamex/files/patch-client__src__d_main.cpp
+++ b/games/odamex/files/patch-client__src__d_main.cpp
@@ -1,12 +1,11 @@
---- ./client/src/d_main.cpp.orig	Sun Nov  4 12:21:20 2007
-+++ ./client/src/d_main.cpp	Thu Dec  6 13:58:25 2007
-@@ -727,6 +727,9 @@
+--- ./client/src/d_main.cpp.orig	2009-03-08 00:28:16.000000000 -0500
++++ ./client/src/d_main.cpp	2009-05-16 18:23:51.000000000 -0400
+@@ -807,6 +807,8 @@
  	AddSearchDir(dirs, Args.CheckValue("-waddir"), separator);

- 	AddSearchDir(dirs, getenv("-DOOMWADDIR"), separator);

- 	AddSearchDir(dirs, getenv("-DOOMWADPATH"), separator);
-+	AddSearchDir(dirs, "%%DATADIR%%", separator);
-+	AddSearchDir(dirs, "%%DMDIR%%", separator);
-+
- 
- 	dirs.push_back(startdir);
- 	dirs.push_back(progdir);
+ 	AddSearchDir(dirs, getenv("DOOMWADDIR"), separator);

+ 	AddSearchDir(dirs, getenv("DOOMWADPATH"), separator);

++    AddSearchDir(dirs, "%%DATADIR%%", separator);

++    AddSearchDir(dirs, "%%DMDIR%%", separator);

+     AddSearchDir(dirs, getenv("HOME"), separator);

+ 

+     dirs.erase(std::unique(dirs.begin(), dirs.end()), dirs.end());

diff --git a/games/odamex/files/patch-odalaunch__Makefile b/games/odamex/files/patch-odalaunch__Makefile
index f7cc7cf8d61a..edb2284c07fd 100644
--- a/games/odamex/files/patch-odalaunch__Makefile
+++ b/games/odamex/files/patch-odalaunch__Makefile
@@ -1,18 +1,18 @@
---- ./odalaunch/Makefile.orig	Sun Nov  4 12:21:16 2007
-+++ ./odalaunch/Makefile	Sun Feb  3 20:42:50 2008
-@@ -9,11 +9,11 @@
- 
- HEADERS = src/*.h
- 
--CC = g++
--LD = g++
-+CC = $(CXX)
-+LD = $(CC)
- 
--WXCONFIG = wx-config
--WXRC = wxrc
-+WXCONFIG = $(WX_CONFIG)
-+WXRC = $(WXRC_CMD)
- CFLAGS = $(shell $(WXCONFIG) --cflags) -g
- LFLAGS = $(shell $(WXCONFIG) --libs) -g
- 
+--- ./odalaunch/Makefile.orig	2009-03-08 00:28:10.000000000 -0500
++++ ./odalaunch/Makefile	2009-05-16 18:32:01.000000000 -0400
+@@ -11,11 +11,11 @@
+ 

+ HEADERS = src/*.h

+ 

+-CC = g++

+-LD = g++

++CC = $(CXX)

++LD = $(CC)

+ 

+-WXCONFIG = wx-config

+-WXRC = wxrc

++WXCONFIG = $(WX_CONFIG)

++WXRC = $(WXRC_CMD)

+ 

+ # Sometimes wx-config will uee the lowest version available, which is what

+ # we do no want! -- GhostlyDeath

diff --git a/games/odamex/files/patch-server__src__d_main.cpp b/games/odamex/files/patch-server__src__d_main.cpp
new file mode 100644
index 000000000000..d2107cd18259
--- /dev/null
+++ b/games/odamex/files/patch-server__src__d_main.cpp
@@ -0,0 +1,11 @@
+--- ./server/src/d_main.cpp.orig	2009-03-08 00:28:11.000000000 -0500
++++ ./server/src/d_main.cpp	2009-05-18 16:40:24.000000000 -0400
+@@ -597,6 +597,8 @@
+ 	AddSearchDir(dirs, Args.CheckValue("-waddir"), separator);

+ 	AddSearchDir(dirs, getenv("DOOMWADDIR"), separator);

+ 	AddSearchDir(dirs, getenv("DOOMWADPATH"), separator);

++    AddSearchDir(dirs, "%%DATADIR%%", separator);

++    AddSearchDir(dirs, "%%DMDIR%%", separator);

+     AddSearchDir(dirs, getenv("HOME"), separator);

+ 

+ 	dirs.erase(std::unique(dirs.begin(), dirs.end()), dirs.end());