Date: Tue, 31 Dec 2013 05:47:24 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/185332: games/species: Fix build with clang Message-ID: <20131231054724.bb57f8c18af9fb03387a6961@yahoo.com> Resent-Message-ID: <201312302110.rBULA7fP098786@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 185332
>Category: ports
>Synopsis: games/species: 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 30 21:10:07 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 8.4-RELEASE-p4 i386
>Organization:
>Environment:
>Description:
- Fix build with clang
- Support CXXFLAGS properly
- Support COPYTREE_SHARE
- Add LICENSE
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/games/species/Makefile games/species/Makefile
--- /usr/ports/games/species/Makefile 2013-11-20 21:29:50.000000000 +0900
+++ games/species/Makefile 2013-12-31 00:00:00.000000000 +0900
@@ -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 @@
.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
diff -urN /usr/ports/games/species/files/patch-Makefile games/species/files/patch-Makefile
--- /usr/ports/games/species/files/patch-Makefile 2013-11-06 22:00:44.000000000 +0900
+++ games/species/files/patch-Makefile 2013-12-31 00:00:00.000000000 +0900
@@ -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
diff -urN /usr/ports/games/species/files/patch-main.cpp games/species/files/patch-main.cpp
--- /usr/ports/games/species/files/patch-main.cpp 2013-11-11 13:55:17.000000000 +0900
+++ games/species/files/patch-main.cpp 2013-12-31 00:00:00.000000000 +0900
@@ -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
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20131231054724.bb57f8c18af9fb03387a6961>