Bug 184813 - games/shaaft: Fix build with clang
Summary: games/shaaft: Fix build with clang
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Pawel Pekala
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-12-16 18:10 UTC by tkato432
Modified: 2013-12-20 11:20 UTC (History)
0 users

See Also:

Attachments
file.diff (2.07 KB, patch)
2013-12-16 18:10 UTC, tkato432 		no flags Details | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description tkato432 2013-12-16 18:10:01 UTC 
- Fix build with clang
- Add DESKTOP_ENTRIES

New file:
files/patch-ResourceManager.cpp
files/patch-Value.hpp
Comment 1 Pawel Pekala freebsd_committer freebsd_triage 2013-12-20 10:36:19 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->pawel

I'll take it.
Comment 2 dfilter service freebsd_committer freebsd_triage 2013-12-20 10:42:51 UTC 
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>
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 3 Pawel Pekala freebsd_committer freebsd_triage 2013-12-20 10:42:56 UTC 
State Changed
From-To: open->closed

Committed. Thanks!
Comment 4 dfilter service freebsd_committer freebsd_triage 2013-12-20 11:10:13 UTC 
Author: mat
Date: Fri Dec 20 11:10:04 2013
New Revision: 336996
URL: http://svnweb.freebsd.org/changeset/ports/336996

Log:
  MFH: r336995
  
  - Fix build with clang
  - Add DESKTOP_ENTRIES
  
  PR:		ports/184813
  Submitted by:	KATO Tsuguru <tkato432@yahoo.com>
  Approved by:	portmgr (implicit)

Added:
  branches/2014Q1/games/shaaft/files/patch-ResourceManager.cpp
     - copied unchanged from r336995, head/games/shaaft/files/patch-ResourceManager.cpp
  branches/2014Q1/games/shaaft/files/patch-Value.hpp
     - copied unchanged from r336995, head/games/shaaft/files/patch-Value.hpp
Modified:
  branches/2014Q1/games/shaaft/Makefile   (contents, props changed)
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/games/shaaft/Makefile
==============================================================================
--- branches/2014Q1/games/shaaft/Makefile	Fri Dec 20 10:42:42 2013	(r336995)
+++ branches/2014Q1/games/shaaft/Makefile	Fri Dec 20 11:10:04 2013	(r336996)
@@ -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"

Copied: branches/2014Q1/games/shaaft/files/patch-ResourceManager.cpp (from r336995, head/games/shaaft/files/patch-ResourceManager.cpp)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2014Q1/games/shaaft/files/patch-ResourceManager.cpp	Fri Dec 20 11:10:04 2013	(r336996, copy of r336995, head/games/shaaft/files/patch-ResourceManager.cpp)
@@ -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>

Copied: branches/2014Q1/games/shaaft/files/patch-Value.hpp (from r336995, head/games/shaaft/files/patch-Value.hpp)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2014Q1/games/shaaft/files/patch-Value.hpp	Fri Dec 20 11:10:04 2013	(r336996, copy of r336995, head/games/shaaft/files/patch-Value.hpp)
@@ -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>
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"