Attachment #144997 for bug #190843




# Created by: alepulver
# $FreeBSD$

PORTNAME=	odamex
PORTVERSION=	0.7.0
CATEGORIES=	games
MASTER_SITES=	SF/${PORTNAME}/Odamex/${PORTVERSION}
DISTNAME=	odamex-src-${PORTVERSION}

MAINTAINER=	cpm@fbsd.es
COMMENT=	Client/server multiplayer engine for Doom

LICENSE=	GPLv2
LICENSE_FILE=	${WRKSRC}/LICENSE

USE_BZIP2=	yes
USE_SDL=	sdl mixer
USES=		cmake dos2unix tar:bzip2
DOS2UNIX_FILES=	CMakeLists.txt odalaunch/CMakeLists.txt common/d_main.cpp

OPTIONS_DEFINE=	DOCS LAUNCHER

LAUNCHER_DESC=	Enable GUI launcher program

OPTIONS_SUB=	yes

LAUNCHER_USE=		WX=3.0
LAUNCHER_CMAKE_ON=	-DODALAUNCH_TARGET=on -DNO_AG-ODALAUNCH_TARGET=off -DwxWidgets_CONFIG_EXECUTABLE=${PREFIX}/bin/wxgtk2u-3.0-config
LAUNCHER_CMAKE_OFF=	-DODALAUNCH_TARGET=off

.include <bsd.port.options.mk>

Lines 1-2 Link Here

(-)/usr/ports/games/odamex/distinfo (-2 / +2 lines)
1	SHA256 (odamex-src-0.6.2.tar.bz2) = 70534ee0b88f759269b807190f347acacc1a0ff4f9e9e90edeab9aa99d4f316e	1	SHA256 (odamex-src-0.7.0.tar.bz2) = aa34363cb18551be65e27919e62d92b9efcb594f36e9239d6fb394ed51b96631
2	SIZE (odamex-src-0.6.2.tar.bz2) = 8451290	2	SIZE (odamex-src-0.7.0.tar.bz2) = 8437106




--- CMakeLists.txt.orig	2014-07-19 15:08:45.000000000 +0200
+++ CMakeLists.txt	2014-07-19 15:10:19.000000000 +0200
@@ -9,7 +9,7 @@
 # Default build type
 if(NOT MSVC)
   if(NOT CMAKE_BUILD_TYPE)
-    set(CMAKE_BUILD_TYPE Debug CACHE STRING
+    set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING
       "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel."
       FORCE)
   endif()
@@ -29,12 +29,12 @@
 # Global compile options.  Useful defines for any Odamex project.
 macro(global_compile_options)
   if(NOT MSVC)
-    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -DNDEBUG")
     if(USE_STATIC_STDLIB)
       set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libgcc -static-libstdc++")
     endif()
     if(USE_SANITIZE_ADDRESS)
-      set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fsanitize=address -O1 -fno-omit-frame-pointer -fno-optimize-sibling-calls")
+      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -O1 -fno-omit-frame-pointer -fno-optimize-sibling-calls -DNDEBUG")
     endif()
   endif()
 endmacro(global_compile_options)
@@ -81,7 +81,9 @@
 add_subdirectory(client)
 add_subdirectory(server)
 add_subdirectory(master)

Lines 4-10 Link Here

(-)/usr/ports/games/odamex/files/patch-odalaunch-CMakeLists.txt (-1 / +1 lines)
4		4
5	# Odalaunch target	5	# Odalaunch target
6	if(wxWidgets_FOUND)	6	if(wxWidgets_FOUND)
7	+ set(wxWidgets_wxrc_EXECUTABLE %%LOCALBASE%%/bin/wxrc-gtk2-%%WX_VER%%)	7	+ set(wxWidgets_wxrc_EXECUTABLE %%LOCALBASE%%/bin/wxrc-gtk2u-%%WX_VER%%)
8	add_custom_command(	8	add_custom_command(
9	OUTPUT ${XRCRES_HEADER}	9	OUTPUT ${XRCRES_HEADER}
10	COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/res	10	COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/res




--- odalaunch/src/dlg_main.cpp.orig	2013-11-29 02:22:10.000000000 +0100
+++ odalaunch/src/dlg_main.cpp	2014-07-19 17:50:52.000000000 +0200
@@ -1,7 +1,7 @@
 // Emacs style mode select   -*- C++ -*-
 //-----------------------------------------------------------------------------
 //
-// $Id: dlg_main.cpp 4376 2013-11-29 01:22:10Z russellrice $
+// $Id: dlg_main.cpp 4996 2014-06-11 04:26:49Z hypereye $
 //
 // Copyright (C) 2006-2012 by The Odamex Team.
 //
@@ -208,7 +208,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("/usr/local/bin");
 
     m_LstCtrlServers = XRCCTRL(*this, "Id_LstCtrlServers", LstOdaServerList);
     m_LstCtrlPlayers = XRCCTRL(*this, "Id_LstCtrlPlayers", LstOdaPlayerList);
@@ -383,6 +383,7 @@
     wxFileConfig ConfigInfo;
     wxInt32 ServerTimeout;
     Server tmp_server;
+    odalpapi::BufferedSocket socket;	
     wxString server_hash;
     wxString ped_hash;
     wxString ped_result;
@@ -455,6 +456,7 @@
     }
 
     // Query the server and try to acquire its password hash
+    tmp_server.SetSocket(&socket);
     tmp_server.SetAddress(wxstr_tostdstr(IPHost), Port);
     tmp_server.Query(ServerTimeout);
 




--- odalpapi/net_io.cpp	2014-06-16 17:33:15.000000000 +0200
+++ odalpapi/net_io.cpp	2014-06-16 17:33:44.000000000 +0200
@@ -34,6 +34,7 @@
 #include <sstream>
 #include <time.h>
 #include <errno.h>
+#include <unistd.h>
 
 #include "net_io.h"
 #include "net_utils.h"
@@ -45,7 +46,6 @@
 #ifdef _WIN32
 	#define AI_ALL 0x00000100
 #else
-	#include <unistd.h>
 	#define closesocket close
 	const int INVALID_SOCKET = -1;
 #endif

Return to bug 190843

Lines 1-28 Link Here

(-)/usr/ports/games/odamex/Makefile (-9 / +11 lines)
1	# Created by: alepulver	1	# Created by: alepulver
2	# $FreeBSD: head/games/odamex/Makefile 362015 2014-07-15 23:30:05Z adamw $	2	# $FreeBSD$
3		3
4	PORTNAME= odamex	4	PORTNAME= odamex
5	PORTVERSION= 0.6.2	5	PORTVERSION= 0.7.0
6	CATEGORIES= games	6	CATEGORIES= games
7	MASTER_SITES= SF/${PORTNAME}/Odamex/${PORTVERSION}	7	MASTER_SITES= SF/${PORTNAME}/Odamex/${PORTVERSION}
8	DISTNAME= odamex-src-${PORTVERSION}	8	DISTNAME= odamex-src-${PORTVERSION}
9		9
10	MAINTAINER= ports@FreeBSD.org	10	MAINTAINER= cpm@fbsd.es
11	COMMENT= Standard in Online Multiplayer Doom	11	COMMENT= Client/server multiplayer engine for Doom
		12
		13	LICENSE= GPLv2
		14	LICENSE_FILE= ${WRKSRC}/LICENSE
12		15
13	USE_BZIP2= yes
14	USE_SDL= sdl mixer	16	USE_SDL= sdl mixer
15	USES= cmake dos2unix	17	USES= cmake dos2unix tar:bzip2
16	DOS2UNIX_FILES= CMakeLists.txt odalaunch/CMakeLists.txt common/d_main.cpp	18	DOS2UNIX_FILES= CMakeLists.txt odalaunch/CMakeLists.txt common/d_main.cpp
17		19
18	OPTIONS_DEFINE= LAUNCHER DOCS	20	OPTIONS_DEFINE= DOCS LAUNCHER
19		21
20	LAUNCHER_DESC= Enable GUI launcher program	22	LAUNCHER_DESC= Enable GUI launcher program
21		23
22	OPTIONS_SUB= yes	24	OPTIONS_SUB= yes
23		25
24	LAUNCHER_USE= WX=2.6+	26	LAUNCHER_USE= WX=3.0
25	LAUNCHER_CMAKE_ON= -DODALAUNCH_TARGET=on -DNO_AG-ODALAUNCH_TARGET=off	27	LAUNCHER_CMAKE_ON= -DODALAUNCH_TARGET=on -DNO_AG-ODALAUNCH_TARGET=off -DwxWidgets_CONFIG_EXECUTABLE=${PREFIX}/bin/wxgtk2u-3.0-config
26	LAUNCHER_CMAKE_OFF= -DODALAUNCH_TARGET=off	28	LAUNCHER_CMAKE_OFF= -DODALAUNCH_TARGET=off
27		29
28	.include <bsd.port.options.mk>	30	.include <bsd.port.options.mk>

Lines 1-6 Link Here

(-)/usr/ports/games/odamex/files/patch-CMakeLists.txt (-3 / +27 lines)
1	--- CMakeLists.txt.orig 2012-12-03 15:03:21.000000000 +0400	1	--- CMakeLists.txt.orig 2014-07-19 15:08:45.000000000 +0200
2	+++ CMakeLists.txt 2012-12-03 15:05:49.000000000 +0400	2	+++ CMakeLists.txt 2014-07-19 15:10:19.000000000 +0200
3	@@ -43,7 +43,9 @@	3	@@ -9,7 +9,7 @@
		4	# Default build type
		5	if(NOT MSVC)
		6	if(NOT CMAKE_BUILD_TYPE)
		7	- set(CMAKE_BUILD_TYPE Debug CACHE STRING
		8	+ set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING
		9	"Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel."
		10	FORCE)
		11	endif()
		12	@@ -29,12 +29,12 @@
		13	# Global compile options. Useful defines for any Odamex project.
		14	macro(global_compile_options)
		15	if(NOT MSVC)
		16	- set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall")
		17	+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -DNDEBUG")
		18	if(USE_STATIC_STDLIB)
		19	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libgcc -static-libstdc++")
		20	endif()
		21	if(USE_SANITIZE_ADDRESS)
		22	- set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fsanitize=address -O1 -fno-omit-frame-pointer -fno-optimize-sibling-calls")
		23	+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -O1 -fno-omit-frame-pointer -fno-optimize-sibling-calls -DNDEBUG")
		24	endif()
		25	endif()
		26	endmacro(global_compile_options)
		27	@@ -81,7 +81,9 @@
4	add_subdirectory(client)	28	add_subdirectory(client)
5	add_subdirectory(server)	29	add_subdirectory(server)
6	add_subdirectory(master)	30	add_subdirectory(master)

Lines 1-11 Link Here

(-)/usr/ports/games/odamex/files/patch-odalaunch-src-dlg_main.cpp (-4 / +29 lines)
1	--- odalaunch/src/dlg_main.cpp.orig 2012-05-31 03:49:32.000000000 +0400	1	--- odalaunch/src/dlg_main.cpp.orig 2013-11-29 02:22:10.000000000 +0100
2	+++ odalaunch/src/dlg_main.cpp 2012-12-03 21:21:50.000000000 +0400	2	+++ odalaunch/src/dlg_main.cpp 2014-07-19 17:50:52.000000000 +0200
3	@@ -193,7 +193,7 @@	3	@@ -1,7 +1,7 @@
		4	// Emacs style mode select -- C++ --
		5	//-----------------------------------------------------------------------------
		6	//
		7	-// $Id: dlg_main.cpp 4376 2013-11-29 01:22:10Z russellrice $
		8	+// $Id: dlg_main.cpp 4996 2014-06-11 04:26:49Z hypereye $
		9	//
		10	// Copyright (C) 2006-2012 by The Odamex Team.
		11	//
		12	@@ -208,7 +208,7 @@
4	launchercfg_s.get_list_on_start = 1;	13	launchercfg_s.get_list_on_start = 1;
5	launchercfg_s.show_blocked_servers = 0;	14	launchercfg_s.show_blocked_servers = 0;
6	launchercfg_s.wad_paths = wxGetCwd();	15	launchercfg_s.wad_paths = wxGetCwd();
7	- launchercfg_s.odamex_directory = wxGetCwd();	16	- launchercfg_s.odamex_directory = wxGetCwd();
8	+ launchercfg_s.odamex_directory = wxString("%%PREFIX%%/bin");	17	+ launchercfg_s.odamex_directory = wxString("/usr/local/bin");
9		18
10	m_LstCtrlServers = XRCCTRL(*this, "Id_LstCtrlServers", LstOdaServerList);	19	m_LstCtrlServers = XRCCTRL(*this, "Id_LstCtrlServers", LstOdaServerList);
11	m_LstCtrlPlayers = XRCCTRL(*this, "Id_LstCtrlPlayers", LstOdaPlayerList);	20	m_LstCtrlPlayers = XRCCTRL(*this, "Id_LstCtrlPlayers", LstOdaPlayerList);
		21	@@ -383,6 +383,7 @@
		22	wxFileConfig ConfigInfo;
		23	wxInt32 ServerTimeout;
		24	Server tmp_server;
		25	+ odalpapi::BufferedSocket socket;
		26	wxString server_hash;
		27	wxString ped_hash;
		28	wxString ped_result;
		29	@@ -455,6 +456,7 @@
		30	}
		31
		32	// Query the server and try to acquire its password hash
		33	+ tmp_server.SetSocket(&socket);
		34	tmp_server.SetAddress(wxstr_tostdstr(IPHost), Port);
		35	tmp_server.Query(ServerTimeout);
		36

Line 0 Link Here

(-)/usr/ports/games/odamex/files/patch-odalpapi-net_io.cpp (+18 lines)
	1	--- odalpapi/net_io.cpp 2014-06-16 17:33:15.000000000 +0200
	2	+++ odalpapi/net_io.cpp 2014-06-16 17:33:44.000000000 +0200
	3	@@ -34,6 +34,7 @@
	4	#include <sstream>
	5	#include <time.h>
	6	#include <errno.h>
	7	+#include <unistd.h>
	8
	9	#include "net_io.h"
	10	#include "net_utils.h"
	11	@@ -45,7 +46,6 @@
	12	#ifdef _WIN32
	13	#define AI_ALL 0x00000100
	14	#else
	15	- #include <unistd.h>
	16	#define closesocket close
	17	const int INVALID_SOCKET = -1;
	18	#endif