svn commit: r326393 - in head/games/0ad: . files

[Guido Falsi]

Author: madpilot
Date: Thu Sep  5 13:08:30 2013
New Revision: 326393
URL: http://svnweb.freebsd.org/changeset/ports/326393

Log:
  - Update to 0.0.14 (Alpha 14 "Naukratis")
  - Add explicit dependency on pkgconf
  - Convert to USES=gmake

Deleted:
  head/games/0ad/files/patch-build-resources-0ad.desktop
Modified:
  head/games/0ad/Makefile
  head/games/0ad/distinfo
  head/games/0ad/files/patch-build-premake-premake4.lua

Modified: head/games/0ad/Makefile
==============================================================================
--- head/games/0ad/Makefile	Thu Sep  5 12:54:46 2013	(r326392)
+++ head/games/0ad/Makefile	Thu Sep  5 13:08:30 2013	(r326393)
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	0ad
-PORTVERSION=	0.0.13
-PORTREVISION=	1
+PORTVERSION=	0.0.14
 CATEGORIES=	games
 MASTER_SITES=	SF/zero-ad/releases
 DISTFILES=	${PORTNAME}-${PORTVERSION}-alpha-unix-build.tar.xz \
@@ -25,7 +24,7 @@ LIB_DEPENDS=	boost_thread:${PORTSDIR}/de
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-alpha
 BUILD_WRKSRC=	${WRKSRC}/build/workspaces/gcc
 MAKE_ARGS=	config=release
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_XZ=		yes
 USE_SDL=	sdl
 USE_GNOME=	libxml2 gtk20
@@ -45,6 +44,26 @@ PORTDATA=	*
 
 .include <bsd.port.pre.mk>
 
+# Taken from Mk/bsd.gnustep.mk
+.if exists(${DESTDIR}/usr/bin/clang)
+__CLANG!=		${DESTDIR}/usr/bin/clang --version | head -1 | \
+		${SED} -e 's/.*clang version \([0-9]\)\.\([0-9]\).*/\1\2/'
+.else
+__CLANG=		0
+
+.if ${__CLANG} < 33 && ${OSVERSION} > 900014
+BUILD_DEPENDS+= ${LOCALBASE}/bin/clang33:${PORTSDIR}/lang/clang33
+CPP=		${LOCALBASE}/bin/clang-cpp33
+CC=		${LOCALBASE}/bin/clang33
+CXX=		${LOCALBASE}/bin/clang++33
+.elif ${OSVERSION} < 900014
+USE_GCC=	yes
+.else
+CPP=		/usr/bin/clang-cpp
+CC=		/usr/bin/clang
+CXX=		/usr/bin/clang++
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|' \
 		${WRKSRC}/build/premake/premake4.lua

Modified: head/games/0ad/distinfo
==============================================================================
--- head/games/0ad/distinfo	Thu Sep  5 12:54:46 2013	(r326392)
+++ head/games/0ad/distinfo	Thu Sep  5 13:08:30 2013	(r326393)
@@ -1,4 +1,4 @@
-SHA256 (0ad-0.0.13-alpha-unix-build.tar.xz) = 6694c34341ae2dcf81912b3242619f853216dc3b9447177931e903421e480e18
-SIZE (0ad-0.0.13-alpha-unix-build.tar.xz) = 10152276
-SHA256 (0ad-0.0.13-alpha-unix-data.tar.xz) = 284477ddb14732b48ef6740b804294fc8361460190368e60324ce0e22aca4f7e
-SIZE (0ad-0.0.13-alpha-unix-data.tar.xz) = 420479284
+SHA256 (0ad-0.0.14-alpha-unix-build.tar.xz) = 2034cc71043c970e6229080385b343b08fd5c0b2258372dc19de4c2057267a5c
+SIZE (0ad-0.0.14-alpha-unix-build.tar.xz) = 10172124
+SHA256 (0ad-0.0.14-alpha-unix-data.tar.xz) = e046531a55226a15784ce9c31df1d8e6723ad2cedd70a0abb63dc1721bf2a770
+SIZE (0ad-0.0.14-alpha-unix-data.tar.xz) = 450006708

Modified: head/games/0ad/files/patch-build-premake-premake4.lua
==============================================================================
--- head/games/0ad/files/patch-build-premake-premake4.lua	Thu Sep  5 12:54:46 2013	(r326392)
+++ head/games/0ad/files/patch-build-premake-premake4.lua	Thu Sep  5 13:08:30 2013	(r326393)
@@ -1,6 +1,6 @@
---- build/premake/premake4.lua.orig	2013-03-07 14:49:49.000000000 +0100
-+++ build/premake/premake4.lua	2013-04-03 00:14:47.033326555 +0200
-@@ -136,7 +136,7 @@
+--- build/premake/premake4.lua.orig	2013-08-27 04:42:56.000000000 +0200
++++ build/premake/premake4.lua	2013-09-03 15:32:07.321963983 +0200
+@@ -138,7 +138,7 @@
  
  function project_set_build_flags()
  
@@ -9,15 +9,7 @@
  	if not _OPTIONS["icc"] and (os.is("windows") or not _OPTIONS["minimal-flags"]) then
  		-- adds the -Wall compiler flag
  		flags { "ExtraWarnings" } -- this causes far too many warnings/remarks on ICC
-@@ -217,7 +217,6 @@
- 
- 					-- enable security features (stack checking etc) that shouldn't have
- 					-- a significant effect on performance and can catch bugs
--					"-fstack-protector-all",
- 					"-D_FORTIFY_SOURCE=2",
- 
- 					-- always enable strict aliasing (useful in debug builds because of the warnings)
-@@ -343,11 +342,11 @@
+@@ -356,11 +356,11 @@
  		-- X11 includes may be installed in one of a gadzillion of three places
  		-- Famous last words: "You can't include too much! ;-)"
  		includedirs {