Attachment 144649 Details for Bug 190843 – odamex-0.7.0.diff

[patch] odamex-0.7.0.diff

odamex-0.7.0.diff (text/plain), 3.15 KB, created by Carlos J Puga Medina on 2014-07-14 11:30:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos J Puga Medina

Created: 2014-07-14 11:30:46 UTC

Size: 3.15 KB

patch

obsolete

>diff -urN /usr/ports/games/odamex.old/Makefile /usr/ports/games/odamex/Makefile
>--- /usr/ports/games/odamex.old/Makefile	2013-11-20 00:08:44.000000000 +0100
>+++ /usr/ports/games/odamex/Makefile	2014-07-14 12:19:35.000000000 +0200
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/games/odamex/Makefile 334361 2013-11-19 23:08:44Z mat $
> 
> PORTNAME=	odamex
>-PORTVERSION=	0.6.2
>+PORTVERSION=	0.7.0
> CATEGORIES=	games
> MASTER_SITES=	SF/${PORTNAME}/Odamex/${PORTVERSION}
> DISTNAME=	odamex-src-${PORTVERSION}
>@@ -10,19 +10,22 @@
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Standard in Online Multiplayer Doom
> 
>-USE_BZIP2=	yes
>+LICENSE=	GPLv2
>+
> 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
> 
>+OPTIONS_DEFAULT=
>+
> 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>
>diff -urN /usr/ports/games/odamex.old/distinfo /usr/ports/games/odamex/distinfo
>--- /usr/ports/games/odamex.old/distinfo	2013-02-24 18:20:49.000000000 +0100
>+++ /usr/ports/games/odamex/distinfo	2014-07-13 20:10:53.000000000 +0200
>@@ -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
>diff -urN /usr/ports/games/odamex.old/files/patch-odalaunch-CMakeLists.txt /usr/ports/games/odamex/files/patch-odalaunch-CMakeLists.txt
>--- /usr/ports/games/odamex.old/files/patch-odalaunch-CMakeLists.txt	2013-02-24 18:20:49.000000000 +0100
>+++ /usr/ports/games/odamex/files/patch-odalaunch-CMakeLists.txt	2014-07-14 10:33:26.000000000 +0200
>@@ -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
>diff -urN /usr/ports/games/odamex.old/files/patch-odalpapi-net_io.cpp /usr/ports/games/odamex/files/patch-odalpapi-net_io.cpp
>--- /usr/ports/games/odamex.old/files/patch-odalpapi-net_io.cpp	1970-01-01 01:00:00.000000000 +0100
>+++ /usr/ports/games/odamex/files/patch-odalpapi-net_io.cpp	2014-07-13 20:10:53.000000000 +0200
>@@ -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

Actions: View | Diff

Attachments on bug 190843: 143578 | 143831 | 143972 | 144649 | 144655 | 144720 | 144801 | 144997