Bug 185332 - games/species: Fix build with clang
Summary: games/species: 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: freebsd-ports-bugs (Nobody)
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-12-30 21:10 UTC by tkato432
Modified: 2014-01-25 13:20 UTC (History)
0 users

See Also:


Attachments
file.diff (2.60 KB, patch)
2013-12-30 21:10 UTC, tkato432
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description tkato432 2013-12-30 21:10:07 UTC
- Fix build with clang
- Support CXXFLAGS properly
- Support COPYTREE_SHARE
- Add LICENSE
Comment 1 Martin Wilke freebsd_committer freebsd_triage 2014-01-19 13:50:12 UTC
State Changed
From-To: open->closed

Committed. Thanks!
Comment 2 dfilter service freebsd_committer freebsd_triage 2014-01-19 13:50:14 UTC
Author: miwi
Date: Sun Jan 19 13:50:05 2014
New Revision: 340297
URL: http://svnweb.freebsd.org/changeset/ports/340297
QAT: https://qat.redports.org/buildarchive/r340297/

Log:
  - FIx build with clang
  - Support CXXFLAGS properly
  - Support COPYTREE_SHARE
  - Add LICENSE
  
  PR:		185332
  Submitted by:	ports fury

Modified:
  head/games/species/Makefile
  head/games/species/files/patch-Makefile   (contents, props changed)
  head/games/species/files/patch-main.cpp

Modified: head/games/species/Makefile
==============================================================================
--- head/games/species/Makefile	Sun Jan 19 13:49:20 2014	(r340296)
+++ head/games/species/Makefile	Sun Jan 19 13:50:05 2014	(r340297)
@@ -3,14 +3,16 @@
 
 PORTNAME=	species
 PORTVERSION=	1.2d
+PORTREVISION=	1
 CATEGORIES=	games
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	alepulver
+MASTER_SITES=	LOCAL/alepulver
 DISTNAME=	redcoder
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Corewars evolver - generates warriors using genetic algorithms
 
+LICENSE=	GPLv1 # (or later)
+
 USE_BZIP2=	yes
 USES=		gmake dos2unix
 WRKSRC=		${WRKDIR}/${PORTNAME}
@@ -25,11 +27,17 @@ VISITOOL_ALL_TARGET=	all visitool
 
 .include <bsd.port.options.mk>
 
+.if empty(PORT_OPTIONS:MVISITOOL)
+MAKE_ENV+=	WX_CONFIG="${TRUE}"
+.endif
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} koen.* species.ini *.rc ${STAGEDIR}${DATADIR}
-	cd ${WRKSRC} && ${CP} -r bench evolver_hill wilfiz ${STAGEDIR}${DATADIR}
+.for i in bench evolver_hill wilfiz
+	@(cd ${WRKSRC} && ${COPYTREE_SHARE} ${i} ${STAGEDIR}${DATADIR})
+.endfor
 .if ${PORT_OPTIONS:MVISITOOL}
 	${INSTALL_PROGRAM} ${WRKSRC}/visitool ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-visitool
 .endif

Modified: head/games/species/files/patch-Makefile
==============================================================================
--- head/games/species/files/patch-Makefile	Sun Jan 19 13:49:20 2014	(r340296)
+++ head/games/species/files/patch-Makefile	Sun Jan 19 13:50:05 2014	(r340297)
@@ -1,6 +1,6 @@
 --- ./Makefile.orig	Sun Feb 22 03:54:24 2004
 +++ ./Makefile	Wed Jan 16 18:29:09 2008
-@@ -1,8 +1,8 @@
+@@ -1,22 +1,22 @@
  # makefile for species
  
 -CC = gcc
@@ -10,9 +10,11 @@
 +CPP = $(CXX)
 +LD = $(CXX)
  
- OPT = -O4
+-OPT = -O4
++#OPT = -O4
  DBG =
-@@ -11,12 +11,12 @@
+ # Recommended extra options for gcc:
+ #OPT += -fomit-frame-pointer -fforce-addr -finline-functions -funroll-loops
  #OPT += -mcpu=i686 -march=i686
  #DBG += -W -Wall -pedantic -ansi
  

Modified: head/games/species/files/patch-main.cpp
==============================================================================
--- head/games/species/files/patch-main.cpp	Sun Jan 19 13:49:20 2014	(r340296)
+++ head/games/species/files/patch-main.cpp	Sun Jan 19 13:50:05 2014	(r340297)
@@ -1,11 +1,11 @@
---- ./main.cpp.orig	2013-11-10 23:14:27.000000000 -0200
-+++ ./main.cpp	2013-11-10 23:14:37.000000000 -0200
+--- main.cpp.orig
++++ main.cpp
 @@ -29,7 +29,7 @@
  
  /***** main program entry point ********************/
  
 -int main(int /*argc*/,char /***args*/) {
-+int main(int /*argc*/,char ** /*args*/) {
++int main(int /*argc*/,char **/*args*/) {
  	CKingdom kingdom;
  	
  	#ifndef _WIN32
_______________________________________________
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 dfilter service freebsd_committer freebsd_triage 2014-01-25 13:12:15 UTC
Author: miwi
Date: Sat Jan 25 13:12:05 2014
New Revision: 341030
URL: http://svnweb.freebsd.org/changeset/ports/341030
QAT: https://qat.redports.org/buildarchive/r341030/

Log:
  MFH: r340297
  
  - FIx build with clang
  - Support CXXFLAGS properly
  - Support COPYTREE_SHARE
  - Add LICENSE
  
  PR:		185332
  Submitted by:	ports fury

Modified:
  branches/2014Q1/games/species/Makefile
  branches/2014Q1/games/species/files/patch-Makefile   (contents, props changed)
  branches/2014Q1/games/species/files/patch-main.cpp
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/games/species/Makefile
==============================================================================
--- branches/2014Q1/games/species/Makefile	Sat Jan 25 13:10:29 2014	(r341029)
+++ branches/2014Q1/games/species/Makefile	Sat Jan 25 13:12:05 2014	(r341030)
@@ -3,14 +3,16 @@
 
 PORTNAME=	species
 PORTVERSION=	1.2d
+PORTREVISION=	1
 CATEGORIES=	games
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	alepulver
+MASTER_SITES=	LOCAL/alepulver
 DISTNAME=	redcoder
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Corewars evolver - generates warriors using genetic algorithms
 
+LICENSE=	GPLv1 # (or later)
+
 USE_BZIP2=	yes
 USES=		gmake dos2unix
 WRKSRC=		${WRKDIR}/${PORTNAME}
@@ -25,11 +27,17 @@ VISITOOL_ALL_TARGET=	all visitool
 
 .include <bsd.port.options.mk>
 
+.if empty(PORT_OPTIONS:MVISITOOL)
+MAKE_ENV+=	WX_CONFIG="${TRUE}"
+.endif
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} koen.* species.ini *.rc ${STAGEDIR}${DATADIR}
-	cd ${WRKSRC} && ${CP} -r bench evolver_hill wilfiz ${STAGEDIR}${DATADIR}
+.for i in bench evolver_hill wilfiz
+	@(cd ${WRKSRC} && ${COPYTREE_SHARE} ${i} ${STAGEDIR}${DATADIR})
+.endfor
 .if ${PORT_OPTIONS:MVISITOOL}
 	${INSTALL_PROGRAM} ${WRKSRC}/visitool ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-visitool
 .endif

Modified: branches/2014Q1/games/species/files/patch-Makefile
==============================================================================
--- branches/2014Q1/games/species/files/patch-Makefile	Sat Jan 25 13:10:29 2014	(r341029)
+++ branches/2014Q1/games/species/files/patch-Makefile	Sat Jan 25 13:12:05 2014	(r341030)
@@ -1,6 +1,6 @@
 --- ./Makefile.orig	Sun Feb 22 03:54:24 2004
 +++ ./Makefile	Wed Jan 16 18:29:09 2008
-@@ -1,8 +1,8 @@
+@@ -1,22 +1,22 @@
  # makefile for species
  
 -CC = gcc
@@ -10,9 +10,11 @@
 +CPP = $(CXX)
 +LD = $(CXX)
  
- OPT = -O4
+-OPT = -O4
++#OPT = -O4
  DBG =
-@@ -11,12 +11,12 @@
+ # Recommended extra options for gcc:
+ #OPT += -fomit-frame-pointer -fforce-addr -finline-functions -funroll-loops
  #OPT += -mcpu=i686 -march=i686
  #DBG += -W -Wall -pedantic -ansi
  

Modified: branches/2014Q1/games/species/files/patch-main.cpp
==============================================================================
--- branches/2014Q1/games/species/files/patch-main.cpp	Sat Jan 25 13:10:29 2014	(r341029)
+++ branches/2014Q1/games/species/files/patch-main.cpp	Sat Jan 25 13:12:05 2014	(r341030)
@@ -1,11 +1,11 @@
---- ./main.cpp.orig	2013-11-10 23:14:27.000000000 -0200
-+++ ./main.cpp	2013-11-10 23:14:37.000000000 -0200
+--- main.cpp.orig
++++ main.cpp
 @@ -29,7 +29,7 @@
  
  /***** main program entry point ********************/
  
 -int main(int /*argc*/,char /***args*/) {
-+int main(int /*argc*/,char ** /*args*/) {
++int main(int /*argc*/,char **/*args*/) {
  	CKingdom kingdom;
  	
  	#ifndef _WIN32
_______________________________________________
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"