From owner-svn-ports-all@freebsd.org Tue Sep 15 23:09:38 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0CB5A9CD178; Tue, 15 Sep 2015 23:09:38 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E4F3715E2; Tue, 15 Sep 2015 23:09:37 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8FN9bX3044279; Tue, 15 Sep 2015 23:09:37 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8FN9aag044274; Tue, 15 Sep 2015 23:09:36 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201509152309.t8FN9aag044274@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Tue, 15 Sep 2015 23:09:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r397028 - in head/games/openspades: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Sep 2015 23:09:38 -0000 Author: amdmi3 Date: Tue Sep 15 23:09:35 2015 New Revision: 397028 URL: https://svnweb.freebsd.org/changeset/ports/397028 Log: - Switch to options helpers - Pet portlint - Regenerate patches with `make makepatch` Modified: head/games/openspades/Makefile head/games/openspades/files/patch-CMakeLists.txt head/games/openspades/files/patch-Sources__CMakeLists.txt head/games/openspades/files/patch-Sources__Core__ConcurrentDispatch.cpp head/games/openspades/files/patch-Sources__Draw__SWFeatureLevel.h Modified: head/games/openspades/Makefile ============================================================================== --- head/games/openspades/Makefile Tue Sep 15 22:45:03 2015 (r397027) +++ head/games/openspades/Makefile Tue Sep 15 23:09:35 2015 (r397028) @@ -19,10 +19,12 @@ BUILD_DEPENDS= convert:${PORTSDIR}/graph LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl \ libGLEW.so:${PORTSDIR}/graphics/glew +BROKEN_FreeBSD_9= does not build on FreeBSD 9.x + USE_GITHUB= yes GH_ACCOUNT= yvt -USES= compiler:c++11-lib cmake desktop-file-utils +USES= cmake compiler:c++11-lib desktop-file-utils CMAKE_ARGS= -DOPENSPADES_RESOURCES=OFF \ -DOPENSPADES_INSTALL_MAN="man/man6" \ -DOPENSPADES_INSTALL_BINARY="bin" \ @@ -36,12 +38,6 @@ PORTDATA= * OPTIONS_DEFINE= DOCS -.include - -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 -BROKEN= doesn't build on pre-10.x -.endif - post-extract: @${MKDIR} ${WRKSRC}/Resources/DevPak @${MV} ${WRKDIR}/*.pak ${WRKSRC}/Resources/DevPak/ @@ -49,4 +45,4 @@ post-extract: post-patch: @${REINPLACE_CMD} -e 's|Xext|${LOCALBASE}/lib/lib&.so|' ${WRKSRC}/Sources/CMakeLists.txt -.include +.include Modified: head/games/openspades/files/patch-CMakeLists.txt ============================================================================== --- head/games/openspades/files/patch-CMakeLists.txt Tue Sep 15 22:45:03 2015 (r397027) +++ head/games/openspades/files/patch-CMakeLists.txt Tue Sep 15 23:09:35 2015 (r397028) @@ -1,5 +1,5 @@ ---- CMakeLists.txt.orig 2014-06-23 15:55:03.000000000 +0400 -+++ CMakeLists.txt 2014-07-30 23:27:27.655286901 +0400 +--- CMakeLists.txt.orig 2014-06-23 11:55:03 UTC ++++ CMakeLists.txt @@ -1,5 +1,4 @@ cmake_minimum_required(VERSION 2.8) -set(CMAKE_INSTALL_PREFIX "/usr/local") Modified: head/games/openspades/files/patch-Sources__CMakeLists.txt ============================================================================== --- head/games/openspades/files/patch-Sources__CMakeLists.txt Tue Sep 15 22:45:03 2015 (r397027) +++ head/games/openspades/files/patch-Sources__CMakeLists.txt Tue Sep 15 23:09:35 2015 (r397028) @@ -1,6 +1,6 @@ ---- Sources/CMakeLists.txt.orig 2014-06-23 15:55:03.000000000 +0400 -+++ Sources/CMakeLists.txt 2014-07-30 23:09:36.981184077 +0400 -@@ -24,9 +24,9 @@ +--- 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) Modified: head/games/openspades/files/patch-Sources__Core__ConcurrentDispatch.cpp ============================================================================== --- head/games/openspades/files/patch-Sources__Core__ConcurrentDispatch.cpp Tue Sep 15 22:45:03 2015 (r397027) +++ head/games/openspades/files/patch-Sources__Core__ConcurrentDispatch.cpp Tue Sep 15 23:09:35 2015 (r397028) @@ -1,5 +1,5 @@ ---- Sources/Core/ConcurrentDispatch.cpp.orig 2014-06-23 15:55:03.000000000 +0400 -+++ Sources/Core/ConcurrentDispatch.cpp 2014-07-30 23:05:09.324201495 +0400 +--- Sources/Core/ConcurrentDispatch.cpp.orig 2014-06-23 11:55:03 UTC ++++ Sources/Core/ConcurrentDispatch.cpp @@ -38,7 +38,7 @@ #ifndef _MSC_VER #include @@ -9,7 +9,7 @@ #include #endif #endif -@@ -67,7 +67,7 @@ +@@ -67,7 +67,7 @@ static int GetNumCores() { if(count < 1) { count = 1; } } return count; Modified: head/games/openspades/files/patch-Sources__Draw__SWFeatureLevel.h ============================================================================== --- head/games/openspades/files/patch-Sources__Draw__SWFeatureLevel.h Tue Sep 15 22:45:03 2015 (r397027) +++ head/games/openspades/files/patch-Sources__Draw__SWFeatureLevel.h Tue Sep 15 23:09:35 2015 (r397028) @@ -1,5 +1,5 @@ ---- Sources/Draw/SWFeatureLevel.h.orig 2014-06-23 15:55:03.000000000 +0400 -+++ Sources/Draw/SWFeatureLevel.h 2014-07-31 00:18:47.036897321 +0400 +--- Sources/Draw/SWFeatureLevel.h.orig 2014-06-23 11:55:03 UTC ++++ Sources/Draw/SWFeatureLevel.h @@ -55,6 +55,7 @@ #endif