Index: head/comms/wsjtx/Makefile
===================================================================
--- head/comms/wsjtx/Makefile	(revision 430640)
+++ head/comms/wsjtx/Makefile	(revision 430641)
@@ -1,35 +1,40 @@
 # $FreeBSD$
 
 PORTNAME=	wsjtx
-PORTVERSION=	1.6.0
-PORTREVISION=	1
+PORTVERSION=	1.7.0
 CATEGORIES=	comms hamradio
 MASTER_SITES=	SF/wsjt/${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Weak signal ham radio communication package
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	a2x:textproc/asciidoc \
-	 	${LOCALBASE}/share/xsl/docbook:textproc/docbook-xsl
+BUILD_DEPENDS=	asciidoctor:textproc/rubygem-asciidoctor \
+		a2x:textproc/asciidoc \
+		${LOCALBASE}/share/xsl/docbook:textproc/docbook-xsl
 LIB_DEPENDS=	libfftw3.so:math/fftw3 \
 		libfftw3f.so:math/fftw3-float \
 		libhamlib.so:comms/hamlib \
-		libxslt.so:textproc/libxslt
-RUN_DEPENDS=	${LOCALBASE}/bin/kvasd:comms/kvasd
+		libxslt.so:textproc/libxslt \
+		libomp.so:devel/openmp
 
 MAKE_JOBS_UNSAFE=	yes
 USE_GL=		yes
 USE_QT5=	gui buildtools qmake_build widgets multimedia concurrent serialport
 USES=		cmake compiler:c++11-lib dos2unix fortran pkgconfig tar:tgz
 CMAKE_ARGS+=	-DPORT_BUILDING::STRING="ON" \
-		-DCMAKE_PREFIX_PATH+=${LOCALBASE}/wsjtx/lib
+		-DCMAKE_PREFIX_PATH+=${LOCALBASE}/wsjtx/lib \
+		-DLOCALBASE::STRING="${LOCALBASE}"
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
+#
+# This nonsense is because wsjtx is shipped with a copy of hamlib
+# as well as wsjtx
+#
 do-extract:
 	${TAR} xf ${DISTDIR}/${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} -C${WRKDIR}
 	${TAR} xf ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src/wsjtx.tgz -C${WRKDIR}
 
 .include <bsd.port.mk>
Index: head/comms/wsjtx/distinfo
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: head/comms/wsjtx/files/patch-CMakeLists.txt
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: head/comms/wsjtx/files/patch-Configuration.cpp
===================================================================
--- head/comms/wsjtx/files/patch-Configuration.cpp	(revision 430640)
+++ head/comms/wsjtx/files/patch-Configuration.cpp	(revision 430641)
@@ -1,18 +1,18 @@
---- Configuration.cpp.orig	2015-12-11 00:00:14 UTC
+--- Configuration.cpp.orig	2017-01-05 12:39:49 UTC
 +++ Configuration.cpp
-@@ -2507,13 +2507,13 @@ void Configuration::impl::fill_port_comb
+@@ -2548,13 +2548,13 @@ void Configuration::impl::fill_port_comb
  
  auto Configuration::impl::apply_calibration (Frequency f) const -> Frequency
  {
 -  return std::llround (frequency_calibration_intercept_
 +  return llround (frequency_calibration_intercept_
                         + (1. + frequency_calibration_slope_ppm_ / 1.e6) * f);
  }
  
  auto Configuration::impl::remove_calibration (Frequency f) const -> Frequency
  {
 -  return std::llround ((f - frequency_calibration_intercept_)
 +  return llround ((f - frequency_calibration_intercept_)
                         / (1. + frequency_calibration_slope_ppm_ / 1.e6));
  }
  
Index: head/comms/wsjtx/files/patch-Radio.cpp
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: head/comms/wsjtx/files/patch-WFPalette.hpp
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: head/comms/wsjtx/files/patch-lib_wsprd_Makefile
===================================================================
--- head/comms/wsjtx/files/patch-lib_wsprd_Makefile	(revision 430640)
+++ head/comms/wsjtx/files/patch-lib_wsprd_Makefile	(revision 430641)
@@ -1,16 +1,18 @@
---- lib/wsprd/Makefile.orig	2015-12-11 00:00:13 UTC
+--- lib/wsprd/Makefile.orig	2017-01-05 14:17:58 UTC
 +++ lib/wsprd/Makefile
-@@ -1,9 +1,9 @@
+@@ -1,10 +1,10 @@
 -CC = gcc
 +#CC = gcc
- #CC = clang
+ #CC = clang-3.5
 -FC = gfortran
 +#FC = gfortran
  
 -CFLAGS= -I/usr/include -Wall -Wno-missing-braces -O3 -ffast-math
 -LDFLAGS = -L/usr/lib
-+CFLAGS= -Wno-missing-braces -O3 -ffast-math
+-FFLAGS =  -O2 -Wall -Wno-conversion
++#CFLAGS= -I/usr/include -Wall -Wno-missing-braces -O3 -ffast-math
 +#LDFLAGS = -L/usr/lib
- LIBS = -lfftw3 -lm
++#FFLAGS =  -O2 -Wall -Wno-conversion
+ LIBS = -lfftw3f -lm
  
  # Default rules
Index: head/comms/wsjtx/files/patch-manpages_CMakeLists.txt
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: head/comms/wsjtx/pkg-plist
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream