Date: Sat, 26 Jul 2014 11:04:33 +0000 (UTC) From: Kubilay Kocak <koobs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r362965 - in head/games/odamex: . files Message-ID: <201407261104.s6QB4Xjr056116@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: koobs Date: Sat Jul 26 11:04:33 2014 New Revision: 362965 URL: http://svnweb.freebsd.org/changeset/ports/362965 QAT: https://qat.redports.org/buildarchive/r362965/ Log: games/odamex: Update to 0.7.0, New MAINTAINER - Update to 0.7.0 - Assign MAINTAINER - Update COMMENT - Add LICENSE & LICENSE_FILE - Sort OPTIONS - Convert USE_BZIP to USES= convention - Update wxWidgets dependency to 3+ - Add patch to address assertions [1] [1] http://odamex.net/bugs/show_bug.cgi?id=1106 PR: 190843 Submitted by: Carlos Medina <cjpugmed at gmail dot com> Added: head/games/odamex/files/patch-odalpapi-net_io.cpp (contents, props changed) Modified: head/games/odamex/Makefile head/games/odamex/distinfo head/games/odamex/files/patch-CMakeLists.txt head/games/odamex/files/patch-odalaunch-CMakeLists.txt head/games/odamex/files/patch-odalaunch-src-dlg_main.cpp Modified: head/games/odamex/Makefile ============================================================================== --- head/games/odamex/Makefile Sat Jul 26 10:44:37 2014 (r362964) +++ head/games/odamex/Makefile Sat Jul 26 11:04:33 2014 (r362965) @@ -2,27 +2,29 @@ # $FreeBSD$ PORTNAME= odamex -PORTVERSION= 0.6.2 +PORTVERSION= 0.7.0 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/Odamex/${PORTVERSION} DISTNAME= odamex-src-${PORTVERSION} -MAINTAINER= ports@FreeBSD.org -COMMENT= Standard in Online Multiplayer Doom +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 +USES= cmake dos2unix tar:bzip2 DOS2UNIX_FILES= CMakeLists.txt odalaunch/CMakeLists.txt common/d_main.cpp -OPTIONS_DEFINE= LAUNCHER DOCS +OPTIONS_DEFINE= DOCS LAUNCHER LAUNCHER_DESC= Enable GUI launcher program OPTIONS_SUB= yes -LAUNCHER_USE= WX=2.6+ -LAUNCHER_CMAKE_ON= -DODALAUNCH_TARGET=on -DNO_AG-ODALAUNCH_TARGET=off +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> Modified: head/games/odamex/distinfo ============================================================================== --- head/games/odamex/distinfo Sat Jul 26 10:44:37 2014 (r362964) +++ head/games/odamex/distinfo Sat Jul 26 11:04:33 2014 (r362965) @@ -1,2 +1,2 @@ -SHA256 (odamex-src-0.6.2.tar.bz2) = 70534ee0b88f759269b807190f347acacc1a0ff4f9e9e90edeab9aa99d4f316e -SIZE (odamex-src-0.6.2.tar.bz2) = 8451290 +SHA256 (odamex-src-0.7.0.tar.bz2) = aa34363cb18551be65e27919e62d92b9efcb594f36e9239d6fb394ed51b96631 +SIZE (odamex-src-0.7.0.tar.bz2) = 8437106 Modified: head/games/odamex/files/patch-CMakeLists.txt ============================================================================== --- head/games/odamex/files/patch-CMakeLists.txt Sat Jul 26 10:44:37 2014 (r362964) +++ head/games/odamex/files/patch-CMakeLists.txt Sat Jul 26 11:04:33 2014 (r362965) @@ -1,6 +1,30 @@ ---- 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 @@ +--- 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) Modified: head/games/odamex/files/patch-odalaunch-CMakeLists.txt ============================================================================== --- head/games/odamex/files/patch-odalaunch-CMakeLists.txt Sat Jul 26 10:44:37 2014 (r362964) +++ head/games/odamex/files/patch-odalaunch-CMakeLists.txt Sat Jul 26 11:04:33 2014 (r362965) @@ -4,7 +4,7 @@ # Odalaunch target if(wxWidgets_FOUND) -+ set(wxWidgets_wxrc_EXECUTABLE %%LOCALBASE%%/bin/wxrc-gtk2-%%WX_VER%%) ++ set(wxWidgets_wxrc_EXECUTABLE %%LOCALBASE%%/bin/wxrc-gtk2u-%%WX_VER%%) add_custom_command( OUTPUT ${XRCRES_HEADER} COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/res Modified: head/games/odamex/files/patch-odalaunch-src-dlg_main.cpp ============================================================================== --- head/games/odamex/files/patch-odalaunch-src-dlg_main.cpp Sat Jul 26 10:44:37 2014 (r362964) +++ head/games/odamex/files/patch-odalaunch-src-dlg_main.cpp Sat Jul 26 11:04:33 2014 (r362965) @@ -1,11 +1,36 @@ ---- 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 @@ +--- 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("%%PREFIX%%/bin"); ++ 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); + Added: head/games/odamex/files/patch-odalpapi-net_io.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/odamex/files/patch-odalpapi-net_io.cpp Sat Jul 26 11:04:33 2014 (r362965) @@ -0,0 +1,18 @@ +--- 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407261104.s6QB4Xjr056116>