From nobody@FreeBSD.org  Mon Dec  3 17:38:34 2012
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 84761AC
	for <freebsd-gnats-submit@FreeBSD.org>; Mon,  3 Dec 2012 17:38:34 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 6A5F18FC1A
	for <freebsd-gnats-submit@FreeBSD.org>; Mon,  3 Dec 2012 17:38:34 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.5/8.14.5) with ESMTP id qB3HcYMM097381
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 3 Dec 2012 17:38:34 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.5/8.14.5/Submit) id qB3HcY6s097379;
	Mon, 3 Dec 2012 17:38:34 GMT
	(envelope-from nobody)
Message-Id: <201212031738.qB3HcY6s097379@red.freebsd.org>
Date: Mon, 3 Dec 2012 17:38:34 GMT
From: Green Dog <fiziologus@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [games/odamex] update to 0.6.1
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         174093
>Category:       ports
>Synopsis:       games/odamex: update to 0.6.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    madpilot
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Dec 03 17:40:00 UTC 2012
>Closed-Date:    Sun Feb 24 17:21:15 UTC 2013
>Last-Modified:  Sun Feb 24 17:30:00 UTC 2013
>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:

From: Max Brazhnikov <makc@issp.ac.ru>
To: bug-followup@freebsd.org, fiziologus@gmail.com
Cc:  
Subject: Re: ports/174093: games/odamex: update to 0.6.1
Date: Fri, 11 Jan 2013 01:33:23 +0000

 Hi,
 
 Does this port really need custom install target? New version is based on
 cmake, it's very unlikely that it can't install files by itself.
 
 Cheers,
 Max

From: green dog <fiziologus@gmail.com>
To: Max Brazhnikov <makc@issp.ac.ru>
Cc: bug-followup@freebsd.org
Subject: Re: ports/174093: games/odamex: update to 0.6.1
Date: Sun, 13 Jan 2013 13:22:02 +0400

 --f46d044304dcafbe7104d3280f50
 Content-Type: multipart/alternative; boundary=f46d044304dcafbe6e04d3280f4e
 
 --f46d044304dcafbe6e04d3280f4e
 Content-Type: text/plain; charset=ISO-8859-1
 
 No install target.
 
 In attach fixed port for no default PREFIX.
 
 
 2013/1/11 Max Brazhnikov <makc@issp.ac.ru>
 
 > Hi,
 >
 > Does this port really need custom install target? New version is based on
 > cmake, it's very unlikely that it can't install files by itself.
 >
 > Cheers,
 > Max
 >
 
 --f46d044304dcafbe6e04d3280f4e
 Content-Type: text/html; charset=ISO-8859-1
 Content-Transfer-Encoding: quoted-printable
 
 <div dir=3D"ltr"><div>No install target.<br></div><div><br></div><div>In at=
 tach fixed port for no default PREFIX.</div></div><div class=3D"gmail_extra=
 "><br><br><div class=3D"gmail_quote">2013/1/11 Max Brazhnikov <span dir=3D"=
 ltr">&lt;<a href=3D"mailto:makc@issp.ac.ru" target=3D"_blank">makc@issp.ac.=
 ru</a>&gt;</span><br>
 <blockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1p=
 x #ccc solid;padding-left:1ex">Hi,<br>
 <br>
 Does this port really need custom install target? New version is based on<b=
 r>
 cmake, it&#39;s very unlikely that it can&#39;t install files by itself.<br=
 >
 <br>
 Cheers,<br>
 Max<br>
 </blockquote></div><br></div>
 
 --f46d044304dcafbe6e04d3280f4e--
 --f46d044304dcafbe7104d3280f50
 Content-Type: text/plain; charset=US-ASCII; name="patch.txt"
 Content-Disposition: attachment; filename="patch.txt"
 Content-Transfer-Encoding: base64
 X-Attachment-Id: f_hbvz82uf0
 
 ZGlmZiAtdSBvZGFtZXgub3JpZy9NYWtlZmlsZSBvZGFtZXgvTWFrZWZpbGUKLS0tIG9kYW1leC5v
 cmlnL01ha2VmaWxlCTIwMTItMTEtMTcgMDk6NTc6NDcuMDAwMDAwMDAwICswNDAwCisrKyBvZGFt
 ZXgvTWFrZWZpbGUJMjAxMy0wMS0xMyAxMzoxOTo1Ni4wMDAwMDAwMDAgKzA0MDAKQEAgLTYsNyAr
 Niw3IEBACiAjCiAKIFBPUlROQU1FPQlvZGFtZXgKLVBPUlRWRVJTSU9OPQkwLjUuNgorUE9SVFZF
 UlNJT049CTAuNi4xCiBDQVRFR09SSUVTPQlnYW1lcwogTUFTVEVSX1NJVEVTPQlTRi8ke1BPUlRO
 QU1FfS9PZGFtZXgvJHtQT1JUVkVSU0lPTn0KIERJU1ROQU1FPQlvZGFtZXgtc3JjLSR7UE9SVFZF
 UlNJT059CkBAIC0xNSwyNiArMTUsMjMgQEAKIENPTU1FTlQ9CVRoZSBTdGFuZGFyZCBpbiBPbmxp
 bmUgTXVsdGlwbGF5ZXIgRG9vbQogCiBVU0VfQlpJUDI9CXllcwotVVNFX0dNQUtFPQl5ZXMKIFVT
 RV9TREw9CXNkbCBtaXhlcgorVVNFX0NNQUtFPQl5ZXMKK1VTRV9ET1MyVU5JWD0JQ01ha2VMaXN0
 cy50eHQgb2RhbGF1bmNoL0NNYWtlTGlzdHMudHh0CiAKLU9QVElPTlNfREVGSU5FPSBMQVVOQ0hF
 UiBNSURJCitPUFRJT05TX0RFRklORT0JTEFVTkNIRVIKIAogTEFVTkNIRVJfREVTQz0JRW5hYmxl
 IEdVSSBsYXVuY2hlciBwcm9ncmFtCi1NSURJX0RFU0M9CUVuYWJsZSBNSURJIHN1cHBvcnQgKHRp
 bWlkaXR5KQogCiAuaW5jbHVkZSA8YnNkLnBvcnQub3B0aW9ucy5taz4KIAogLmlmICR7UE9SVF9P
 UFRJT05TOk1MQVVOQ0hFUn0KIFVTRV9XWD0JCTIuNisKLU1BS0VfRU5WKz0JV1hSQ19DTUQ9IiR7
 V1hSQ19DTUR9IiBXSVRIX0xBVU5DSEVSPXllcworQ01BS0VfQVJHUys9CS1ET0RBTEFVTkNIX1RB
 UkdFVD1vbiAtRE5PX0FHLU9EQUxBVU5DSF9UQVJHRVQ9b2ZmCiBQTElTVF9TVUIrPQlMQVVOQ0hF
 Uj0iIgogLmVsc2UKIFBMSVNUX1NVQis9CUxBVU5DSEVSPSJAY29tbWVudCAiCi0uZW5kaWYKLQot
 LmlmICR7UE9SVF9PUFRJT05TOk1NSURJfQotUlVOX0RFUEVORFMrPQl0aW1pZGl0eToke1BPUlRT
 RElSfS9hdWRpby90aW1pZGl0eQorQ01BS0VfQVJHUys9CS1ET0RBTEFVTkNIX1RBUkdFVD1vZmYK
 IC5lbmRpZgogCiBwb3N0LXBhdGNoOgpAQCAtNDIsMjQgKzM5LDQzIEBACiAJCXN8JSVEQVRBRElS
 JSV8JHtEQVRBRElSfXwnIFwKIAkJJHtXUktTUkN9L2NsaWVudC9zcmMvZF9tYWluLmNwcCBcCiAJ
 CSR7V1JLU1JDfS9zZXJ2ZXIvc3JjL2RfbWFpbi5jcHAKLQotLmlmICR7UE9SVF9PUFRJT05TOk1M
 QVVOQ0hFUn0KLQlAJHtSRUlOUExBQ0VfQ01EfSAtZSAnc3xcLi9vZGFtZXh8b2RhbWV4fCcgXAot
 CQkke1dSS1NSQ30vb2RhbGF1bmNoL3NyYy9taXNjLmNwcAotLmVuZGlmCisJQCR7UkVJTlBMQUNF
 X0NNRH0gLWUgJ3N8JSVQUkVGSVglJXwke1BSRUZJWH18JyBcCisJCSR7V1JLU1JDfS9vZGFsYXVu
 Y2gvc3JjL2RsZ19tYWluLmNwcAorCUAke1JFSU5QTEFDRV9DTUR9IC1lICdzfCUlV1hfVkVSJSV8
 JHtXWF9WRVJTSU9OfXwnIFwKKwkJLWUgJ3N8JSVMT0NBTEJBU0UlJXwke0xPQ0FMQkFTRX18JyBc
 CisJCSR7V1JLU1JDfS9vZGFsYXVuY2gvQ01ha2VMaXN0cy50eHQKKwlAJHtSRUlOUExBQ0VfQ01E
 fSAtZSAnc3wtd2FkZGlyIC91c3Ivc2hhcmUvZG9vbXx8JyBcCisJCSR7V1JLU1JDfS9pbnN0YWxs
 ZXIvYXJjaC9vZGFtZXguZGVza3RvcAogCiBkby1pbnN0YWxsOgotLmZvciBmIGluIG9kYW1leCBv
 ZGFzcnYKLQkke0lOU1RBTExfUFJPR1JBTX0gJHtXUktTUkN9LyR7Zn0gJHtQUkVGSVh9L2Jpbgot
 LmVuZGZvcgorIyBCaW5hcnkKKwkke0lOU1RBTExfUFJPR1JBTX0gJHtXUktTUkN9L2NsaWVudC9v
 ZGFtZXggJHtQUkVGSVh9L2JpbgorCSR7SU5TVEFMTF9QUk9HUkFNfSAke1dSS1NSQ30vc2VydmVy
 L29kYXNydiAke1BSRUZJWH0vYmluCiAuaWYgJHtQT1JUX09QVElPTlM6TUxBVU5DSEVSfQogCSR7
 SU5TVEFMTF9QUk9HUkFNfSAke1dSS1NSQ30vb2RhbGF1bmNoL29kYWxhdW5jaCAke1BSRUZJWH0v
 YmluCiAuZW5kaWYKKyMgV2FkCiAJJHtNS0RJUn0gJHtEQVRBRElSfQogCSR7SU5TVEFMTF9EQVRB
 fSAke1dSS1NSQ30vb2RhbWV4LndhZCAke0RBVEFESVJ9CisjIERvY3MKIC5pZiAke1BPUlRfT1BU
 SU9OUzpNRE9DU30KIAkke01LRElSfSAke0RPQ1NESVJ9CiAJJHtJTlNUQUxMX0RBVEF9ICR7V1JL
 U1JDfS9SRUFETUUgJHtET0NTRElSfQorCSR7SU5TVEFMTF9EQVRBfSAke1dSS1NSQ30vTElDRU5T
 RSAke0RPQ1NESVJ9CisuZW5kaWYKKyMgSWNvbnMKKy5mb3IgZiBpbiBvZGFtZXggb2Rhc3J2CisJ
 JHtJTlNUQUxMX0RBVEF9ICR7V1JLU1JDfS9tZWRpYS9pY29uXyR7Zn1fKi5wbmcgJHtMT0NBTEJB
 U0V9L3NoYXJlL3BpeG1hcHMKKy5lbmRmb3IKKy5pZiAke1BPUlRfT1BUSU9OUzpNTEFVTkNIRVJ9
 CisJJHtJTlNUQUxMX0RBVEF9ICR7V1JLU1JDfS9tZWRpYS9pY29uX29kYWxhdW5jaF8qLnBuZyAk
 e0xPQ0FMQkFTRX0vc2hhcmUvcGl4bWFwcworLmVuZGlmCisjIERlc2t0b3AKKy5mb3IgZiBpbiBv
 ZGFtZXggb2Rhc3J2CisJJHtJTlNUQUxMX0RBVEF9ICR7V1JLU1JDfS9pbnN0YWxsZXIvYXJjaC8k
 e2Z9LmRlc2t0b3AgJHtMT0NBTEJBU0V9L3NoYXJlL2FwcGxpY2F0aW9ucworLmVuZGZvcgorLmlm
 ICR7UE9SVF9PUFRJT05TOk1MQVVOQ0hFUn0KKwkke0lOU1RBTExfREFUQX0gJHtXUktTUkN9L2lu
 c3RhbGxlci9hcmNoL29kYWxhdW5jaC5kZXNrdG9wICR7TE9DQUxCQVNFfS9zaGFyZS9hcHBsaWNh
 dGlvbnMKIC5lbmRpZgogCiAuaW5jbHVkZSAiJHsuQ1VSRElSfS8uLi9kb29tLWRhdGEvTWFrZWZp
 bGUuaW5jbHVkZSIKZGlmZiAtdSBvZGFtZXgub3JpZy9kaXN0aW5mbyBvZGFtZXgvZGlzdGluZm8K
 LS0tIG9kYW1leC5vcmlnL2Rpc3RpbmZvCTIwMTItMDMtMDQgMTY6MjU6MDYuMDAwMDAwMDAwICsw
 NDAwCisrKyBvZGFtZXgvZGlzdGluZm8JMjAxMy0wMS0xMyAxMjoyODoyNi4wMDAwMDAwMDAgKzA0
 MDAKQEAgLTEsMiArMSwyIEBACi1TSEEyNTYgKG9kYW1leC1zcmMtMC41LjYudGFyLmJ6MikgPSBm
 YzgzMmFjMmRmMmZjZWVlZDc5YjUxMmNkNzg5ZDBkMzBjOTNjNDZiMjQ2ZjUwYWY5NzNiYjg2N2Iw
 MmEzNDQwCi1TSVpFIChvZGFtZXgtc3JjLTAuNS42LnRhci5iejIpID0gMjk1NDA5MAorU0hBMjU2
 IChvZGFtZXgtc3JjLTAuNi4xLnRhci5iejIpID0gZDc3NTgxNDFkMDA1MTBlYWU1NTEzMmEyMzc2
 MzI2NTYwYTIwNmM3NzJkYTNkNjA0NjY2ZGMyYzYyMDA5Zjg2MQorU0laRSAob2RhbWV4LXNyYy0w
 LjYuMS50YXIuYnoyKSA9IDc1MjIzMzMKQ29tbW9uIHN1YmRpcmVjdG9yaWVzOiBvZGFtZXgub3Jp
 Zy9maWxlcyBhbmQgb2RhbWV4L2ZpbGVzCmRpZmYgLXUgb2RhbWV4Lm9yaWcvcGtnLXBsaXN0IG9k
 YW1leC9wa2ctcGxpc3QKLS0tIG9kYW1leC5vcmlnL3BrZy1wbGlzdAkyMDEyLTAzLTA0IDE2OjI1
 OjA2LjAwMDAwMDAwMCArMDQwMAorKysgb2RhbWV4L3BrZy1wbGlzdAkyMDEzLTAxLTEzIDEyOjI4
 OjI2LjAwMDAwMDAwMCArMDQwMApAQCAtMSw3ICsxLDIzIEBACiAlJUxBVU5DSEVSJSViaW4vb2Rh
 bGF1bmNoCislJUxBVU5DSEVSJSVzaGFyZS9hcHBsaWNhdGlvbnMvb2RhbGF1bmNoLmRlc2t0b3AK
 KyUlTEFVTkNIRVIlJXNoYXJlL3BpeG1hcHMvaWNvbl9vZGFsYXVuY2hfMTI4LnBuZworJSVMQVVO
 Q0hFUiUlc2hhcmUvcGl4bWFwcy9pY29uX29kYWxhdW5jaF8yNTYucG5nCislJUxBVU5DSEVSJSVz
 aGFyZS9waXhtYXBzL2ljb25fb2RhbGF1bmNoXzUxMi5wbmcKKyUlTEFVTkNIRVIlJXNoYXJlL3Bp
 eG1hcHMvaWNvbl9vZGFsYXVuY2hfOTYucG5nCiBiaW4vb2RhbWV4CiBiaW4vb2Rhc3J2CitzaGFy
 ZS9hcHBsaWNhdGlvbnMvb2RhbWV4LmRlc2t0b3AKK3NoYXJlL2FwcGxpY2F0aW9ucy9vZGFzcnYu
 ZGVza3RvcAorc2hhcmUvcGl4bWFwcy9pY29uX29kYW1leF8xMjgucG5nCitzaGFyZS9waXhtYXBz
 L2ljb25fb2RhbWV4XzI1Ni5wbmcKK3NoYXJlL3BpeG1hcHMvaWNvbl9vZGFtZXhfNTEyLnBuZwor
 c2hhcmUvcGl4bWFwcy9pY29uX29kYW1leF85Ni5wbmcKK3NoYXJlL3BpeG1hcHMvaWNvbl9vZGFz
 cnZfMTI4LnBuZworc2hhcmUvcGl4bWFwcy9pY29uX29kYXNydl8yNTYucG5nCitzaGFyZS9waXht
 YXBzL2ljb25fb2Rhc3J2XzUxMi5wbmcKK3NoYXJlL3BpeG1hcHMvaWNvbl9vZGFzcnZfOTYucG5n
 CiAlJURBVEFESVIlJS9vZGFtZXgud2FkCislJVBPUlRET0NTJSUlJURPQ1NESVIlJS9MSUNFTlNF
 CiAlJVBPUlRET0NTJSUlJURPQ1NESVIlJS9SRUFETUUKIEBkaXJybSAlJURBVEFESVIlJQogJSVQ
 T1JURE9DUyUlQGRpcnJtICUlRE9DU0RJUiUlCg==
 --f46d044304dcafbe7104d3280f50--
Responsible-Changed-From-To: freebsd-ports-bugs->madpilot 
Responsible-Changed-By: madpilot 
Responsible-Changed-When: Tue Feb 19 21:50:42 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=174093 

From: Guido Falsi <madpilot@FreeBSD.org>
To: bug-followup@FreeBSD.org, fiziologus@gmail.com
Cc:  
Subject: Re: ports/174093: games/odamex: update to 0.6.1
Date: Wed, 20 Feb 2013 22:18:17 +0100

 I took this PR and prepared n update to newer version 0.6.2.
 
 I'd like to ask you if there is any strong reason why you have removed 
 the MIDI option.
 
 Thanks.
 
 -- 
 Guido Falsi <madpilot@FreeBSD.org>

From: green dog <fiziologus@gmail.com>
To: Guido Falsi <madpilot@freebsd.org>
Cc: bug-followup@freebsd.org
Subject: Re: ports/174093: games/odamex: update to 0.6.1
Date: Sat, 23 Feb 2013 23:57:34 +0400

 --047d7b450e0a0d98f404d669b8d1
 Content-Type: text/plain; charset=ISO-8859-1
 
 no need. odamex used sdl-mixer for midi playpack, no timidity.
 
 
 2013/2/21 Guido Falsi <madpilot@freebsd.org>
 
 > I took this PR and prepared n update to newer version 0.6.2.
 >
 > I'd like to ask you if there is any strong reason why you have removed the
 > MIDI option.
 >
 > Thanks.
 >
 > --
 > Guido Falsi <madpilot@FreeBSD.org>
 >
 
 --047d7b450e0a0d98f404d669b8d1
 Content-Type: text/html; charset=ISO-8859-1
 Content-Transfer-Encoding: quoted-printable
 
 <div dir=3D"ltr">no need. odamex used sdl-mixer for midi playpack, no timid=
 ity.</div><div class=3D"gmail_extra"><br><br><div class=3D"gmail_quote">201=
 3/2/21 Guido Falsi <span dir=3D"ltr">&lt;<a href=3D"mailto:madpilot@freebsd=
 .org" target=3D"_blank">madpilot@freebsd.org</a>&gt;</span><br>
 <blockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1p=
 x #ccc solid;padding-left:1ex">I took this PR and prepared n update to newe=
 r version 0.6.2.<br>
 <br>
 I&#39;d like to ask you if there is any strong reason why you have removed =
 the MIDI option.<br>
 <br>
 Thanks.<span class=3D"HOEnZb"><font color=3D"#888888"><br>
 <br>
 -- <br>
 Guido Falsi &lt;madpilot@FreeBSD.org&gt;<br>
 </font></span></blockquote></div><br></div>
 
 --047d7b450e0a0d98f404d669b8d1--
State-Changed-From-To: open->closed 
State-Changed-By: madpilot 
State-Changed-When: Sun Feb 24 17:21:14 UTC 2013 
State-Changed-Why:  
Committed, with changes.  Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=174093 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/174093: commit references a PR
Date: Sun, 24 Feb 2013 17:21:05 +0000 (UTC)

 Author: madpilot
 Date: Sun Feb 24 17:20:49 2013
 New Revision: 312882
 URL: http://svnweb.freebsd.org/changeset/ports/312882
 
 Log:
   - Update to 0.6.2
   - Remove unneeded option
   - Trim Makefile headers
   
   PR:		ports/174093
   Submitted by:	Green Dog <fiziologus@gmail.com>
 
 Added:
   head/games/odamex/files/patch-CMakeLists.txt   (contents, props changed)
   head/games/odamex/files/patch-client-src-cl_download.cpp   (contents, props changed)
   head/games/odamex/files/patch-common-d_main.cpp   (contents, props changed)
   head/games/odamex/files/patch-odalaunch-CMakeLists.txt   (contents, props changed)
   head/games/odamex/files/patch-odalaunch-src-dlg_main.cpp   (contents, props changed)
 Deleted:
   head/games/odamex/files/patch-Makefile
   head/games/odamex/files/patch-client__src__d_main.cpp
   head/games/odamex/files/patch-odalaunch__Makefile
   head/games/odamex/files/patch-server__src__d_main.cpp
 Modified:
   head/games/odamex/Makefile   (contents, props changed)
   head/games/odamex/distinfo   (contents, props changed)
   head/games/odamex/pkg-plist   (contents, props changed)
 
 Modified: head/games/odamex/Makefile
 ==============================================================================
 --- head/games/odamex/Makefile	Sun Feb 24 17:09:12 2013	(r312881)
 +++ head/games/odamex/Makefile	Sun Feb 24 17:20:49 2013	(r312882)
 @@ -1,12 +1,8 @@
 -# New ports collection makefile for:	odamex
 -# Date created:				2007-12-06
 -# Whom:					alepulver
 -#
 +# Created by: alepulver
  # $FreeBSD$
 -#
  
  PORTNAME=	odamex
 -PORTVERSION=	0.5.6
 +PORTVERSION=	0.6.2
  CATEGORIES=	games
  MASTER_SITES=	SF/${PORTNAME}/Odamex/${PORTVERSION}
  DISTNAME=	odamex-src-${PORTVERSION}
 @@ -15,43 +11,40 @@ MAINTAINER=	ports@FreeBSD.org
  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 common/d_main.cpp
  
 -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:
  	@${REINPLACE_CMD} -e 's|%%DMDIR%%|${DMDIR}|; \
  		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
 +		${WRKSRC}/common/d_main.cpp
 +	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' \
 +		${WRKSRC}/odalaunch/src/dlg_main.cpp
 +	@${REINPLACE_CMD} -e 's|%%WX_VER%%|${WX_VERSION}|' \
 +		-e 's|%%LOCALBASE%%|${LOCALBASE}|' \
 +		${WRKSRC}/odalaunch/CMakeLists.txt
 +	@${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
 +	${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
 @@ -60,6 +53,20 @@ do-install:
  .if ${PORT_OPTIONS:MDOCS}
  	${MKDIR} ${DOCSDIR}
  	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 +	${INSTALL_DATA} ${WRKSRC}/LICENSE ${DOCSDIR}
 +.endif
 +.for f in odamex odasrv
 +	${INSTALL_DATA} ${WRKSRC}/media/icon_${f}_*.png ${PREFIX}/share/pixmaps
 +.endfor
 +.if ${PORT_OPTIONS:MLAUNCHER}
 +	${INSTALL_DATA} ${WRKSRC}/media/icon_odalaunch_*.png ${PREFIX}/share/pixmaps
 +.endif
 +	${MKDIR} ${PREFIX}/share/applications
 +.for f in odamex odasrv
 +	${INSTALL_DATA} ${WRKSRC}/installer/arch/${f}.desktop ${PREFIX}/share/applications
 +.endfor
 +.if ${PORT_OPTIONS:MLAUNCHER}
 +	${INSTALL_DATA} ${WRKSRC}/installer/arch/odalaunch.desktop ${PREFIX}/share/applications
  .endif
  
  .include "${.CURDIR}/../doom-data/Makefile.include"
 
 Modified: head/games/odamex/distinfo
 ==============================================================================
 --- head/games/odamex/distinfo	Sun Feb 24 17:09:12 2013	(r312881)
 +++ head/games/odamex/distinfo	Sun Feb 24 17:20:49 2013	(r312882)
 @@ -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.2.tar.bz2) = 70534ee0b88f759269b807190f347acacc1a0ff4f9e9e90edeab9aa99d4f316e
 +SIZE (odamex-src-0.6.2.tar.bz2) = 8451290
 
 Added: head/games/odamex/files/patch-CMakeLists.txt
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/games/odamex/files/patch-CMakeLists.txt	Sun Feb 24 17:20:49 2013	(r312882)
 @@ -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.
 
 Added: head/games/odamex/files/patch-client-src-cl_download.cpp
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/games/odamex/files/patch-client-src-cl_download.cpp	Sun Feb 24 17:20:49 2013	(r312882)
 @@ -0,0 +1,13 @@
 +--- client/src/cl_download.cpp.orig	2012-05-11 03:03:43.000000000 +0200
 ++++ client/src/cl_download.cpp	2013-02-19 23:05:21.932196566 +0100
 +@@ -170,8 +170,8 @@
 + 
 +     // Try to save to the wad paths in this order -- Hyper_Eye
 +     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, waddirs.cstring(), separator);
 +     dirs.push_back(startdir);
 +     dirs.push_back(progdir);
 
 Added: head/games/odamex/files/patch-common-d_main.cpp
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/games/odamex/files/patch-common-d_main.cpp	Sun Feb 24 17:20:49 2013	(r312882)
 @@ -0,0 +1,13 @@
 +--- common/d_main.cpp.orig	2013-02-20 18:09:33.266196581 +0100
 ++++ common/d_main.cpp	2013-02-20 18:11:13.271203017 +0100
 +@@ -490,8 +490,8 @@
 + 	dirs.push_back(progdir);
 + 
 + 	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);
 + 
 + 	// [AM] Search additional paths based on platform
 
 Added: head/games/odamex/files/patch-odalaunch-CMakeLists.txt
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/games/odamex/files/patch-odalaunch-CMakeLists.txt	Sun Feb 24 17:20:49 2013	(r312882)
 @@ -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 %%LOCALBASE%%/bin/wxrc-gtk2-%%WX_VER%%)
 +   add_custom_command(
 +     OUTPUT ${XRCRES_HEADER}
 +     COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/res
 
 Added: head/games/odamex/files/patch-odalaunch-src-dlg_main.cpp
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/games/odamex/files/patch-odalaunch-src-dlg_main.cpp	Sun Feb 24 17:20:49 2013	(r312882)
 @@ -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);
 
 Modified: head/games/odamex/pkg-plist
 ==============================================================================
 --- head/games/odamex/pkg-plist	Sun Feb 24 17:09:12 2013	(r312881)
 +++ head/games/odamex/pkg-plist	Sun Feb 24 17:20:49 2013	(r312882)
 @@ -1,7 +1,24 @@
  %%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%%
 +@dirrmtry share/applications
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
