svn commit: r474207 - in head/devel/avarice: . files

[Craig Leres]

Author: leres
Date: Sun Jul  8 22:34:53 2018
New Revision: 474207
URL: https://svnweb.freebsd.org/changeset/ports/474207

Log:
  After upgrading to 11.2-RELEASE devel/avarice fails to
  compile with:
  
      jtagrw.cc:134:13: error: cannot initialize return object of type 'uchar *' (aka 'unsigned char *') with an rvalue of type 'bool'
  
  		return false;
  		       ^~~~~
  
  examination of the code shows another case with a similar
  check that returns NULL.
  
  I also filed an upstream bug report:
  
      https://sourceforge.net/p/avarice/bugs/24/
  
  PR:		229376
  Reviewed by:	ler (mentor)
  Approved by:	joerg (maintainer), ler (mentor)
  Differential Revision:	https://reviews.freebsd.org/D16184

Added:
  head/devel/avarice/files/
  head/devel/avarice/files/patch-src_jtagrw.cc   (contents, props changed)
Modified:
  head/devel/avarice/Makefile

Modified: head/devel/avarice/Makefile
==============================================================================
--- head/devel/avarice/Makefile	Sun Jul  8 22:30:30 2018	(r474206)
+++ head/devel/avarice/Makefile	Sun Jul  8 22:34:53 2018	(r474207)
@@ -3,7 +3,7 @@
 
 PORTNAME=	avarice
 PORTVERSION=	2.13
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 

Added: head/devel/avarice/files/patch-src_jtagrw.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/avarice/files/patch-src_jtagrw.cc	Sun Jul  8 22:34:53 2018	(r474207)
@@ -0,0 +1,11 @@
+--- src/jtagrw.cc.orig	2018-06-27 21:49:14 UTC
++++ src/jtagrw.cc
+@@ -131,7 +131,7 @@ uchar *jtag1::jtagRead(unsigned long add
+ 	else
+ 	    numLocations = (numBytes + 1) / 2;
+ 	if (numLocations > 256)
+-	    return false;
++	    return NULL;
+ 
+ 	command[1] = whichSpace;
+ 	command[2] = numLocations - 1;