Attachment #144649 for bug #190843




# $FreeBSD: head/games/odamex/Makefile 334361 2013-11-19 23:08:44Z mat $

PORTNAME=	odamex
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

LICENSE=	GPLv2

USE_SDL=	sdl mixer
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=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

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




--- 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 2-8 Link Here

(-)/usr/ports/games/odamex/Makefile (-5 / +8 lines)
2	# $FreeBSD: head/games/odamex/Makefile 334361 2013-11-19 23:08:44Z mat $	2	# $FreeBSD: head/games/odamex/Makefile 334361 2013-11-19 23:08:44Z mat $
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}
Lines 10-28 Link Here
10	MAINTAINER= ports@FreeBSD.org	10	MAINTAINER= ports@FreeBSD.org
11	COMMENT= Standard in Online Multiplayer Doom	11	COMMENT= Standard in Online Multiplayer Doom
12		12
13	USE_BZIP2= yes	13	LICENSE= GPLv2
		14
14	USE_SDL= sdl mixer	15	USE_SDL= sdl mixer
15	USES= cmake dos2unix	16	USES= cmake dos2unix tar:bzip2
16	DOS2UNIX_FILES= CMakeLists.txt odalaunch/CMakeLists.txt common/d_main.cpp	17	DOS2UNIX_FILES= CMakeLists.txt odalaunch/CMakeLists.txt common/d_main.cpp
17		18
18	OPTIONS_DEFINE= LAUNCHER	19	OPTIONS_DEFINE= LAUNCHER
19		20
		21	OPTIONS_DEFAULT=
		22
20	LAUNCHER_DESC= Enable GUI launcher program	23	LAUNCHER_DESC= Enable GUI launcher program
21		24
22	OPTIONS_SUB= yes	25	OPTIONS_SUB= yes
23		26
24	LAUNCHER_USE= WX=2.6+	27	LAUNCHER_USE= WX=3.0
25	LAUNCHER_CMAKE_ON= -DODALAUNCH_TARGET=on -DNO_AG-ODALAUNCH_TARGET=off	28	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	29	LAUNCHER_CMAKE_OFF= -DODALAUNCH_TARGET=off
27		30
28	.include <bsd.port.options.mk>	31	.include <bsd.port.options.mk>

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