Index: head/biology/jellyfish/Makefile
===================================================================
--- head/biology/jellyfish/Makefile	(revision 527970)
+++ head/biology/jellyfish/Makefile	(revision 527971)
@@ -1,45 +1,45 @@
 # $FreeBSD$
 
 PORTNAME=		Jellyfish
 DISTVERSIONPREFIX=	v
 DISTVERSION=		2.2.10
-PORTREVISION=		7
+PORTREVISION=		8
 CATEGORIES=		biology
 
 MAINTAINER=	jwb@FreeBSD.org
 COMMENT=	Fast, memory-efficient counting of k-mers in DNA
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	yaggo:devel/yaggo
 LIB_DEPENDS=	libhts.so:biology/htslib
 
 USES=		autoreconf compiler:c++11-lib gmake libtool pathfix pkgconfig
 USE_LDCONFIG=	yes
 USE_GITHUB=	yes
 
 GNU_CONFIGURE=	yes
 GH_ACCOUNT=	gmarcais
 
 INSTALL_TARGET=	install-strip
 PLIST_SUB=	VER=${PORTVERSION}
 
 OPTIONS_DEFINE=		NLS
 OPTIONS_SUB=		yes
 
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 
 .include <bsd.port.pre.mk>
 
 # SSE code assumes amd64 features
 .if ${ARCH} != "amd64"
 CONFIGURE_ARGS+=--without-sse
 .endif
 
 .if ${CHOSEN_COMPILER_TYPE} == gcc
 CXXFLAGS+=	-faligned-new
 .endif
 
 .include <bsd.port.post.mk>
Index: head/biology/jellyfish/files/patch-lib_jsoncpp.cpp
===================================================================
--- head/biology/jellyfish/files/patch-lib_jsoncpp.cpp	(nonexistent)
+++ head/biology/jellyfish/files/patch-lib_jsoncpp.cpp	(revision 527971)
@@ -0,0 +1,20 @@
+--- lib/jsoncpp.cpp.orig	2018-04-16 12:46:09 UTC
++++ lib/jsoncpp.cpp
+@@ -2300,7 +2300,7 @@ Value::asInt64() const
+       JSON_ASSERT_MESSAGE( value_.uint_ <= UInt64(maxInt64), "unsigned integer out of Int64 range" );
+       return value_.uint_;
+    case realValue:
+-      JSON_ASSERT_MESSAGE( value_.real_ >= minInt64  &&  value_.real_ <= maxInt64, "Real out of Int64 range" );
++      JSON_ASSERT_MESSAGE( value_.real_ >= minInt64  &&  value_.real_ < static_cast<double>(maxInt64), "Real out of Int64 range" );
+       return Int( value_.real_ );
+    case booleanValue:
+       return value_.bool_ ? 1 : 0;
+@@ -2328,7 +2328,7 @@ Value::asUInt64() const
+    case uintValue:
+       return value_.uint_;
+    case realValue:
+-      JSON_ASSERT_MESSAGE( value_.real_ >= 0  &&  value_.real_ <= maxUInt64,  "Real out of UInt64 range" );
++      JSON_ASSERT_MESSAGE( value_.real_ >= 0  &&  value_.real_ < static_cast<double>(maxUInt64),  "Real out of UInt64 range" );
+       return UInt( value_.real_ );
+    case booleanValue:
+       return value_.bool_ ? 1 : 0;

Property changes on: head/biology/jellyfish/files/patch-lib_jsoncpp.cpp
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/biology/jellyfish/files/patch-sub__commands_count__main.cc
===================================================================
--- head/biology/jellyfish/files/patch-sub__commands_count__main.cc	(revision 527970)
+++ head/biology/jellyfish/files/patch-sub__commands_count__main.cc	(revision 527971)
@@ -1,11 +1,11 @@
---- sub_commands/count_main.cc.orig	2019-05-13 07:42:50 UTC
+--- sub_commands/count_main.cc.orig	2018-04-16 12:46:09 UTC
 +++ sub_commands/count_main.cc
-@@ -330,7 +330,7 @@ int count_main(int argc, char *argv[])
+@@ -360,7 +360,7 @@ int count_main(int argc, char *argv[])
          uint64_t max = args.upper_count_given ? args.upper_count_arg : std::numeric_limits<uint64_t>::max();
          try {
            merge_files(files, args.output_arg, header, min, max);
 -        } catch(MergeError e) {
 +        } catch(MergeError &e) {
            err::die(err::msg() << e.what());
          }
          if(!args.no_unlink_flag) {