>Number: 134595
>Category: ports
>Synopsis: Take games/odamex port and update to 0.4.3
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sun May 17 03:30:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Josh Rickmar
>Release: 7.2-RELEASE
>Organization:
>Environment:
FreeBSD FGD135.localdomain 7.2-RELEASE FreeBSD 7.2-RELEASE #0: Tue May 5 01:52:24 EDT 2009 joshua at FGD135.localdomain:/usr/obj/usr/src/sys/CUSTOM i386
>Description:
I would like to take over this port. Attached is an update to version 0.4.3.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -ruN odamex.bak/Makefile odamex/Makefile
--- odamex.bak/Makefile 2009-05-16 23:18:49.000000000 -0400
+++ odamex/Makefile 2009-05-16 23:15:25.000000000 -0400
@@ -1,18 +1,17 @@
# New ports collection makefile for: odamex
# Date created: 2007-12-06
-# Whom: alepulver
+# Whom: Josh Rickmar <joshua_rickmar at eumx.net>
#
-# $FreeBSD: ports/games/odamex/Makefile,v 1.4 2009/02/27 21:24:36 alepulver Exp $
+# $FreeBSD$
#
PORTNAME= odamex
-PORTVERSION= 0.3
-PORTREVISION= 1
+PORTVERSION= 0.4.3
CATEGORIES= games
MASTER_SITES= SF
-DISTNAME= Odamex-${PORTVERSION}-src
+DISTNAME= odamex-src-${PORTVERSION}
-MAINTAINER= ports at FreeBSD.org
+MAINTAINER= joshua_rickmar at eumx.net
COMMENT= The Standard in Online Multiplayer Doom
USE_BZIP2= yes
diff -ruN odamex.bak/distinfo odamex/distinfo
--- odamex.bak/distinfo 2009-05-16 23:18:49.000000000 -0400
+++ odamex/distinfo 2009-05-16 23:15:25.000000000 -0400
@@ -1,3 +1,3 @@
-MD5 (Odamex-0.3-src.tar.bz2) = 6b9eb253813a835b7761424f62514cec
-SHA256 (Odamex-0.3-src.tar.bz2) = 616fc68848ffb13fe05e2017f2d21e9fb1a1b538be02715ea4b33f72b9867e1e
-SIZE (Odamex-0.3-src.tar.bz2) = 1095587
+MD5 (odamex-src-0.4.3.tar.bz2) = 4f1caf8208ff6c2978337446b38ab649
+SHA256 (odamex-src-0.4.3.tar.bz2) = a958b5e34acd57bdc4a0131c939161d64042bf9efcd71560cd970014c1eb0430
+SIZE (odamex-src-0.4.3.tar.bz2) = 1299002
diff -ruN odamex.bak/files/patch-Makefile odamex/files/patch-Makefile
--- odamex.bak/files/patch-Makefile 2009-05-16 23:18:49.000000000 -0400
+++ odamex/files/patch-Makefile 2009-05-16 23:15:25.000000000 -0400
@@ -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 -ruN odamex.bak/files/patch-client__src__d_main.cpp odamex/files/patch-client__src__d_main.cpp
--- odamex.bak/files/patch-client__src__d_main.cpp 2009-05-16 23:18:49.000000000 -0400
+++ odamex/files/patch-client__src__d_main.cpp 2009-05-16 23:15:25.000000000 -0400
@@ -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 -ruN odamex.bak/files/patch-odalaunch__Makefile odamex/files/patch-odalaunch__Makefile
--- odamex.bak/files/patch-odalaunch__Makefile 2009-05-16 23:18:49.000000000 -0400
+++ odamex/files/patch-odalaunch__Makefile 2009-05-16 23:15:25.000000000 -0400
@@ -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
>Release-Note:
>Audit-Trail:
>Unformatted: