From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Dec 16 18:10:06 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8092169B for ; Mon, 16 Dec 2013 18:10:06 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5E2CF1921 for ; Mon, 16 Dec 2013 18:10:06 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGIA6lZ015937 for ; Mon, 16 Dec 2013 18:10:06 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id rBGIA6Q4015936; Mon, 16 Dec 2013 18:10:06 GMT (envelope-from gnats) Resent-Date: Mon, 16 Dec 2013 18:10:06 GMT Resent-Message-Id: <201312161810.rBGIA6Q4015936@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, KATO Tsuguru Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8DFBB3A8 for ; Mon, 16 Dec 2013 18:03:36 +0000 (UTC) Received: from omta03.auone-net.jp (mail-or0-f67.auone-net.jp [106.187.230.67]) by mx1.freebsd.org (Postfix) with ESMTP id 1F4441871 for ; Mon, 16 Dec 2013 18:03:36 +0000 (UTC) Received: from coppermine.my.domain (ZT030106.ppp.dion.ne.jp [59.128.30.106]) by omta03.auone-net.jp (au one net mail) with ESMTP id 8EDD41880004 for ; Tue, 17 Dec 2013 03:03:31 +0900 (JST) Message-Id: <20131217024843.5f3f833b354f66f9def29996@yahoo.com> Date: Tue, 17 Dec 2013 02:48:43 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/184825: games/rtb: Fix build on -current X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 18:10:06 -0000 >Number: 184825 >Category: ports >Synopsis: games/rtb: Fix build on -current >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:05 UTC 2013 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 8.4-RELEASE-p4 i386 >Organization: >Environment: >Description: - Fix build on -current - Update MASTER_SITES - Add LICENSE - Add DESKTOP_ENTRIES New file: files/patch-team-framework__io__unixclientcommunicator.cpp files/patch-team-framework__io__unixinstreambuf.cpp files/patch-team-framework__io__unixoutstreambuf.cpp files/patch-team-framework__io__unixremoteclientconnection.cpp files/patch-team-framework__io__unixrtbconnection.cpp files/patch-team-framework__io__unixservercommunicator.cpp files/patch-team-framework__io__unixserverconnection.cpp files/patch-team-framework__stdnamespace.h >How-To-Repeat: >Fix: diff -urN /usr/ports/games/rtb/Makefile games/rtb/Makefile --- /usr/ports/games/rtb/Makefile 2013-11-06 22:00:23.000000000 +0900 +++ games/rtb/Makefile 2013-12-17 00:00:00.000000000 +0900 @@ -3,60 +3,47 @@ PORTNAME= RealTimeBattle PORTVERSION= 1.0.8 -PORTREVISION= 9 +DISTVERSIONSUFFIX= -Ext +PORTREVISION= 10 CATEGORIES= games -MASTER_SITES= SF${PORTNAME:} -DISTNAME= ${PORTNAME}-${PORTVERSION}-Ext +MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME}-1.0.x/${PORTNAME}%20${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Robot programming game for UNIX +LICENSE= GPLv2 # (or later) + BUILD_DEPENDS= gsed:${PORTSDIR}/textproc/gsed -USES= perl5 gmake pkgconfig +OPTIONS_DEFINE= DOCS + USE_BZIP2= yes +USES= gettext gmake perl5 pkgconfig USE_GNOME= gtk20 USE_PYTHON= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-rtb-dir=${PREFIX}/lib/${PORTNAME} -CPPFLAGS+= -I${LOCALBASE}/include -DHAVE_DECL_GETOPT +CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -NO_STAGE= yes +INFO= ${PORTNAME}.info + +DESKTOP_ENTRIES="${PORTNAME}" "" "" "${PORTNAME:L}" "" "" + post-patch: -.for file in configure - @${REINPLACE_CMD} -e '/test/s| == | = |g ; \ - s|INCLUDED_LIBINTL=yes|INCLUDED_LIBINTL=no|g ; \ - s|\\$${top_builddir}/intl/libintl.a|-lintl|g' ${WRKSRC}/${file} +.for i in configure + @${REINPLACE_CMD} -e 's|INCLUDED_LIBINTL=yes|INCLUDED_LIBINTL=no|g ; \ + s|\\$${top_builddir}/intl/libintl.a|-lintl|g ; \ + /^DOCS_DIR/s|=.*|=$${prefix}/share/doc/${PORTNAME}| ; \ + /test/s| == | = |g' ${WRKSRC}/${i} .endfor -.for file in Makefile.in - @${REINPLACE_CMD} -e '/^SUBDIRS/s|Documentation||g' ${WRKSRC}/${file} +.for i in Documentation/Makefile.in + @${REINPLACE_CMD} -e '/COPYING/d' ${WRKSRC}/${i} .endfor -.for file in team-framework/createrobot.sh \ +.for i in team-framework/createrobot.sh \ team-framework/createrobotconf.sh - @${REINPLACE_CMD} -e 's| sed| gsed|g' ${WRKSRC}/${file} -.endfor - -post-install: -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} -.for file in AUTHORS ChangeLog EXTRAROBOTS.README NEWS README TODO \ - Documentation/RealTimeBattle-1.html \ - Documentation/RealTimeBattle-2.html \ - Documentation/RealTimeBattle-3.html \ - Documentation/RealTimeBattle-4.html \ - Documentation/RealTimeBattle-5.html \ - Documentation/RealTimeBattle-6.html \ - Documentation/RealTimeBattle.html \ - Documentation/next.gif Documentation/prev.gif Documentation/toc.gif \ - Documentation/next.png Documentation/prev.png Documentation/toc.png \ - Documentation/RealTimeBattle.dvi \ - Documentation/RealTimeBattle.sgml \ - Documentation/RealTimeBattle.txt \ - Documentation/RTB-Team-Framework-Tutorial.tar.gz - ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} + @${REINPLACE_CMD} -e 's| sed| gsed|g' ${WRKSRC}/${i} .endfor -.endif .include diff -urN /usr/ports/games/rtb/files/patch-team-framework__io__unixclientcommunicator.cpp games/rtb/files/patch-team-framework__io__unixclientcommunicator.cpp --- /usr/ports/games/rtb/files/patch-team-framework__io__unixclientcommunicator.cpp 1970-01-01 09:00:00.000000000 +0900 +++ games/rtb/files/patch-team-framework__io__unixclientcommunicator.cpp 2013-12-17 00:00:00.000000000 +0900 @@ -0,0 +1,10 @@ +--- team-framework/io/unixclientcommunicator.cpp.orig ++++ team-framework/io/unixclientcommunicator.cpp +@@ -46,6 +46,7 @@ + #include + #include + #include ++#include + + /** + * Namespace diff -urN /usr/ports/games/rtb/files/patch-team-framework__io__unixinstreambuf.cpp games/rtb/files/patch-team-framework__io__unixinstreambuf.cpp --- /usr/ports/games/rtb/files/patch-team-framework__io__unixinstreambuf.cpp 1970-01-01 09:00:00.000000000 +0900 +++ games/rtb/files/patch-team-framework__io__unixinstreambuf.cpp 2013-12-17 00:00:00.000000000 +0900 @@ -0,0 +1,11 @@ +--- team-framework/io/unixinstreambuf.cpp.orig ++++ team-framework/io/unixinstreambuf.cpp +@@ -33,6 +33,8 @@ + #include "../exceptions/confignotloadedexception.h" + #include + #include ++#include ++#include + + /** + * Namespace diff -urN /usr/ports/games/rtb/files/patch-team-framework__io__unixoutstreambuf.cpp games/rtb/files/patch-team-framework__io__unixoutstreambuf.cpp --- /usr/ports/games/rtb/files/patch-team-framework__io__unixoutstreambuf.cpp 1970-01-01 09:00:00.000000000 +0900 +++ games/rtb/files/patch-team-framework__io__unixoutstreambuf.cpp 2013-12-17 00:00:00.000000000 +0900 @@ -0,0 +1,11 @@ +--- team-framework/io/unixoutstreambuf.cpp.orig ++++ team-framework/io/unixoutstreambuf.cpp +@@ -30,6 +30,8 @@ + #include "unixoutstreambuf.h" + #include + #include ++#include ++#include + /** + * Namespace + */ diff -urN /usr/ports/games/rtb/files/patch-team-framework__io__unixremoteclientconnection.cpp games/rtb/files/patch-team-framework__io__unixremoteclientconnection.cpp --- /usr/ports/games/rtb/files/patch-team-framework__io__unixremoteclientconnection.cpp 1970-01-01 09:00:00.000000000 +0900 +++ games/rtb/files/patch-team-framework__io__unixremoteclientconnection.cpp 2013-12-17 00:00:00.000000000 +0900 @@ -0,0 +1,10 @@ +--- team-framework/io/unixremoteclientconnection.cpp.orig ++++ team-framework/io/unixremoteclientconnection.cpp +@@ -36,6 +36,7 @@ + #include + #include + #include ++#include + + /** + * Namespace diff -urN /usr/ports/games/rtb/files/patch-team-framework__io__unixrtbconnection.cpp games/rtb/files/patch-team-framework__io__unixrtbconnection.cpp --- /usr/ports/games/rtb/files/patch-team-framework__io__unixrtbconnection.cpp 1970-01-01 09:00:00.000000000 +0900 +++ games/rtb/files/patch-team-framework__io__unixrtbconnection.cpp 2013-12-17 00:00:00.000000000 +0900 @@ -0,0 +1,11 @@ +--- team-framework/io/unixrtbconnection.cpp.orig ++++ team-framework/io/unixrtbconnection.cpp +@@ -33,6 +33,8 @@ + #include + #include + #include ++#include ++#include + + /** + * Namespace diff -urN /usr/ports/games/rtb/files/patch-team-framework__io__unixservercommunicator.cpp games/rtb/files/patch-team-framework__io__unixservercommunicator.cpp --- /usr/ports/games/rtb/files/patch-team-framework__io__unixservercommunicator.cpp 1970-01-01 09:00:00.000000000 +0900 +++ games/rtb/files/patch-team-framework__io__unixservercommunicator.cpp 2013-12-17 00:00:00.000000000 +0900 @@ -0,0 +1,10 @@ +--- team-framework/io/unixservercommunicator.cpp.orig ++++ team-framework/io/unixservercommunicator.cpp +@@ -50,6 +50,7 @@ + #include + #include + #include ++#include + + /** + * Namespace diff -urN /usr/ports/games/rtb/files/patch-team-framework__io__unixserverconnection.cpp games/rtb/files/patch-team-framework__io__unixserverconnection.cpp --- /usr/ports/games/rtb/files/patch-team-framework__io__unixserverconnection.cpp 1970-01-01 09:00:00.000000000 +0900 +++ games/rtb/files/patch-team-framework__io__unixserverconnection.cpp 2013-12-17 00:00:00.000000000 +0900 @@ -0,0 +1,12 @@ +--- team-framework/io/unixserverconnection.cpp.orig ++++ team-framework/io/unixserverconnection.cpp +@@ -41,6 +41,9 @@ + //IPC + #include + ++#include ++#include ++ + /** + * Namespace + */ diff -urN /usr/ports/games/rtb/files/patch-team-framework__stdnamespace.h games/rtb/files/patch-team-framework__stdnamespace.h --- /usr/ports/games/rtb/files/patch-team-framework__stdnamespace.h 1970-01-01 09:00:00.000000000 +0900 +++ games/rtb/files/patch-team-framework__stdnamespace.h 2013-12-17 00:00:00.000000000 +0900 @@ -0,0 +1,16 @@ +--- team-framework/stdnamespace.h.orig ++++ team-framework/stdnamespace.h +@@ -25,9 +25,13 @@ + + **************************************************************************/ + ++#if !defined(_LIBCPP_VERSION) + #include // This file contains the forward declaration in particular of std::string + + namespace std + { + template class auto_ptr; // Origin: The header file + } ++#else ++#include ++#endif diff -urN /usr/ports/games/rtb/pkg-plist games/rtb/pkg-plist --- /usr/ports/games/rtb/pkg-plist 2013-11-06 22:00:23.000000000 +0900 +++ games/rtb/pkg-plist 2013-12-17 00:00:00.000000000 +0900 @@ -121,9 +121,38 @@ lib/RealTimeBattle/rtblogo1024.jpg lib/RealTimeBattle/rtblogo1600.jpg lib/RealTimeBattle/tournament.txt +%%PORTDOCS%%%%DOCSDIR%%/ABOUT-NLS %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/EXTRAROBOTS.README +%%PORTDOCS%%%%DOCSDIR%%/French/RealTimeBattle-1.html +%%PORTDOCS%%%%DOCSDIR%%/French/RealTimeBattle-2.html +%%PORTDOCS%%%%DOCSDIR%%/French/RealTimeBattle-3.html +%%PORTDOCS%%%%DOCSDIR%%/French/RealTimeBattle-4.html +%%PORTDOCS%%%%DOCSDIR%%/French/RealTimeBattle-5.html +%%PORTDOCS%%%%DOCSDIR%%/French/RealTimeBattle-6.html +%%PORTDOCS%%%%DOCSDIR%%/French/RealTimeBattle.html +%%PORTDOCS%%%%DOCSDIR%%/French/next.gif +%%PORTDOCS%%%%DOCSDIR%%/French/prev.gif +%%PORTDOCS%%%%DOCSDIR%%/French/toc.gif +%%PORTDOCS%%%%DOCSDIR%%/German/RealTimeBattle-1.html +%%PORTDOCS%%%%DOCSDIR%%/German/RealTimeBattle-2.html +%%PORTDOCS%%%%DOCSDIR%%/German/RealTimeBattle-3.html +%%PORTDOCS%%%%DOCSDIR%%/German/RealTimeBattle-4.html +%%PORTDOCS%%%%DOCSDIR%%/German/RealTimeBattle-5.html +%%PORTDOCS%%%%DOCSDIR%%/German/RealTimeBattle-6.html +%%PORTDOCS%%%%DOCSDIR%%/German/RealTimeBattle.dvi +%%PORTDOCS%%%%DOCSDIR%%/German/RealTimeBattle.html +%%PORTDOCS%%%%DOCSDIR%%/German/RealTimeBattle.info +%%PORTDOCS%%%%DOCSDIR%%/German/RealTimeBattle.sgml +%%PORTDOCS%%%%DOCSDIR%%/German/RealTimeBattle.txt +%%PORTDOCS%%%%DOCSDIR%%/German/next.gif +%%PORTDOCS%%%%DOCSDIR%%/German/next.png +%%PORTDOCS%%%%DOCSDIR%%/German/prev.gif +%%PORTDOCS%%%%DOCSDIR%%/German/prev.png +%%PORTDOCS%%%%DOCSDIR%%/German/toc.gif +%%PORTDOCS%%%%DOCSDIR%%/German/toc.png +%%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/RTB-Team-Framework-Tutorial.tar.gz @@ -137,6 +166,16 @@ %%PORTDOCS%%%%DOCSDIR%%/RealTimeBattle.html %%PORTDOCS%%%%DOCSDIR%%/RealTimeBattle.sgml %%PORTDOCS%%%%DOCSDIR%%/RealTimeBattle.txt +%%PORTDOCS%%%%DOCSDIR%%/Spanish/next.gif +%%PORTDOCS%%%%DOCSDIR%%/Spanish/prev.gif +%%PORTDOCS%%%%DOCSDIR%%/Spanish/rtb-docs-1.0.5-es-1.html +%%PORTDOCS%%%%DOCSDIR%%/Spanish/rtb-docs-1.0.5-es-2.html +%%PORTDOCS%%%%DOCSDIR%%/Spanish/rtb-docs-1.0.5-es-3.html +%%PORTDOCS%%%%DOCSDIR%%/Spanish/rtb-docs-1.0.5-es-4.html +%%PORTDOCS%%%%DOCSDIR%%/Spanish/rtb-docs-1.0.5-es-5.html +%%PORTDOCS%%%%DOCSDIR%%/Spanish/rtb-docs-1.0.5-es-6.html +%%PORTDOCS%%%%DOCSDIR%%/Spanish/rtb-docs-1.0.5-es.html +%%PORTDOCS%%%%DOCSDIR%%/Spanish/toc.gif %%PORTDOCS%%%%DOCSDIR%%/TODO %%PORTDOCS%%%%DOCSDIR%%/next.gif %%PORTDOCS%%%%DOCSDIR%%/next.png @@ -153,10 +192,13 @@ share/locale/pl/LC_MESSAGES/RealTimeBattle.mo share/locale/pt/LC_MESSAGES/RealTimeBattle.mo share/locale/sv/LC_MESSAGES/RealTimeBattle.mo -@dirrmtry share/locale/en@boldquot/LC_MESSAGES -@dirrmtry share/locale/en@boldquot @dirrmtry share/locale/en@quot/LC_MESSAGES @dirrmtry share/locale/en@quot +@dirrmtry share/locale/en@boldquot/LC_MESSAGES +@dirrmtry share/locale/en@boldquot +%%PORTDOCS%%@dirrm %%DOCSDIR%%/Spanish +%%PORTDOCS%%@dirrm %%DOCSDIR%%/German +%%PORTDOCS%%@dirrm %%DOCSDIR%%/French %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm lib/RealTimeBattle/Robots/xt-bot @dirrm lib/RealTimeBattle/Robots/thomas2 >Release-Note: >Audit-Trail: >Unformatted: