From owner-svn-ports-head@FreeBSD.ORG  Wed Apr 29 06:47:37 2015
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id E6D9E815;
 Wed, 29 Apr 2015 06:47:37 +0000 (UTC)
Received: from svn.freebsd.org (svn.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 D4C4D11C8;
 Wed, 29 Apr 2015 06:47:37 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3T6lbSR007007;
 Wed, 29 Apr 2015 06:47:37 GMT (envelope-from madpilot@FreeBSD.org)
Received: (from madpilot@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3T6lbWH007006;
 Wed, 29 Apr 2015 06:47:37 GMT (envelope-from madpilot@FreeBSD.org)
Message-Id: <201504290647.t3T6lbWH007006@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: madpilot set sender to
 madpilot@FreeBSD.org using -f
From: Guido Falsi <madpilot@FreeBSD.org>
Date: Wed, 29 Apr 2015 06:47:37 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r384966 - head/games/0ad/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-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Apr 2015 06:47:38 -0000

Author: madpilot
Date: Wed Apr 29 06:47:37 2015
New Revision: 384966
URL: https://svnweb.freebsd.org/changeset/ports/384966

Log:
  Fix build after const removal from iconv.
  
  Reported by:	ajtiM <lumiwa at gmail.com> (via email)

Modified:
  head/games/0ad/files/patch-build__premake__extern_libs4.lua

Modified: head/games/0ad/files/patch-build__premake__extern_libs4.lua
==============================================================================
--- head/games/0ad/files/patch-build__premake__extern_libs4.lua	Wed Apr 29 06:42:51 2015	(r384965)
+++ head/games/0ad/files/patch-build__premake__extern_libs4.lua	Wed Apr 29 06:47:37 2015	(r384966)
@@ -1,6 +1,6 @@
---- build/premake/extern_libs4.lua.orig	2014-09-24 10:05:27 UTC
+--- build/premake/extern_libs4.lua.orig	2015-02-20 05:52:18 UTC
 +++ build/premake/extern_libs4.lua
-@@ -237,7 +237,7 @@
+@@ -237,7 +237,7 @@ extern_lib_defs = {
  			end
  			-- TODO: This actually applies to most libraries we use on BSDs, make this a global setting.
  			if os.is("bsd") then
@@ -9,3 +9,12 @@
  			end
  		end,
  		link_settings = function()
+@@ -346,8 +346,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" }
+ 			end
+ 		end,
+ 		link_settings = function()