Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 16 Apr 2013 17:53:29 +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: r315872 - in head/games/0ad: . files
Message-ID:  <201304161753.r3GHrTxm045965@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: madpilot
Date: Tue Apr 16 17:53:29 2013
New Revision: 315872
URL: http://svnweb.freebsd.org/changeset/ports/315872

Log:
  - Update to 0.0.13
  - Remove check for unsupported OS version
  
  Feature safe: yes

Added:
  head/games/0ad/files/patch-libraries-source-fcollada-src-FCollada-FUtils-FUStringBuilder.hpp   (contents, props changed)
  head/games/0ad/files/patch-libraries-source-spidermonkey-build.sh   (contents, props changed)
Deleted:
  head/games/0ad/files/patch-libraries-fcollada-src-FCollada-FUtils-FUStringBuilder.hpp
  head/games/0ad/files/patch-libraries-nvtt-src-src-nvtt-squish-CMakeLists.txt
  head/games/0ad/files/patch-libraries-spidermonkey-build.sh
  head/games/0ad/files/patch-source-lib-debug.h
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	Tue Apr 16 17:49:26 2013	(r315871)
+++ head/games/0ad/Makefile	Tue Apr 16 17:53:29 2013	(r315872)
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	0ad
-PORTVERSION=	0.0.12
-PORTREVISION=	2
+PORTVERSION=	0.0.13
 CATEGORIES=	games
 MASTER_SITES=	SF/zero-ad/releases
 DISTFILES=	${PORTNAME}-${PORTVERSION}-alpha-unix-build.tar.xz \
@@ -46,10 +45,6 @@ PORTDATA=	*
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 800067
-BROKEN=		Does not compile on 7.x: Requires wcsnlen(3)
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|' \
 		${WRKSRC}/build/premake/premake4.lua

Modified: head/games/0ad/distinfo
==============================================================================
--- head/games/0ad/distinfo	Tue Apr 16 17:49:26 2013	(r315871)
+++ head/games/0ad/distinfo	Tue Apr 16 17:53:29 2013	(r315872)
@@ -1,4 +1,4 @@
-SHA256 (0ad-0.0.12-alpha-unix-build.tar.xz) = 69d01f9ba12bb78f58fc2c567187cfffe20055591f378724b906e6a48ac73877
-SIZE (0ad-0.0.12-alpha-unix-build.tar.xz) = 8693880
-SHA256 (0ad-0.0.12-alpha-unix-data.tar.xz) = 0efd800a149f2fed70d7e133b93a385e82810844b50154771514d17d9a68ee07
-SIZE (0ad-0.0.12-alpha-unix-data.tar.xz) = 388143556
+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

Modified: head/games/0ad/files/patch-build-premake-premake4.lua
==============================================================================
--- head/games/0ad/files/patch-build-premake-premake4.lua	Tue Apr 16 17:49:26 2013	(r315871)
+++ head/games/0ad/files/patch-build-premake-premake4.lua	Tue Apr 16 17:53:29 2013	(r315872)
@@ -1,6 +1,6 @@
---- build/premake/premake4.lua.orig	2012-10-30 01:56:24.000000000 +0100
-+++ build/premake/premake4.lua	2012-12-26 18:37:28.882327928 +0100
-@@ -134,7 +134,7 @@
+--- 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 @@
  
  function project_set_build_flags()
  
@@ -9,7 +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
-@@ -215,7 +215,6 @@
+@@ -217,7 +217,6 @@
  
  					-- enable security features (stack checking etc) that shouldn't have
  					-- a significant effect on performance and can catch bugs
@@ -17,18 +17,18 @@
  					"-D_FORTIFY_SOURCE=2",
  
  					-- always enable strict aliasing (useful in debug builds because of the warnings)
-@@ -287,11 +286,11 @@
+@@ -343,11 +342,11 @@
  		-- X11 includes may be installed in one of a gadzillion of three places
  		-- Famous last words: "You can't include too much! ;-)"
  		includedirs {
 -			"/usr/X11R6/include/X11",
 -			"/usr/X11R6/include",
-+			"%%LOCALBASE%%/X11",
++			"%%LOCALBASE%%/include/X11",
 +			"%%LOCALBASE%%/include",
  			"/usr/include/X11"
  		}
 -		libdirs { "/usr/X11R6/lib" }
 +		libdirs { "%%LOCALBASE%%/lib" }
+ 	end
+ end
  
- 		if _OPTIONS["bindir"] then
- 			defines { "INSTALLED_BINDIR=" .. _OPTIONS["bindir"] }

Added: head/games/0ad/files/patch-libraries-source-fcollada-src-FCollada-FUtils-FUStringBuilder.hpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/0ad/files/patch-libraries-source-fcollada-src-FCollada-FUtils-FUStringBuilder.hpp	Tue Apr 16 17:53:29 2013	(r315872)
@@ -0,0 +1,45 @@
+--- libraries/source/fcollada/src/FCollada/FUtils/FUStringBuilder.hpp.orig	2013-04-03 00:21:34.395291619 +0200
++++ libraries/source/fcollada/src/FCollada/FUtils/FUStringBuilder.hpp	2013-04-03 00:23:23.590274415 +0200
+@@ -18,6 +18,42 @@
+ #include <float.h>
+ #endif
+ 
++#ifdef __FreeBSD__
++// ecvt is not included in FreeBSD's stdlib
++// http://forum.pellesc.de/index.php?PHPSESSID=0c4srgu3vrs19ali5459jehdh3&topic=2103.msg7797#msg7797
++char *ecvt(double value, int ndigit, int *decpt, int *sign)
++{
++	static char buffer[348];
++	static const int n = sizeof(buffer)/sizeof(buffer[0])-1;
++	ptrdiff_t pd;
++	int len;
++	int zeros=0;
++	if (ndigit > n) ndigit=n;
++	while (value > -1.0 && value < 1.0 ) {
++		value*=10.0;
++		zeros++;
++	}
++	sprintf(buffer,"%.*f",DBL_DIG,value);
++	len=strlen(buffer);
++	if (buffer[0]=='-') {
++		memmove(buffer, buffer+1, --len);
++		buffer[len]='\0';
++		*sign=1;
++	}
++	else *sign = 0;
++	pd=strchr(buffer,'.')-buffer;
++	memmove(buffer+pd,buffer+pd+1,--len-pd);
++	buffer[len]='\0';
++	*decpt=(int)pd-zeros;
++	if (len >= ndigit) buffer[ndigit]='\0';
++	else {
++		memset(buffer+len,'0',ndigit-len);
++		buffer[ndigit]='\0';
++	}
++	return buffer;
++}
++#endif
++
+ #ifdef WIN32
+ #define ecvt _ecvt
+ #endif // WIN32

Added: head/games/0ad/files/patch-libraries-source-spidermonkey-build.sh
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/0ad/files/patch-libraries-source-spidermonkey-build.sh	Tue Apr 16 17:53:29 2013	(r315872)
@@ -0,0 +1,17 @@
+--- libraries/source/spidermonkey/build.sh.orig	2013-02-04 01:31:03.000000000 +0100
++++ libraries/source/spidermonkey/build.sh	2013-04-03 00:34:16.221257333 +0200
+@@ -53,6 +53,14 @@
+ 
+ cd js-1.8.5/js/src
+ 
++cp jsnativestack.cpp jsnativestack.cpp.orig
++sed 's/#  include <pthread_np.h>/#pragma GCC visibility push(default)\
++#include <pthread_np.h>\
++#pragma GCC visibility pop/' jsnativestack.cpp.orig >jsnativestack.cpp
++
++cp configure configure.orig
++sed 's/"$ac_cv_have_visibility_class_bug" = "no"; then/"$ac_cv_have_visibility_class_bug" = "no" -a "$OS_ARCH" != "FreeBSD" ; then/' configure.orig >configure
++
+ # We want separate debug/release versions of the library, so we have to change
+ # the LIBRARY_NAME for each build.
+ # (We use perl instead of sed so that it works with MozillaBuild on Windows,



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