Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 1 Feb 2017 12:26:15 +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: r433012 - in head/games/eboard: . files
Message-ID:  <201702011226.v11CQF1c063461@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Wed Feb  1 12:26:15 2017
New Revision: 433012
URL: https://svnweb.freebsd.org/changeset/ports/433012

Log:
  games/eboard: unbreak with libc++ 3.9
  
  ntext.cc:247:5: error: assigning to 'char *' from incompatible type 'const char *'
    p = strchr(text, '\n');
      ^ ~~~~~~~~~~~~~~~~~~
  
  Reported by:	pkg-fallout

Added:
  head/games/eboard/files/patch-ntext.cc   (contents, props changed)
Modified:
  head/games/eboard/Makefile   (contents, props changed)

Modified: head/games/eboard/Makefile
==============================================================================
--- head/games/eboard/Makefile	Wed Feb  1 12:26:06 2017	(r433011)
+++ head/games/eboard/Makefile	Wed Feb  1 12:26:15 2017	(r433012)
@@ -3,7 +3,7 @@
 
 PORTNAME=	eboard
 PORTVERSION=	1.1.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	games
 MASTER_SITES=	SF \
 		SF/${PORTNAME}/eboard-extras/pack%201%20patchlevel%202/:p1 \

Added: head/games/eboard/files/patch-ntext.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/eboard/files/patch-ntext.cc	Wed Feb  1 12:26:15 2017	(r433012)
@@ -0,0 +1,24 @@
+--- ntext.cc.orig	2008-02-22 15:51:22 UTC
++++ ntext.cc
+@@ -237,7 +237,7 @@ void NText::setBG(int c) {
+ void NText::append(const char *text, int len, int color) {
+   int i;
+   NLine *nl;
+-  char *p;
++  const char *p;
+ 
+   if (len < 0) {
+     discardExcess();
+@@ -246,10 +246,8 @@ void NText::append(const char *text, int
+ 
+   p = strchr(text, '\n');
+   if (p!=NULL) {
+-    *p = 0;
+-    i = strlen(text);
+-    nl = new NLine(text, color);
+-    *p = '\n';
++    i = p - text;
++    nl = new NLine(text, color, i);
+     lines.push_back(nl);
+     formatLine(lines.size()-1);
+     append(&p[1], len-(i+1), color);



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