Date: Tue, 17 Dec 2013 02:48:47 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/184813: games/shaaft: Fix build with clang Message-ID: <20131217024847.b6ce6775b7628a10f879c94b@yahoo.com> Resent-Message-ID: <201312161810.rBGIA1s6015791@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 184813
>Category: ports
>Synopsis: games/shaaft: Fix build with clang
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Dec 16 18:10:01 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 8.4-RELEASE-p4 i386
>Organization:
>Environment:
>Description:
- Fix build with clang
- Add DESKTOP_ENTRIES
New file:
files/patch-ResourceManager.cpp
files/patch-Value.hpp
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/games/shaaft/Makefile games/shaaft/Makefile
--- /usr/ports/games/shaaft/Makefile 2013-11-11 13:55:18.000000000 +0900
+++ games/shaaft/Makefile 2013-12-17 00:00:00.000000000 +0900
@@ -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 @@
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"
diff -urN /usr/ports/games/shaaft/files/patch-ResourceManager.cpp games/shaaft/files/patch-ResourceManager.cpp
--- /usr/ports/games/shaaft/files/patch-ResourceManager.cpp 1970-01-01 09:00:00.000000000 +0900
+++ games/shaaft/files/patch-ResourceManager.cpp 2013-12-17 00:00:00.000000000 +0900
@@ -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>
diff -urN /usr/ports/games/shaaft/files/patch-Value.hpp games/shaaft/files/patch-Value.hpp
--- /usr/ports/games/shaaft/files/patch-Value.hpp 1970-01-01 09:00:00.000000000 +0900
+++ games/shaaft/files/patch-Value.hpp 2013-12-17 00:00:00.000000000 +0900
@@ -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>
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20131217024847.b6ce6775b7628a10f879c94b>