Attachment #96039 for bug #134595

View | Details | Raw Unified | Return to bug 134595
Collapse All | Expand All




# New ports collection makefile for:	odamex
# Date created:				2007-12-06
# Whom:					Josh Rickmar <joshua_rickmar@eumx.net>
#
# $FreeBSD$
#

PORTNAME=	odamex
PORTVERSION=	0.4.3
PORTREVISION=	1
CATEGORIES=	games
MASTER_SITES=	SF
DISTNAME=	odamex-src-${PORTVERSION}

MAINTAINER=	joshua_rickmar@eumx.net
COMMENT=	The Standard in Online Multiplayer Doom

USE_BZIP2=	yes

Lines 1-3 Link Here

(-)odamex/distinfo (-3 / +3 lines)
1	MD5 (Odamex-0.3-src.tar.bz2) = 6b9eb253813a835b7761424f62514cec	1	MD5 (odamex-src-0.4.3.tar.bz2) = 4f1caf8208ff6c2978337446b38ab649
2	SHA256 (Odamex-0.3-src.tar.bz2) = 616fc68848ffb13fe05e2017f2d21e9fb1a1b538be02715ea4b33f72b9867e1e	2	SHA256 (odamex-src-0.4.3.tar.bz2) = a958b5e34acd57bdc4a0131c939161d64042bf9efcd71560cd970014c1eb0430
3	SIZE (Odamex-0.3-src.tar.bz2) = 1095587	3	SIZE (odamex-src-0.4.3.tar.bz2) = 1299002




--- ./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
 
@@ -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
@@ -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
@@ -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)




--- ./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);
     AddSearchDir(dirs, getenv("HOME"), separator);
 
     dirs.erase(std::unique(dirs.begin(), dirs.end()), dirs.end());
 	dirs.push_back(progdir);




--- ./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

Return to bug 134595

Lines 1-18 Link Here

(-)odamex/Makefile (-6 / +5 lines)
1	# New ports collection makefile for: odamex	1	# New ports collection makefile for: odamex
2	# Date created: 2007-12-06	2	# Date created: 2007-12-06
3	# Whom: alepulver	3	# Whom: Josh Rickmar <joshua_rickmar@eumx.net>
4	#	4	#
5	# $FreeBSD: ports/games/odamex/Makefile,v 1.4 2009/02/27 21:24:36 alepulver Exp $	5	# $FreeBSD$
6	#	6	#
7		7
8	PORTNAME= odamex	8	PORTNAME= odamex
9	PORTVERSION= 0.3	9	PORTVERSION= 0.4.3
10	PORTREVISION= 1
11	CATEGORIES= games	10	CATEGORIES= games
12	MASTER_SITES= SF	11	MASTER_SITES= SF
13	DISTNAME= Odamex-${PORTVERSION}-src	12	DISTNAME= odamex-src-${PORTVERSION}
14		13
15	MAINTAINER= ports@FreeBSD.org	14	MAINTAINER= joshua_rickmar@eumx.net
16	COMMENT= The Standard in Online Multiplayer Doom	15	COMMENT= The Standard in Online Multiplayer Doom
17		16
18	USE_BZIP2= yes	17	USE_BZIP2= yes

Lines 1-56 Link Here

(-)odamex/files/patch-Makefile (-53 / +53 lines)
1	--- ./Makefile.orig Sun Nov 4 12:21:20 2007	1	--- ./Makefile.orig 2009-03-08 00:28:16.000000000 -0500
2	+++ ./Makefile Sun Feb 3 20:48:01 2008	2	+++ ./Makefile 2009-05-16 17:15:11.000000000 -0400
3	@@ -3,8 +3,8 @@	3	@@ -3,8 +3,8 @@
4	OBJDIR = obj	4	OBJDIR = obj
5	# denis - fixme - remove mkdir -p	5	# denis - fixme - remove mkdir -p
6	MKDIR = mkdir -p	6	MKDIR = mkdir -p
7	-CC = g++	7	-CC = g++
8	-LD = g++	8	-LD = g++
9	+CC = $(CXX)	9	+CC = $(CXX)
10	+LD = $(CC)	10	+LD = $(CC)
11	INSTALL = cp	11	INSTALL = cp
12	DEUTEX = deutex	12	DEUTEX = deutex
13		13
14	@@ -62,7 +62,7 @@	14	@@ -62,7 +62,7 @@
15	DEUTEX_FLAGS = -rgb 0 255 255	15	DEUTEX_FLAGS = -rgb 0 255 255
16		16
17	# Platform and sdl-config flags	17	# Platform and sdl-config flags
18	-X11_LFLAGS = -L/usr/X11R6/lib -lX11	18	-X11_LFLAGS = -L/usr/X11R6/lib -lX11
19	+X11_LFLAGS = -L$(LOCALBASE)/lib -lX11	19	+X11_LFLAGS = -L$(LOCALBASE)/lib -lX11
20		20
21	SDL_CFLAGS_COMMAND = sdl-config --cflags	21	SDL_CFLAGS_COMMAND = sdl-config --cflags
22	SDL_LFLAGS_COMMAND = sdl-config --libs	22	SDL_LFLAGS_COMMAND = sdl-config --libs
23	@@ -85,8 +85,8 @@	23	@@ -85,8 +85,8 @@
24		24
25	ifeq ($(strip $(freebsd)), true)	25	ifeq ($(strip $(freebsd)), true)
26	ifeq ($(SDL_CFLAGS),)	26	ifeq ($(SDL_CFLAGS),)
27	-SDL_CFLAGS_COMMAND = sdl11-config --cflags	27	-SDL_CFLAGS_COMMAND = sdl11-config --cflags
28	-SDL_LFLAGS_COMMAND = sdl11-config --libs	28	-SDL_LFLAGS_COMMAND = sdl11-config --libs
29	+SDL_CFLAGS_COMMAND = $(SDL_CONFIG) --cflags	29	+SDL_CFLAGS_COMMAND = $(SDL_CONFIG) --cflags
30	+SDL_LFLAGS_COMMAND = $(SDL_CONFIG) --libs	30	+SDL_LFLAGS_COMMAND = $(SDL_CONFIG) --libs
31	SDL_CFLAGS = $(shell $(SDL_CFLAGS_COMMAND))	31	SDL_CFLAGS = $(shell $(SDL_CFLAGS_COMMAND))
32	SDL_LFLAGS = $(shell $(SDL_LFLAGS_COMMAND)) $(X11_LFLAGS)	32	SDL_LFLAGS = $(shell $(SDL_LFLAGS_COMMAND)) $(X11_LFLAGS)
33	endif	33	endif
34	@@ -173,7 +173,7 @@	34	@@ -174,7 +174,7 @@
35	TARGETS = $(SERVER_TARGET) $(CLIENT_TARGET) $(MASTER_TARGET) $(WADFILE_TARGET)	35	TARGETS = $(SERVER_TARGET) $(CLIENT_TARGET) $(MASTER_TARGET) $(WADFILE_TARGET)
36		36
37	# denis - fixme - cflags are quite messy, but removing these is a very delicate act, also use -Wall -Werror	37	# denis - fixme - cflags are quite messy, but removing these is a very delicate act, also use -Wall -Werror
38	-CFLAGS = $(CFLAGS_PLATFORM) -DNOASM -Icommon -g -Wall -O2	38	-CFLAGS = $(CFLAGS_PLATFORM) -DNOASM -Icommon -g -Wall -O2
39	+CFLAGS += $(CFLAGS_PLATFORM) -DNOASM -Icommon -g -Wall -O2	39	+CFLAGS += $(CFLAGS_PLATFORM) -DNOASM -Icommon -g -Wall -O2
40	LFLAGS = $(LFLAGS_PLATFORM)	40	LFLAGS = $(LFLAGS_PLATFORM)
41		41
42	CFLAGS_RELEASE = $(CFLAGS_PLATFORM) -DNOASM -Icommon -O3	42	CFLAGS_RELEASE = $(CFLAGS_PLATFORM) -DNOASM -Icommon -O3
43	@@ -209,7 +209,12 @@	43	@@ -210,7 +210,12 @@
44	# denis - end fixme	44	# denis - end fixme
45		45
46	# All	46	# All
47	-all: $(SERVER_TARGET) $(CLIENT_TARGET) $(MASTER_TARGET) $(WADFILE_TARGET)	47	-all: $(SERVER_TARGET) $(CLIENT_TARGET) $(MASTER_TARGET) $(WADFILE_TARGET)
48	+all: $(SERVER_TARGET) $(CLIENT_TARGET) $(MASTER_TARGET) $(WADFILE_TARGET) launcher	48	+all: $(SERVER_TARGET) $(CLIENT_TARGET) $(MASTER_TARGET) $(WADFILE_TARGET) launcher
49	+	49	+
50	+launcher:	50	+launcher:
51	+ifdef WITH_LAUNCHER	51	+ifdef WITH_LAUNCHER
52	+ $(MAKE) -C odalaunch odalaunch	52	+ $(MAKE) -C odalaunch odalaunch
53	+endif	53	+endif
54		54
55	# Common for server	55	# Common for server
56	$(OBJDIR)/$(COMMON_DIR)/server_%.o: $(COMMON_DIR)/%.cpp $(COMMON_HEADERS) $(SERVER_HEADERS)	56	$(OBJDIR)/$(COMMON_DIR)/server_%.o: $(COMMON_DIR)/%.cpp $(COMMON_HEADERS) $(SERVER_HEADERS)

Lines 1-12 Link Here

(-)odamex/files/patch-client__src__d_main.cpp (-11 / +10 lines)
1	--- ./client/src/d_main.cpp.orig Sun Nov 4 12:21:20 2007	1	--- ./client/src/d_main.cpp.orig 2009-03-08 00:28:16.000000000 -0500
2	+++ ./client/src/d_main.cpp Thu Dec 6 13:58:25 2007	2	+++ ./client/src/d_main.cpp 2009-05-16 18:23:51.000000000 -0400
3	@@ -727,6 +727,9 @@	3	@@ -807,6 +807,8 @@
4	AddSearchDir(dirs, Args.CheckValue("-waddir"), separator);	4	AddSearchDir(dirs, Args.CheckValue("-waddir"), separator);
5	AddSearchDir(dirs, getenv("-DOOMWADDIR"), separator);	5	AddSearchDir(dirs, getenv("DOOMWADDIR"), separator);
6	AddSearchDir(dirs, getenv("-DOOMWADPATH"), separator);	6	AddSearchDir(dirs, getenv("DOOMWADPATH"), separator);
7	+ AddSearchDir(dirs, "%%DATADIR%%", separator);	7	+ AddSearchDir(dirs, "%%DATADIR%%", separator);
8	+ AddSearchDir(dirs, "%%DMDIR%%", separator);	8	+ AddSearchDir(dirs, "%%DMDIR%%", separator);
9	+	9	AddSearchDir(dirs, getenv("HOME"), separator);
10		10
11	dirs.push_back(startdir);	11	dirs.erase(std::unique(dirs.begin(), dirs.end()), dirs.end());
12	dirs.push_back(progdir);

Lines 1-18 Link Here

(-)odamex/files/patch-odalaunch__Makefile (-18 / +18 lines)
1	--- ./odalaunch/Makefile.orig Sun Nov 4 12:21:16 2007	1	--- ./odalaunch/Makefile.orig 2009-03-08 00:28:10.000000000 -0500
2	+++ ./odalaunch/Makefile Sun Feb 3 20:42:50 2008	2	+++ ./odalaunch/Makefile 2009-05-16 18:32:01.000000000 -0400
3	@@ -9,11 +9,11 @@	3	@@ -11,11 +11,11 @@
4		4
5	HEADERS = src/*.h	5	HEADERS = src/*.h
6		6
7	-CC = g++	7	-CC = g++
8	-LD = g++	8	-LD = g++
9	+CC = $(CXX)	9	+CC = $(CXX)
10	+LD = $(CC)	10	+LD = $(CC)
11		11
12	-WXCONFIG = wx-config	12	-WXCONFIG = wx-config
13	-WXRC = wxrc	13	-WXRC = wxrc
14	+WXCONFIG = $(WX_CONFIG)	14	+WXCONFIG = $(WX_CONFIG)
15	+WXRC = $(WXRC_CMD)	15	+WXRC = $(WXRC_CMD)
16	CFLAGS = $(shell $(WXCONFIG) --cflags) -g	16
17	LFLAGS = $(shell $(WXCONFIG) --libs) -g	17	# Sometimes wx-config will uee the lowest version available, which is what
18		18	# we do no want! -- GhostlyDeath