Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 27 Aug 2018 17:29:04 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r478237 - head/games/keeperrl
Message-ID:  <201808271729.w7RHT4Ld020524@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Mon Aug 27 17:29:03 2018
New Revision: 478237
URL: https://svnweb.freebsd.org/changeset/ports/478237

Log:
  games/keeperrl: unbreak with libc++ 7
  
  In file included from effect.cpp:731:
  ./pretty_archive.h:135:12: error: call to 'quoted' is ambiguous
    ar.os << std::quoted(t) << " ";
             ^~~~~~~~~~~
  /usr/include/c++/v1/iomanip:645:1: note: candidate function [with _CharT = char, _Traits = std::__1::char_traits<char>, _Allocator = std::__1::allocator<char>]
  quoted ( const basic_string <_CharT, _Traits, _Allocator> &__s, _CharT __delim = _CharT('"'), _CharT __escape=_CharT('\\'))
  ^
  ./extern/iomanip.h:173:3: note: candidate function [with _CharT = char, _Traits = std::__1::char_traits<char>, _Alloc = std::__1::allocator<char>]
    quoted(const basic_string<_CharT, _Traits, _Alloc>& __string,
    ^
  
  PR:		230355
  Obtained from:	upstream

Modified:
  head/games/keeperrl/Makefile   (contents, props changed)
  head/games/keeperrl/distinfo   (contents, props changed)

Modified: head/games/keeperrl/Makefile
==============================================================================
--- head/games/keeperrl/Makefile	Mon Aug 27 17:25:16 2018	(r478236)
+++ head/games/keeperrl/Makefile	Mon Aug 27 17:29:03 2018	(r478237)
@@ -2,9 +2,12 @@
 
 PORTNAME=	keeperrl
 PORTVERSION=	0.0.${ALPHA_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES=	c0fc69cbee72.patch:-p1
+
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Ambitious dungeon builder with roguelike elements
 
@@ -42,8 +45,6 @@ post-patch:
 		-e 's|bash|sh|' \
 		${WRKSRC}/Makefile
 	@${REINPLACE_CMD} 's|bash|sh|' ${WRKSRC}/check_serial.sh
-	@${REINPLACE_CMD} '/_GLIBCXX_END_NAMESPACE_VERSION/d' \
-		${WRKSRC}/extern/iomanip.h
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/keeper ${STAGEDIR}${PREFIX}/bin

Modified: head/games/keeperrl/distinfo
==============================================================================
--- head/games/keeperrl/distinfo	Mon Aug 27 17:25:16 2018	(r478236)
+++ head/games/keeperrl/distinfo	Mon Aug 27 17:29:03 2018	(r478237)
@@ -1,3 +1,5 @@
 TIMESTAMP = 1516986107
 SHA256 (miki151-keeperrl-0.0.23-alpha23_GH0.tar.gz) = 046cba3c8834f52f9e796d2deece8770b833d351eb222c216fdf65b0c1869979
 SIZE (miki151-keeperrl-0.0.23-alpha23_GH0.tar.gz) = 3252139
+SHA256 (c0fc69cbee72.patch) = ca2a3158182b1bcab2c9ec0d9e9525800d49c62f2d544c9a3b6c01fbee75750b
+SIZE (c0fc69cbee72.patch) = 533



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201808271729.w7RHT4Ld020524>