operator bool doesn't equal good(), but !bad(). This makes a difference

when it comes to handling EOF. Adjust.
TritonDataCenter · Jul 5, 2013 · df5cb20 · df5cb20
1 parent 524e691
commit df5cb20
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 18 deletions.
diff --git a/graphics/openimageio/Makefile b/graphics/openimageio/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2013/06/06 12:53:42 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2013/07/05 21:34:11 joerg Exp $
 
 OIIOVER=	1.1.7
 DISTNAME=	oiio-Release-${OIIOVER}
 PKGNAME=	${DISTNAME:S/oiio-Release/openimageio/}
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	-https://github.com/OpenImageIO/oiio/archive/Release-${OIIOVER}.tar.gz
 FETCH_USING=	curl

diff --git a/graphics/openimageio/distinfo b/graphics/openimageio/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2013/05/09 13:58:54 joerg Exp $
+$NetBSD: distinfo,v 1.6 2013/07/05 21:34:11 joerg Exp $
 
 SHA1 (oiio-Release-1.1.7.tar.gz) = 435286ffad18169fd615cd33d95c2b49d3e4ec17
 RMD160 (oiio-Release-1.1.7.tar.gz) = dfe15e32ff0c821165079bf517cf11dd87146ccc
@@ -14,5 +14,5 @@ SHA1 (patch-include_tbb_tbb__machine.h) = 7d9a196397315e0d39dd2f16139e011ab84c56
 SHA1 (patch-include_tbb_tbb__misc.h) = 27995a9cdb72b182e352b2a649756af2d60fec86
 SHA1 (patch-libutil_sysutil.cpp) = b7484aef56ea239bae20faba1f04c14907557485
 SHA1 (patch-make_detectplatform.mk) = a399f09b9280109519a829dbacc1b924a074f4cc
-SHA1 (patch-psd.imageio_psdinput.cpp) = 234d617fb02b094e418ad3480888e51a1ec8f3d1
+SHA1 (patch-psd.imageio_psdinput.cpp) = 9387715224c93aff28bac55bfc54a435d1de7c1f
 SHA1 (patch-ptex.imageio_ptex_PtexPlatform.h) = 3c32f95181cfcf8c0e67249a4d04f7ea14a5e122
diff --git a/graphics/openimageio/patches/patch-psd.imageio_psdinput.cpp b/graphics/openimageio/patches/patch-psd.imageio_psdinput.cpp
@@ -1,4 +1,4 @@
-$NetBSD: patch-psd.imageio_psdinput.cpp,v 1.1 2013/05/09 13:58:54 joerg Exp $
+$NetBSD: patch-psd.imageio_psdinput.cpp,v 1.2 2013/07/05 21:34:12 joerg Exp $
 
 --- psd.imageio/psdinput.cpp.orig	2013-02-21 17:10:46.000000000 +0000
 +++ psd.imageio/psdinput.cpp
@@ -7,7 +7,7 @@
          // value = boost::numeric_cast<TVariable>(buffer);
          value = buffer;
 -        return m_file;
-+        return m_file.good();
++        return !m_file.bad();
      }
 
      int read_pascal_string (std::string &s, uint16_t mod_padding);
diff --git a/ham/fldigi/Makefile b/ham/fldigi/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.33 2013/05/31 12:41:10 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2013/07/05 21:34:12 joerg Exp $
 #
 
 DISTNAME=	fldigi-3.21.70
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	ham
 MASTER_SITES=	http://www.w1hkj.com/downloads/fldigi/
 LICENSE=	gnu-gpl-v3

diff --git a/ham/fldigi/distinfo b/ham/fldigi/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2013/05/09 14:09:13 mef Exp $
+$NetBSD: distinfo,v 1.14 2013/07/05 21:34:12 joerg Exp $
 
 SHA1 (fldigi-3.21.70.tar.gz) = 670700583404205990c7b7229eb6e75909698e63
 RMD160 (fldigi-3.21.70.tar.gz) = bcbb75218cc79d4662bf4bd07ed206823d9c953e
@@ -9,7 +9,7 @@ SHA1 (patch-src_logbook_logsupport.cxx) = f5540103677064d8a6da61db8f445b79272930
 SHA1 (patch-src_misc_dxcc.cxx) = 05fe507377334dd2787a76395dec21afeacf499a
 SHA1 (patch-src_misc_newinstall.cxx) = 2c215e9423d27dd4f4657221b17cf4ed3f12355c
 SHA1 (patch-src_misc_re.cxx) = 9daf70fa7844546e6ad761b5bdf924b6de74843c
-SHA1 (patch-src_navtex_navtex.cxx) = 13c70ecfa6c7052c0e42bbbc9829d559b6ea2cd3
+SHA1 (patch-src_navtex_navtex.cxx) = 689581bfedf83416baf876ef1c51769ce673b9d8
 SHA1 (patch-src_spot_notify.cxx) = e0f2889f1ae2405326b2883f13f618c3d9bfd412
 SHA1 (patch-src_spot_pskrep.cxx) = 1ea5838d80224b06fe940802f4f6ee7ac4207a72
 SHA1 (patch-src_spot_spot.cxx) = e69b10e9f9e884d3ef3cf5bb18d882cb1a5db5a7

diff --git a/ham/fldigi/patches/patch-src_navtex_navtex.cxx b/ham/fldigi/patches/patch-src_navtex_navtex.cxx
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_navtex_navtex.cxx,v 1.1 2013/05/06 14:49:32 joerg Exp $
+$NetBSD: patch-src_navtex_navtex.cxx,v 1.2 2013/07/05 21:34:12 joerg Exp $
 
 --- src/navtex/navtex.cxx.orig	2013-05-03 14:31:34.000000000 +0000
 +++ src/navtex/navtex.cxx
@@ -7,13 +7,13 @@
  	std::stringstream sstrm( parsed_str );
  	sstrm >> ref ;
 -	return sstrm ;
-+	return sstrm.good();
++	return !sstrm.bad();
  }
 
  static bool read_until_delim( std::istream & istrm, std::string & ref )
  {
 -	return std::getline( istrm, ref, delim );
-+	return std::getline( istrm, ref, delim ).good();
++	return !std::getline( istrm, ref, delim ).bad();
  }
 
  class NavtexRecord
diff --git a/net/synergy/Makefile b/net/synergy/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2013/05/11 21:40:14 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2013/07/05 21:34:12 joerg Exp $
 #
 
 DISTNAME=		synergy-1.3.8-Source
 PKGNAME=		${DISTNAME:S/-Source//}
+PKGREVISION=		1
 CATEGORIES=		net x11
 MASTER_SITES=		http://synergy.googlecode.com/files/
 

diff --git a/net/synergy/distinfo b/net/synergy/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.10 2013/05/11 21:40:14 joerg Exp $
+$NetBSD: distinfo,v 1.11 2013/07/05 21:34:12 joerg Exp $
 
 SHA1 (synergy-1.3.8-Source.tar.gz) = 82e80b22c6746e573d047aa4a1ad7b71c28cf7d3
 RMD160 (synergy-1.3.8-Source.tar.gz) = 3b02faec3b5e5dbea1853e6decd92e4cf6eca419
 Size (synergy-1.3.8-Source.tar.gz) = 2518396 bytes
-SHA1 (patch-src_lib_server_CConfig.cpp) = 47cb18b62cfd9eeee08cc5ee24e7777de98fefd2
+SHA1 (patch-src_lib_server_CConfig.cpp) = 14b5434c3fe33efde44f26fd14da6897229aacc9
 SHA1 (patch-src_lib_server_CConfig.h) = 6aa99efc189a3d8e067a30f4fee4d94874e4f3c6
 SHA1 (patch-tools_gmock-1.6.0_configure) = 45cfbcdc8b55c1e745265ed4e2bbbfe41ef000a2
 SHA1 (patch-tools_gmock-1.6.0_include_gmock_internal_gmock-port.h) = dc526bcfab414dcd35d3d67c36998d92020bd398

diff --git a/net/synergy/patches/patch-src_lib_server_CConfig.cpp b/net/synergy/patches/patch-src_lib_server_CConfig.cpp
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_lib_server_CConfig.cpp,v 1.1 2013/05/11 21:40:14 joerg Exp $
+$NetBSD: patch-src_lib_server_CConfig.cpp,v 1.2 2013/07/05 21:34:12 joerg Exp $
 
 --- src/lib/server/CConfig.cpp.orig	2011-01-21 03:51:35.000000000 +0000
 +++ src/lib/server/CConfig.cpp
@@ -10,7 +10,7 @@
 +CConfigReadContext::operator bool() const
  {
 -	return m_stream;
-+	return m_stream.good();
++	return !m_stream.bad();
  }
 
  bool