Attachment #195009 for bug #224482




# $FreeBSD$

PORTNAME=	openspades
PORTVERSION=	0.1.2
DISTVERSIONPREFIX=	v
PORTREVISION=	6
CATEGORIES=	games
MASTER_SITES=	https://github.com/yvt/openspades-paks/releases/download/r33/:data
DISTFILES=	${DISTNAME}${EXTRACT_SUFX} OpenSpadesDevPackage-r33.zip:data

MAINTAINER=	amdmi3@FreeBSD.org
COMMENT=	Compatible client of Ace of Spades

LICENSE_FILE=	${WRKSRC}/LICENSE

BUILD_DEPENDS=	convert:graphics/ImageMagick # for building icons
LIB_DEPENDS=	libcurl.so:ftp/curl \
		libopusfile.so:audio/opusfile

NOT_FOR_ARCHS=		aarch64 powerpc64
NOT_FOR_ARCHS_REASON=	fails to compile: uses x86 assembly

USE_GITHUB=	yes
GH_ACCOUNT=	yvt

USES=		cmake compiler:c++11-lib desktop-file-utils openal
CMAKE_ARGS=	-DOPENSPADES_RESOURCES=OFF \
		-DOPENSPADES_INSTALL_MAN="man/man6" \
		-DOPENSPADES_INSTALL_BINARY="bin" \

OPTIONS_DEFINE=	DOCS

post-extract:
	@${MV} ${WRKDIR}/Nonfree/*.pak ${WRKDIR}/OfficialMods/*.pak \
	    ${WRKSRC}/Resources/

post-patch:
	@${REINPLACE_CMD} -e 's|Xext|${LOCALBASE}/lib/lib&.so|' ${WRKSRC}/Sources/CMakeLists.txt

post-install:
	cd ${WRKSRC}/Resources/ && ${COPYTREE_SHARE} "Gfx Locales Maps Models PackageInfo.json Scripts Shaders Sounds Textures *.pak" ${STAGEDIR}${DATADIR}

.include <bsd.port.mk>

Lines 1-4 Link Here

(-)games/openspades/distinfo (-4 / +7 lines)
1	SHA256 (yvt-openspades-v0.0.12_GH0.tar.gz) = f5778f12cf42c46b14ed8decb0a312998839ea9f7927058fb919a3c9182248a9	1	TIMESTAMP = 1521997974
2	SIZE (yvt-openspades-v0.0.12_GH0.tar.gz) = 1984521	2	SHA256 (yvt-openspades-v0.1.2_GH0.tar.gz) = f4947232eded073469d07935783786efd70e7d73e615326dbb66676c4e8724a8
3	SHA256 (DevPaks27.zip) = 668b62d3770f407447e6f45df28928f66a7fe3440c541788f66583f31ae5c717	3	SIZE (yvt-openspades-v0.1.2_GH0.tar.gz) = 7474808
4	SIZE (DevPaks27.zip) = 19597524	4	SHA256 (OpenSpadesDevPackage-r33.zip) = 0927dc323a0b3aba0ee8d1d68d6b544b00fe654740fead6d1faad37aac77a2ad
		5	SIZE (OpenSpadesDevPackage-r33.zip) = 4036321
		6	SHA256 (yvt-openspades-v0.1.2_GH0.tar.gz) = f4947232eded073469d07935783786efd70e7d73e615326dbb66676c4e8724a8
		7	SIZE (yvt-openspades-v0.1.2_GH0.tar.gz) = 7474808

Removed Link Here

(-)games/openspades/files/patch-CMakeLists.txt (-8 lines)
1	--- CMakeLists.txt.orig 2014-06-23 11:55:03 UTC
2	+++ CMakeLists.txt
3	@@ -1,5 +1,4 @@
4	cmake_minimum_required(VERSION 2.8)
5	-set(CMAKE_INSTALL_PREFIX "/usr/local")
6	project(OpenSpades)
7
8	set(OpenSpades_VERSION_MAJOR 0)




--- Sources/CMakeLists.txt.orig	2014-06-23 11:55:03 UTC
+++ Sources/CMakeLists.txt
@@ -24,9 +24,9 @@ add_subdirectory(AngelScript/projects/cm
 add_subdirectory(AngelScript/projects/cmake_addons)
 set(ANGELSCRIPT_LIBS Angelscript Angelscript_addons)
 
-include_directories(".")
-include_directories("json/include")
-include_directories("ENet/include")
+include_directories(BEFORE ".")
+include_directories(BEFORE "json/include")
+include_directories(BEFORE "ENet/include")
 
 if(WIN32)
 	if(MINGW)	# = gcc, can someone confirm that this works?




--- Sources/Core/ConcurrentDispatch.cpp.orig	2014-06-23 11:55:03 UTC
+++ Sources/Core/ConcurrentDispatch.cpp
@@ -38,7 +38,7 @@
 #ifndef _MSC_VER
 #include <unistd.h>
 #endif
-#if defined(__GNUC__)
+#if defined(__linux__)
 #include <sys/sysinfo.h>
 #endif
 #endif
@@ -67,7 +67,7 @@ static int GetNumCores() {
         if(count < 1) { count = 1; }
     }
     return count;
-#elif defined(__GNUC__)
+#elif defined(__linux__)
     return get_nprocs();
 #else
     return sysconf(_SC_NPROCESSORS_ONLN);

Removed Link Here

(-)games/openspades/files/patch-Sources__Draw__SWFeatureLevel.h (-10 lines)
1	--- Sources/Draw/SWFeatureLevel.h.orig 2014-06-23 11:55:03 UTC
2	+++ Sources/Draw/SWFeatureLevel.h
3	@@ -55,6 +55,7 @@
4	#endif
5
6	#include <algorithm>
7	+#include <cmath>
8	#include <Core/ConcurrentDispatch.h>
9	#include <Core/Debug.h>
10

Lines 4-7 OpenSpades is a compatible client of Ace of Spades 0.75. Link Here

(-)games/openspades/pkg-descr (-1 / +1 lines)
4	* Uses OpenGL/AL for better visuals.	4	* Uses OpenGL/AL for better visuals.
5	* Open source, and cross platform.	5	* Open source, and cross platform.
6		6
7	WWW: http://www.openspades.org/	7	WWW: http://openspades.yvt.jp/

Return to bug 224482

Lines 2-13 Link Here

(-)games/openspades/Makefile (-8 / +11 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= openspades	4	PORTNAME= openspades
5	PORTVERSION= 0.0.12	5	PORTVERSION= 0.1.2
6	DISTVERSIONPREFIX= v	6	DISTVERSIONPREFIX= v
7	PORTREVISION= 6
8	CATEGORIES= games	7	CATEGORIES= games
9	MASTER_SITES= http://yvt.jp/files/programs/osppaks/:data	8	MASTER_SITES= https://github.com/yvt/openspades-paks/releases/download/r33/:data
10	DISTFILES= ${DISTNAME}${EXTRACT_SUFX} DevPaks27.zip:data	9	DISTFILES= ${DISTNAME}${EXTRACT_SUFX} OpenSpadesDevPackage-r33.zip:data
11		10
12	MAINTAINER= amdmi3@FreeBSD.org	11	MAINTAINER= amdmi3@FreeBSD.org
13	COMMENT= Compatible client of Ace of Spades	12	COMMENT= Compatible client of Ace of Spades
Lines 16-22 LICENSE= GPLv3 Link Here
16	LICENSE_FILE= ${WRKSRC}/LICENSE	15	LICENSE_FILE= ${WRKSRC}/LICENSE
17		16
18	BUILD_DEPENDS= convert:graphics/ImageMagick # for building icons	17	BUILD_DEPENDS= convert:graphics/ImageMagick # for building icons
19	LIB_DEPENDS= libcurl.so:ftp/curl	18	LIB_DEPENDS= libcurl.so:ftp/curl \
		19	libopusfile.so:audio/opusfile
20		20
21	NOT_FOR_ARCHS= aarch64 powerpc64	21	NOT_FOR_ARCHS= aarch64 powerpc64
22	NOT_FOR_ARCHS_REASON= fails to compile: uses x86 assembly	22	NOT_FOR_ARCHS_REASON= fails to compile: uses x86 assembly
Lines 24-30 NOT_FOR_ARCHS_REASON= fails to compile: uses x86 assembly Link Here
24	USE_GITHUB= yes	24	USE_GITHUB= yes
25	GH_ACCOUNT= yvt	25	GH_ACCOUNT= yvt
26		26
27	USES= cmake compiler:c++11-lib desktop-file-utils	27	USES= cmake compiler:c++11-lib desktop-file-utils openal
28	CMAKE_ARGS= -DOPENSPADES_RESOURCES=OFF \	28	CMAKE_ARGS= -DOPENSPADES_RESOURCES=OFF \
29	-DOPENSPADES_INSTALL_MAN="man/man6" \	29	-DOPENSPADES_INSTALL_MAN="man/man6" \
30	-DOPENSPADES_INSTALL_BINARY="bin" \	30	-DOPENSPADES_INSTALL_BINARY="bin" \
Lines 39-48 PORTDATA= * Link Here
39	OPTIONS_DEFINE= DOCS	39	OPTIONS_DEFINE= DOCS
40		40
41	post-extract:	41	post-extract:
42	@${MKDIR} ${WRKSRC}/Resources/DevPak	42	@${MV} ${WRKDIR}/Nonfree/.pak ${WRKDIR}/OfficialMods/.pak \
43	@${MV} ${WRKDIR}/*.pak ${WRKSRC}/Resources/DevPak/	43	${WRKSRC}/Resources/
44		44
45	post-patch:	45	post-patch:
46	@${REINPLACE_CMD} -e 's\|Xext\|${LOCALBASE}/lib/lib&.so\|' ${WRKSRC}/Sources/CMakeLists.txt	46	@${REINPLACE_CMD} -e 's\|Xext\|${LOCALBASE}/lib/lib&.so\|' ${WRKSRC}/Sources/CMakeLists.txt
47		47
		48	post-install:
		49	cd ${WRKSRC}/Resources/ && ${COPYTREE_SHARE} "Gfx Locales Maps Models PackageInfo.json Scripts Shaders Sounds Textures *.pak" ${STAGEDIR}${DATADIR}
		50
48	.include <bsd.port.mk>	51	.include <bsd.port.mk>

Removed Link Here

(-)games/openspades/files/patch-Sources__CMakeLists.txt (-15 lines)
1	--- Sources/CMakeLists.txt.orig 2014-06-23 11:55:03 UTC
2	+++ Sources/CMakeLists.txt
3	@@ -24,9 +24,9 @@ add_subdirectory(AngelScript/projects/cm
4	add_subdirectory(AngelScript/projects/cmake_addons)
5	set(ANGELSCRIPT_LIBS Angelscript Angelscript_addons)
6
7	-include_directories(".")
8	-include_directories("json/include")
9	-include_directories("ENet/include")
10	+include_directories(BEFORE ".")
11	+include_directories(BEFORE "json/include")
12	+include_directories(BEFORE "ENet/include")
13
14	if(WIN32)
15	if(MINGW) # = gcc, can someone confirm that this works?

Removed Link Here

(-)games/openspades/files/patch-Sources__Core__ConcurrentDispatch.cpp (-20 lines)
1	--- Sources/Core/ConcurrentDispatch.cpp.orig 2014-06-23 11:55:03 UTC
2	+++ Sources/Core/ConcurrentDispatch.cpp
3	@@ -38,7 +38,7 @@
4	#ifndef _MSC_VER
5	#include <unistd.h>
6	#endif
7	-#if defined(__GNUC__)
8	+#if defined(__linux__)
9	#include <sys/sysinfo.h>
10	#endif
11	#endif
12	@@ -67,7 +67,7 @@ static int GetNumCores() {
13	if(count < 1) { count = 1; }
14	}
15	return count;
16	-#elif defined(__GNUC__)
17	+#elif defined(__linux__)
18	return get_nprocs();
19	#else
20	return sysconf(_SC_NPROCESSORS_ONLN);