From owner-svn-ports-head@FreeBSD.ORG  Fri Dec 20 10:42:44 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 081BF518;
 Fri, 20 Dec 2013 10:42:44 +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 CE2A216C8;
 Fri, 20 Dec 2013 10:42:43 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBKAghfg006070;
 Fri, 20 Dec 2013 10:42:43 GMT (envelope-from pawel@svn.freebsd.org)
Received: (from pawel@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBKAghWi006067;
 Fri, 20 Dec 2013 10:42:43 GMT (envelope-from pawel@svn.freebsd.org)
Message-Id: <201312201042.rBKAghWi006067@svn.freebsd.org>
From: Pawel Pekala <pawel@FreeBSD.org>
Date: Fri, 20 Dec 2013 10:42:43 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r336995 - in head/games/shaaft: . 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.17
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: Fri, 20 Dec 2013 10:42:44 -0000

Author: pawel
Date: Fri Dec 20 10:42:42 2013
New Revision: 336995
URL: http://svnweb.freebsd.org/changeset/ports/336995

Log:
  - Fix build with clang
  - Add DESKTOP_ENTRIES
  
  PR:		ports/184813
  Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

Added:
  head/games/shaaft/files/patch-ResourceManager.cpp   (contents, props changed)
  head/games/shaaft/files/patch-Value.hpp   (contents, props changed)
Modified:
  head/games/shaaft/Makefile   (contents, props changed)

Modified: head/games/shaaft/Makefile
==============================================================================
--- head/games/shaaft/Makefile	Fri Dec 20 09:51:00 2013	(r336994)
+++ head/games/shaaft/Makefile	Fri Dec 20 10:42:42 2013	(r336995)
@@ -3,7 +3,7 @@
 
 PORTNAME=	shaaft
 PORTVERSION=	0.5.0
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	games
 MASTER_SITES=	SF/criticalmass/OldFiles
 DISTNAME=	Shaaft-${PORTVERSION}
@@ -18,16 +18,21 @@ CONFLICTS=	criticalmass-*
 USE_BZIP2=	yes
 USE_SDL=	mixer image sdl
 USE_GL=		yes
+USE_GCC=	any
 GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15
-LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--disable-optimize
+
+CPPFLAGS+=	$$(libpng-config --I_opts)
+LDFLAGS+=	$$(libpng-config --L_opts)
+
 DATADIR=	${PREFIX}/share/Shaaft
 
 PLIST_FILES=	bin/Packer bin/shaaft %%DATADIR%%/resource.dat \
 		man/man6/shaaft.6.gz
 PLIST_DIRS=	%%DATADIR%%
 
+DESKTOP_ENTRIES="Shaaft" "" "" "${PORTNAME}" "" ""
+
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "sparc64"

Added: head/games/shaaft/files/patch-ResourceManager.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/shaaft/files/patch-ResourceManager.cpp	Fri Dec 20 10:42:42 2013	(r336995)
@@ -0,0 +1,10 @@
+--- utils/ResourceManager.cpp.orig
++++ utils/ResourceManager.cpp
+@@ -13,6 +13,7 @@
+ // FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details
+ //
+ #include <unistd.h>
++#include <cstring>
+ #include <iomanip>
+ #include <dirent.h>
+ #include <sys/types.h>

Added: head/games/shaaft/files/patch-Value.hpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/shaaft/files/patch-Value.hpp	Fri Dec 20 10:42:42 2013	(r336995)
@@ -0,0 +1,12 @@
+--- utils/Value.hpp.orig	2013-11-30 21:16:05.000000000 +0900
++++ utils/Value.hpp	2013-11-30 21:16:35.000000000 +0900
+@@ -15,7 +15,8 @@
+ #ifndef _Value_hpp_
+ #define _Value_hpp_
+ 
+-#include <stdio.h>
++#include <cstdio>
++#include <cstdlib>
+ #include <string>
+ 
+ #include <Trace.hpp>