svn commit: r341030 - in branches/2014Q1/games/species: . files

[Martin Wilke]

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 at 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