Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 27 Nov 2015 11:45:28 +0000 (UTC)
From:      Guido Falsi <madpilot@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r402486 - in head/games/0ad: . files
Message-ID:  <201511271145.tARBjS8p006993@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: madpilot
Date: Fri Nov 27 11:45:28 2015
New Revision: 402486
URL: https://svnweb.freebsd.org/changeset/ports/402486

Log:
  - Update to Alpha 19 (0.0.19)
  - Add option to choose SDL version to depend on
  
  Thanks to the 0ad developers for their suggestions and kind support
  with the update.

Deleted:
  head/games/0ad/files/patch-source_network_NetServer.cpp
Modified:
  head/games/0ad/Makefile
  head/games/0ad/distinfo
  head/games/0ad/files/patch-build__premake__extern_libs4.lua

Modified: head/games/0ad/Makefile
==============================================================================
--- head/games/0ad/Makefile	Fri Nov 27 11:27:47 2015	(r402485)
+++ head/games/0ad/Makefile	Fri Nov 27 11:45:28 2015	(r402486)
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	0ad
-PORTVERSION=	0.0.18
-PORTREVISION=	2
+PORTVERSION=	0.0.19
 CATEGORIES=	games
 MASTER_SITES=	SF/zero-ad/releases
 DISTFILES=	${PORTNAME}-${PORTVERSION}-alpha-unix-build.tar.xz \
@@ -19,7 +18,6 @@ LIB_DEPENDS=	libboost_thread.so:${PORTSD
 		libogg.so:${PORTSDIR}/audio/libogg \
 		libvorbis.so:${PORTSDIR}/audio/libvorbis \
 		libcurl.so:${PORTSDIR}/ftp/curl \
-		libgamin-1.so:${PORTSDIR}/devel/gamin \
 		libgloox.so:${PORTSDIR}/net-im/gloox \
 		libminiupnpc.so:${PORTSDIR}/net/miniupnpc \
 		libnspr4.so:${PORTSDIR}/devel/nspr \
@@ -30,7 +28,6 @@ BUILD_WRKSRC=	${WRKSRC}/build/workspaces
 MAKE_ARGS=	config=release
 USES=		compiler:c++11-lib dos2unix gmake iconv openal:al \
 		pkgconfig tar:xz
-USE_SDL=	sdl
 USE_GNOME=	libxml2 gtk20
 USE_GL=		gl
 BUNDLE_LIBS=	yes
@@ -40,6 +37,18 @@ USE_WX=		2.8+
 WX_COMPS=	wx:lib
 MAKE_ENV+=	JOBS=${_MAKE_JOBS}
 
+OPTIONS_SINGLE=		SDL_VERSION
+OPTIONS_SINGLE_SDL_VERSION=	SDL SDL2
+OPTIONS_DEFAULT=	SDL2
+
+SDL_VERSION_DESC=	SDL version
+SDL_DESC=		Use SDL 1.2 (deprecated)
+SDL2_DESC=		Use SDL 2.0
+
+SDL_USE=		SDL=sdl
+SDL_VARS=		0ADSDLARG=--sdl1
+SDL2_USE=		SDL=sdl2
+
 MANUAL_PACKAGE_BUILD=	huge
 
 PORTDATA=	*
@@ -65,7 +74,7 @@ post-patch:
 		${WRKSRC}/build/resources/0ad.sh
 
 pre-build:
-	(cd ${WRKSRC}/build/workspaces && ${SETENV} ${MAKE_ENV} ./update-workspaces.sh --with-system-miniupnpc ${SMOPT} --bindir=${PREFIX}/bin --datadir=${DATADIR} --libdir=${PREFIX}/lib/${PORTNAME})
+	(cd ${WRKSRC}/build/workspaces && ${SETENV} ${MAKE_ENV} ./update-workspaces.sh ${0ADSDLARG} --bindir=${PREFIX}/bin --datadir=${DATADIR} --libdir=${PREFIX}/lib/${PORTNAME})
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/binaries/system/pyrogenesis ${STAGEDIR}${PREFIX}/bin

Modified: head/games/0ad/distinfo
==============================================================================
--- head/games/0ad/distinfo	Fri Nov 27 11:27:47 2015	(r402485)
+++ head/games/0ad/distinfo	Fri Nov 27 11:45:28 2015	(r402486)
@@ -1,4 +1,4 @@
-SHA256 (0ad-0.0.18-alpha-unix-build.tar.xz) = bd2f04d3269ae9af104626827446a89ea4a0dd4859f89539701fd331cbae0397
-SIZE (0ad-0.0.18-alpha-unix-build.tar.xz) = 26179952
-SHA256 (0ad-0.0.18-alpha-unix-data.tar.xz) = b1a4078eb945ac873accb45c831dbe988866e3559d16bea189eb439c2c71ac44
-SIZE (0ad-0.0.18-alpha-unix-data.tar.xz) = 571228108
+SHA256 (0ad-0.0.19-alpha-unix-build.tar.xz) = 2d43262bbcedbfa19eee23b0e78ae20fc9e0b8f4589855fca95d9908c6839bb3
+SIZE (0ad-0.0.19-alpha-unix-build.tar.xz) = 26192128
+SHA256 (0ad-0.0.19-alpha-unix-data.tar.xz) = 9353f554e94adf66d69e33950f7f2515cfe308eca2c0ad381c6f39f1ad378038
+SIZE (0ad-0.0.19-alpha-unix-data.tar.xz) = 573111260

Modified: head/games/0ad/files/patch-build__premake__extern_libs4.lua
==============================================================================
--- head/games/0ad/files/patch-build__premake__extern_libs4.lua	Fri Nov 27 11:27:47 2015	(r402485)
+++ head/games/0ad/files/patch-build__premake__extern_libs4.lua	Fri Nov 27 11:45:28 2015	(r402486)
@@ -1,4 +1,4 @@
---- build/premake/extern_libs4.lua.orig	2015-02-20 05:52:18 UTC
+--- build/premake/extern_libs4.lua.orig	2015-11-19 23:47:41 UTC
 +++ build/premake/extern_libs4.lua
 @@ -237,7 +237,7 @@ extern_lib_defs = {
  			end
@@ -9,12 +9,13 @@
  			end
  		end,
  		link_settings = function()
-@@ -346,8 +346,6 @@ extern_lib_defs = {
+@@ -347,9 +347,6 @@ extern_lib_defs = {
  			elseif os.is("macosx") then
  				add_default_include_paths("iconv")
  				defines { "LIBICONV_STATIC" }
 -			elseif os.getversion().description == "FreeBSD" then
 -				defines { "HAVE_ICONV_CONST" }
+-				defines { "ICONV_CONST=const" }
  			end
  		end,
  		link_settings = function()

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511271145.tARBjS8p006993>