Date: Mon, 3 Dec 2012 17:38:34 GMT From: Green Dog <fiziologus@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/174093: [games/odamex] update to 0.6.1 Message-ID: <201212031738.qB3HcY6s097379@red.freebsd.org> Resent-Message-ID: <201212031740.qB3He0i3053046@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 174093
>Category: ports
>Synopsis: [games/odamex] update to 0.6.1
>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: Mon Dec 03 17:40:00 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Green Dog
>Release: FreeBSD-9.0
>Organization:
>Environment:
>Description:
[games/odamex] update to 0.6.1
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -ruN odamex.orig/Makefile odamex/Makefile
--- odamex.orig/Makefile 2012-11-17 09:57:47.000000000 +0400
+++ odamex/Makefile 2012-12-03 21:24:39.000000000 +0400
@@ -6,7 +6,7 @@
#
PORTNAME= odamex
-PORTVERSION= 0.5.6
+PORTVERSION= 0.6.1
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/Odamex/${PORTVERSION}
DISTNAME= odamex-src-${PORTVERSION}
@@ -15,26 +15,23 @@
COMMENT= The Standard in Online Multiplayer Doom
USE_BZIP2= yes
-USE_GMAKE= yes
USE_SDL= sdl mixer
+USE_CMAKE= yes
+USE_DOS2UNIX= CMakeLists.txt odalaunch/CMakeLists.txt
-OPTIONS_DEFINE= LAUNCHER MIDI
+OPTIONS_DEFINE= LAUNCHER
LAUNCHER_DESC= Enable GUI launcher program
-MIDI_DESC= Enable MIDI support (timidity)
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MLAUNCHER}
USE_WX= 2.6+
-MAKE_ENV+= WXRC_CMD="${WXRC_CMD}" WITH_LAUNCHER=yes
+CMAKE_ARGS+= -DODALAUNCH_TARGET=on -DNO_AG-ODALAUNCH_TARGET=off
PLIST_SUB+= LAUNCHER=""
.else
PLIST_SUB+= LAUNCHER="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MMIDI}
-RUN_DEPENDS+= timidity:${PORTSDIR}/audio/timidity
+CMAKE_ARGS+= -DODALAUNCH_TARGET=off
.endif
post-patch:
@@ -42,24 +39,42 @@
s|%%DATADIR%%|${DATADIR}|' \
${WRKSRC}/client/src/d_main.cpp \
${WRKSRC}/server/src/d_main.cpp
-
-.if ${PORT_OPTIONS:MLAUNCHER}
- @${REINPLACE_CMD} -e 's|\./odamex|odamex|' \
- ${WRKSRC}/odalaunch/src/misc.cpp
-.endif
+ @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' \
+ -e 's|%%WX_VER%%|${WX_VERSION}|' \
+ ${WRKSRC}/odalaunch/CMakeLists.txt \
+ ${WRKSRC}/odalaunch/src/dlg_main.cpp
+ @${REINPLACE_CMD} -e 's|-waddir /usr/share/doom||' \
+ ${WRKSRC}/installer/arch/odamex.desktop
do-install:
-.for f in odamex odasrv
- ${INSTALL_PROGRAM} ${WRKSRC}/${f} ${PREFIX}/bin
-.endfor
+# Binary
+ ${INSTALL_PROGRAM} ${WRKSRC}/client/odamex ${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${WRKSRC}/server/odasrv ${PREFIX}/bin
.if ${PORT_OPTIONS:MLAUNCHER}
${INSTALL_PROGRAM} ${WRKSRC}/odalaunch/odalaunch ${PREFIX}/bin
.endif
+# Wad
${MKDIR} ${DATADIR}
${INSTALL_DATA} ${WRKSRC}/odamex.wad ${DATADIR}
+# Docs
.if ${PORT_OPTIONS:MDOCS}
${MKDIR} ${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/LICENSE ${DOCSDIR}
+.endif
+# Icons
+.for f in odamex odasrv
+ ${INSTALL_DATA} ${WRKSRC}/media/icon_${f}_*.png ${LOCALBASE}/share/pixmaps
+.endfor
+.if ${PORT_OPTIONS:MLAUNCHER}
+ ${INSTALL_DATA} ${WRKSRC}/media/icon_odalaunch_*.png ${LOCALBASE}/share/pixmaps
+.endif
+# Desktop
+.for f in odamex odasrv
+ ${INSTALL_DATA} ${WRKSRC}/installer/arch/${f}.desktop ${LOCALBASE}/share/applications
+.endfor
+.if ${PORT_OPTIONS:MLAUNCHER}
+ ${INSTALL_DATA} ${WRKSRC}/installer/arch/odalaunch.desktop ${LOCALBASE}/share/applications
.endif
.include "${.CURDIR}/../doom-data/Makefile.include"
diff -ruN odamex.orig/distinfo odamex/distinfo
--- odamex.orig/distinfo 2012-03-04 16:25:06.000000000 +0400
+++ odamex/distinfo 2012-12-03 04:08:48.000000000 +0400
@@ -1,2 +1,2 @@
-SHA256 (odamex-src-0.5.6.tar.bz2) = fc832ac2df2fceeed79b512cd789d0d30c93c46b246f50af973bb867b02a3440
-SIZE (odamex-src-0.5.6.tar.bz2) = 2954090
+SHA256 (odamex-src-0.6.1.tar.bz2) = d7758141d00510eae55132a2376326560a206c772da3d604666dc2c62009f861
+SIZE (odamex-src-0.6.1.tar.bz2) = 7522333
diff -ruN odamex.orig/files/patch-CMakeLists.txt odamex/files/patch-CMakeLists.txt
--- odamex.orig/files/patch-CMakeLists.txt 1970-01-01 03:00:00.000000000 +0300
+++ odamex/files/patch-CMakeLists.txt 2012-12-03 15:06:53.000000000 +0400
@@ -0,0 +1,13 @@
+--- CMakeLists.txt.orig 2012-12-03 15:03:21.000000000 +0400
++++ CMakeLists.txt 2012-12-03 15:05:49.000000000 +0400
+@@ -43,7 +43,9 @@
+ add_subdirectory(client)
+ add_subdirectory(server)
+ add_subdirectory(master)
+-add_subdirectory(odalaunch)
++if(ODALAUNCH_TARGET)
++ add_subdirectory(odalaunch)
++endif()
+
+ # Disable the ag-odalaunch target completely: -DNO_AG-ODALAUNCH_TARGET
+ # This is only really useful when setting up a universal build.
diff -ruN odamex.orig/files/patch-Makefile odamex/files/patch-Makefile
--- odamex.orig/files/patch-Makefile 2012-03-04 16:25:06.000000000 +0400
+++ odamex/files/patch-Makefile 1970-01-01 03:00:00.000000000 +0300
@@ -1,56 +0,0 @@
---- Makefile.orig 2011-11-05 05:00:05.000000000 +0100
-+++ Makefile 2011-12-01 05:33:47.415968992 +0100
-@@ -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
-@@ -177,7 +177,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
-@@ -213,7 +213,12 @@
- # denis - end fixme
-
- # All
--all: $(SERVER_TARGET) $(CLIENT_TARGET) $(WADFILE_TARGET)
-+all: $(SERVER_TARGET) $(CLIENT_TARGET) $(WADFILE_TARGET) launcher
-+
-+launcher:
-+ifdef WITH_LAUNCHER
-+ $(MAKE) -C odalaunch odalaunch
-+endif
-
- # Textscreen
- $(OBJDIR)/$(TEXTSCREEN_DIR)/%.o: $(TEXTSCREEN_DIR)/%.cpp $(TEXTSCREEN_HEADERS) $(COMMON_HEADERS)
diff -ruN odamex.orig/files/patch-client-src-d_main.cpp odamex/files/patch-client-src-d_main.cpp
--- odamex.orig/files/patch-client-src-d_main.cpp 1970-01-01 03:00:00.000000000 +0300
+++ odamex/files/patch-client-src-d_main.cpp 2012-12-03 06:57:57.000000000 +0400
@@ -0,0 +1,11 @@
+--- client/src/d_main.cpp.orig 2012-07-02 07:44:58.000000000 +0400
++++ client/src/d_main.cpp 2012-12-03 06:52:17.000000000 +0400
+@@ -834,6 +834,8 @@
+ D_AddSearchDir(dirs, Args.CheckValue("-waddir"), separator);
+ D_AddSearchDir(dirs, getenv("DOOMWADDIR"), separator);
+ D_AddSearchDir(dirs, getenv("DOOMWADPATH"), separator);
++ D_AddSearchDir(dirs, "%%DATADIR%%", separator);
++ D_AddSearchDir(dirs, "%%DMDIR%%", separator);
+ D_AddSearchDir(dirs, getenv("HOME"), separator);
+ D_AddSearchDir(dirs, waddirs.cstring(), separator);
+
diff -ruN odamex.orig/files/patch-client__src__d_main.cpp odamex/files/patch-client__src__d_main.cpp
--- odamex.orig/files/patch-client__src__d_main.cpp 2012-03-04 16:25:06.000000000 +0400
+++ odamex/files/patch-client__src__d_main.cpp 1970-01-01 03:00:00.000000000 +0300
@@ -1,11 +0,0 @@
---- client/src/d_main.cpp.orig 2011-11-05 05:00:05.000000000 +0100
-+++ client/src/d_main.cpp 2011-12-01 05:33:47.422967926 +0100
-@@ -843,6 +843,8 @@
- D_AddSearchDir(dirs, Args.CheckValue("-waddir"), separator);
- D_AddSearchDir(dirs, getenv("DOOMWADDIR"), separator);
- D_AddSearchDir(dirs, getenv("DOOMWADPATH"), separator);
-+ D_AddSearchDir(dirs, "/usr/local/share/odamex", separator);
-+ D_AddSearchDir(dirs, "/usr/local/share/doom", separator);
- D_AddSearchDir(dirs, getenv("HOME"), separator);
- D_AddSearchDir(dirs, waddirs.cstring(), separator);
-
diff -ruN odamex.orig/files/patch-odalaunch-CMakeLists.txt odamex/files/patch-odalaunch-CMakeLists.txt
--- odamex.orig/files/patch-odalaunch-CMakeLists.txt 1970-01-01 03:00:00.000000000 +0300
+++ odamex/files/patch-odalaunch-CMakeLists.txt 2012-12-03 16:22:05.000000000 +0400
@@ -0,0 +1,10 @@
+--- odalaunch/CMakeLists.txt.orig 2012-12-03 16:15:08.000000000 +0400
++++ odalaunch/CMakeLists.txt 2012-12-03 16:20:04.000000000 +0400
+@@ -30,6 +30,7 @@
+
+ # Odalaunch target
+ if(wxWidgets_FOUND)
++ set(wxWidgets_wxrc_EXECUTABLE %%PREFIX%%/bin/wxrc-gtk2-%%WX_VER%%)
+ add_custom_command(
+ OUTPUT ${XRCRES_HEADER}
+ COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/res
diff -ruN odamex.orig/files/patch-odalaunch-src-dlg_main.cpp odamex/files/patch-odalaunch-src-dlg_main.cpp
--- odamex.orig/files/patch-odalaunch-src-dlg_main.cpp 1970-01-01 03:00:00.000000000 +0300
+++ odamex/files/patch-odalaunch-src-dlg_main.cpp 2012-12-03 21:23:01.000000000 +0400
@@ -0,0 +1,11 @@
+--- odalaunch/src/dlg_main.cpp.orig 2012-05-31 03:49:32.000000000 +0400
++++ odalaunch/src/dlg_main.cpp 2012-12-03 21:21:50.000000000 +0400
+@@ -193,7 +193,7 @@
+ launchercfg_s.get_list_on_start = 1;
+ launchercfg_s.show_blocked_servers = 0;
+ launchercfg_s.wad_paths = wxGetCwd();
+- launchercfg_s.odamex_directory = wxGetCwd();
++ launchercfg_s.odamex_directory = wxString("%%PREFIX%%/bin");
+
+ m_LstCtrlServers = XRCCTRL(*this, "Id_LstCtrlServers", LstOdaServerList);
+ m_LstCtrlPlayers = XRCCTRL(*this, "Id_LstCtrlPlayers", LstOdaPlayerList);
diff -ruN odamex.orig/files/patch-odalaunch__Makefile odamex/files/patch-odalaunch__Makefile
--- odamex.orig/files/patch-odalaunch__Makefile 2012-03-04 16:25:06.000000000 +0400
+++ odamex/files/patch-odalaunch__Makefile 1970-01-01 03:00:00.000000000 +0300
@@ -1,18 +0,0 @@
---- odalaunch/Makefile.orig 2011-11-05 05:00:03.000000000 +0100
-+++ odalaunch/Makefile 2011-12-01 05:33:47.418968116 +0100
-@@ -23,11 +23,11 @@
- -I./res \
- -I../odalpapi
-
--CC = g++
--LD = g++
-+CC = $(CXX)
-+LD = $(CC)
-
--WXCONFIG = wx-config
--WXRC = wxrc
-+WXCONFIG = $(WX_CONFIG)
-+WXRC = $(WXRC_CMD)
-
- # Sometimes wx-config will use the lowest version available, which is what
- # we do no want! -- GhostlyDeath
diff -ruN odamex.orig/files/patch-server-src-d_main.cpp odamex/files/patch-server-src-d_main.cpp
--- odamex.orig/files/patch-server-src-d_main.cpp 1970-01-01 03:00:00.000000000 +0300
+++ odamex/files/patch-server-src-d_main.cpp 2012-12-03 06:58:44.000000000 +0400
@@ -0,0 +1,11 @@
+--- server/src/d_main.cpp.orig 2012-07-02 07:44:58.000000000 +0400
++++ server/src/d_main.cpp 2012-12-03 06:56:33.000000000 +0400
+@@ -628,6 +628,8 @@
+ D_AddSearchDir(dirs, Args.CheckValue("-waddir"), separator);
+ D_AddSearchDir(dirs, getenv("DOOMWADDIR"), separator);
+ D_AddSearchDir(dirs, getenv("DOOMWADPATH"), separator);
++ D_AddSearchDir(dirs, "%%DATADIR%%", separator);
++ D_AddSearchDir(dirs, "%%DMDIR%%", separator);
+ D_AddSearchDir(dirs, getenv("HOME"), separator);
+ D_AddSearchDir(dirs, waddirs.cstring(), separator);
+
diff -ruN odamex.orig/files/patch-server__src__d_main.cpp odamex/files/patch-server__src__d_main.cpp
--- odamex.orig/files/patch-server__src__d_main.cpp 2012-03-04 16:25:06.000000000 +0400
+++ odamex/files/patch-server__src__d_main.cpp 1970-01-01 03:00:00.000000000 +0300
@@ -1,11 +0,0 @@
---- server/src/d_main.cpp.orig 2011-11-05 04:59:48.000000000 +0100
-+++ server/src/d_main.cpp 2011-12-01 05:33:47.423967844 +0100
-@@ -627,6 +627,8 @@
- D_AddSearchDir(dirs, Args.CheckValue("-waddir"), separator);
- D_AddSearchDir(dirs, getenv("DOOMWADDIR"), separator);
- D_AddSearchDir(dirs, getenv("DOOMWADPATH"), separator);
-+ D_AddSearchDir(dirs, "/usr/local/share/odamex", separator);
-+ D_AddSearchDir(dirs, "/usr/local/share/doom", separator);
- D_AddSearchDir(dirs, getenv("HOME"), separator);
- D_AddSearchDir(dirs, waddirs.cstring(), separator);
-
diff -ruN odamex.orig/pkg-plist odamex/pkg-plist
--- odamex.orig/pkg-plist 2012-03-04 16:25:06.000000000 +0400
+++ odamex/pkg-plist 2012-12-03 19:42:09.000000000 +0400
@@ -1,7 +1,23 @@
%%LAUNCHER%%bin/odalaunch
+%%LAUNCHER%%share/applications/odalaunch.desktop
+%%LAUNCHER%%share/pixmaps/icon_odalaunch_128.png
+%%LAUNCHER%%share/pixmaps/icon_odalaunch_256.png
+%%LAUNCHER%%share/pixmaps/icon_odalaunch_512.png
+%%LAUNCHER%%share/pixmaps/icon_odalaunch_96.png
bin/odamex
bin/odasrv
+share/applications/odamex.desktop
+share/applications/odasrv.desktop
+share/pixmaps/icon_odamex_128.png
+share/pixmaps/icon_odamex_256.png
+share/pixmaps/icon_odamex_512.png
+share/pixmaps/icon_odamex_96.png
+share/pixmaps/icon_odasrv_128.png
+share/pixmaps/icon_odasrv_256.png
+share/pixmaps/icon_odasrv_512.png
+share/pixmaps/icon_odasrv_96.png
%%DATADIR%%/odamex.wad
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
%%PORTDOCS%%%%DOCSDIR%%/README
@dirrm %%DATADIR%%
%%PORTDOCS%%@dirrm %%DOCSDIR%%
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212031738.qB3HcY6s097379>