From owner-svn-ports-head@FreeBSD.ORG  Sat Nov 30 11:08:28 2013
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 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 12EA032C;
 Sat, 30 Nov 2013 11:08:28 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id D95A11BB8;
 Sat, 30 Nov 2013 11:08:27 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAUB8Rq1005943;
 Sat, 30 Nov 2013 11:08:27 GMT (envelope-from wg@svn.freebsd.org)
Received: (from wg@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAUB8RVb005940;
 Sat, 30 Nov 2013 11:08:27 GMT (envelope-from wg@svn.freebsd.org)
Message-Id: <201311301108.rAUB8RVb005940@svn.freebsd.org>
From: William Grzybowski <wg@FreeBSD.org>
Date: Sat, 30 Nov 2013 11:08:27 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r335283 - in head/games/jfk: . 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.16
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: Sat, 30 Nov 2013 11:08:28 -0000

Author: wg
Date: Sat Nov 30 11:08:26 2013
New Revision: 335283
URL: http://svnweb.freebsd.org/changeset/ports/335283

Log:
  games/jfk: fix build with clang
  
  PR:		ports/184244
  Submitted by:	KATO Tsuguru <tkato432 yahoo.com>

Added:
  head/games/jfk/files/patch-src__client__objects_c.cc   (contents, props changed)
  head/games/jfk/files/patch-src__lib__network.cc   (contents, props changed)
Modified:
  head/games/jfk/Makefile

Modified: head/games/jfk/Makefile
==============================================================================
--- head/games/jfk/Makefile	Sat Nov 30 11:04:51 2013	(r335282)
+++ head/games/jfk/Makefile	Sat Nov 30 11:08:26 2013	(r335283)
@@ -8,7 +8,6 @@ CATEGORIES=	games
 MASTER_SITES=	http://hop.at/jfk/
 
 LICENSE=	GPLv2 # (or later)
-LICENSE_FILE=	${WRKSRC}/COPYING
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Multiplayer 2D shoot'em up game

Added: head/games/jfk/files/patch-src__client__objects_c.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/jfk/files/patch-src__client__objects_c.cc	Sat Nov 30 11:08:26 2013	(r335283)
@@ -0,0 +1,10 @@
+--- src/client/objects_c.cc.orig
++++ src/client/objects_c.cc
+@@ -21,6 +21,7 @@
+  */
+ 
+ #include <cmath>
++#include <cstdlib>
+ #include <string>
+ #include "objects_c.h"
+ #include "level.h"

Added: head/games/jfk/files/patch-src__lib__network.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/jfk/files/patch-src__lib__network.cc	Sat Nov 30 11:08:26 2013	(r335283)
@@ -0,0 +1,27 @@
+--- src/lib/network.cc.orig
++++ src/lib/network.cc
+@@ -6,6 +6,7 @@
+ #include <cassert>
+ #include <cerrno>
+ #include <csignal>
++#include <cstdlib>
+ #include <cstring>
+ #include <new>
+ #include <string>
+@@ -289,7 +290,7 @@
+ 
+     set_socket_nonblocking(listenfd);
+ 
+-    sa = (sockaddr*)std::malloc(MAXSOCKADDR);
++    sa = (sockaddr*)malloc(MAXSOCKADDR);
+     if (sa == NULL)
+         throw std::bad_alloc();
+ }
+@@ -370,7 +371,7 @@
+         const size_t    MIN_POLLFD = 10;
+         /* allocate more memory for the pollfd array */
+         fd_alloc = std::max(MIN_POLLFD, 3 * fd_alloc / 2);
+-        pollfd* tmp = (pollfd*)std::realloc(fds, fd_alloc * sizeof *fds);
++        pollfd* tmp = (pollfd*)realloc(fds, fd_alloc * sizeof *fds);
+         if (tmp == NULL)
+             throw std::bad_alloc();