Upgrade to wsjtx 1.6.0

For quick reference, here's a short list of features and capabilities added
to WSJT-X since Version 1.5.0:

WSPR mode, including coordinated automatic band-hopping and a new
two-pass decoder that can decode overlapping signals.

EME-motivated features including JT4 (submodes A-G), Echo mode, and
automatic Doppler tracking. The JT4 decoder is more sensitive than
that in the latest WSJT, and message averaging is fully automated.
(Note that submodes JT65B and JT65C are also present in Version 1.6,
but the high-sensitivity decoder required for EME with JT65
is not yet included.)

Tools for accurate frequency calibration of your radio, so you can
be always on-frequency to within about 1 Hz.

Mode-specific standard working frequencies accessible from the
drop-down band selector.

A number of corrections to the Hamlib library, fixing balky rig-control
features. A few unreliable features peculiar to particular radios
have been removed.

Working around bugs with a2x for now

PR:			ports/208350
Submitted by:		takefu@airport.fm

17 files changed, 107 insertions, 72 deletions

diff --git a/comms/wsjtx/Makefile b/comms/wsjtx/Makefile
index 9f570e77a8b0..47b561a6495e 100644
--- a/comms/wsjtx/Makefile
+++ b/comms/wsjtx/Makefile
@@ -1,42 +1,48 @@
 # $FreeBSD$
 
 PORTNAME=	wsjtx
-PORTVERSION=	1.5
-PORTREVISION=	1
+PORTVERSION=	1.6.0
 CATEGORIES=	comms hamradio
-MASTER_SITES=	http://physics.princeton.edu/pulsar/K1JT/:src \
+MASTER_SITES=	SF/wsjt/${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}:src \
 		http://www.physics.princeton.edu/pulsar/K1JT/wsjtx-doc/:docs \
-		LOCAL/db
-DISTFILES=	wsjtx-1.5.0.tgz:src \
-		wsjtx-main.html:docs
+		LOCAL/db:docs
+DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:src \
+		wsjtx-main-${PORTVERSION}.html:docs
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Weak signal ham radio communication package
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	asciidoc:textproc/asciidoc \
-		xsltproc:textproc/libxslt \
-		docbook-xsl>0:textproc/docbook-xsl
+BUILD_DEPENDS=	a2x:textproc/asciidoc
 LIB_DEPENDS=	libfftw3.so:math/fftw3 \
 		libfftw3f.so:math/fftw3-float \
-		libhamlib.so:comms/hamlib
+		libhamlib.so:comms/hamlib \
+		libxslt.so:textproc/libxslt
 RUN_DEPENDS=	${LOCALBASE}/bin/kvasd:comms/kvasd
 
 MAKE_JOBS_UNSAFE=	yes
-USE_QT5=	gui buildtools qmake_build widgets multimedia concurrent serialport
+USE_GCC=	yes
 USE_GL=		yes
-USES=		cmake compiler:c++11-lib dos2unix fortran pkgconfig
+USE_QT5=	gui buildtools qmake_build widgets multimedia concurrent serialport
+USES=		cmake compiler fortran pkgconfig tar:tgz
 CMAKE_ARGS+=	-DPORT_BUILDING::STRING="ON" \
+		-DWSJT_SKIP_MANPAGES::BOOL="YES" \
 		-DCMAKE_PREFIX_PATH+=${LOCALBASE}/wsjtx/lib
-
-WRKSRC=		${WRKDIR}/wsjtx
+WRKSRC=		${WRKDIR}/${PORTNAME}
 
 do-extract:
-		(cd ${WRKDIR};tar xvf ${DISTDIR}/wsjtx-1.5.0.tgz)
-		(cd ${WRKDIR};tar xvf ${WRKDIR}/wsjtx-1.5.0/src/wsjtx.tgz)
+	${TAR} xf ${DISTDIR}/${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} -C${WRKDIR}
+	${TAR} xf ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src/wsjtx.tgz -C${WRKDIR}
 
 post-install:
-		${CP} ${DISTDIR}/wsjtx-main.html ${STAGEDIR}${DOCSDIR}
+	${MKDIR} -v ${STAGEDIR}${MANPREFIX}/man/man1
+	${CP} ${FILESDIR}/*.gz ${STAGEDIR}${MANPREFIX}/man/man1
+	${CP} ${DISTDIR}/${PORTNAME}-main-${PORTVERSION}.html ${STAGEDIR}${DOCSDIR}
+.for f in AUTHORS BUGS COPYING INSTALL NEWS README THANKS
+	${INSTALL_DATA} ${WRKSRC}/$f ${STAGEDIR}${DOCSDIR}
+.endfor
+	${INSTALL_DATA} ${WRKSRC}/debian/changelog.Debian.gz ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/debian/copyright ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/comms/wsjtx/distinfo b/comms/wsjtx/distinfo
index 563fa27d937e..e2e24c442fb7 100644
--- a/comms/wsjtx/distinfo
+++ b/comms/wsjtx/distinfo
@@ -1,4 +1,4 @@
-SHA256 (wsjtx-1.5.0.tgz) = 9b9d58b034ab5caa9f174eef2bf378b726d9c08cfdbfec162969ad9b4c62d016
-SIZE (wsjtx-1.5.0.tgz) = 9477485
-SHA256 (wsjtx-main.html) = 404a97ff469da71710c05c00460e16926483f19fbc2641dbdbd8835a49c9f539
-SIZE (wsjtx-main.html) = 1204470
+SHA256 (wsjtx-1.6.0.tgz) = 2dc2563827146b0009ab75f0bf45771bf2530cfcd8a341a93bc6958d238f86f2
+SIZE (wsjtx-1.6.0.tgz) = 12537071
+SHA256 (wsjtx-main-1.6.0.html) = eea98304686db562f35c8aa98dc431d15c3ae4d8b2577c2cf402735ab02074dc
+SIZE (wsjtx-main-1.6.0.html) = 2606371
diff --git a/comms/wsjtx/files/jt4code.1.gz b/comms/wsjtx/files/jt4code.1.gz
new file mode 100644
index 000000000000..3f960471cd47
--- /dev/null
+++ b/comms/wsjtx/files/jt4code.1.gz
diff --git a/comms/wsjtx/files/jt65code.1.gz b/comms/wsjtx/files/jt65code.1.gz
new file mode 100644
index 000000000000..39e55ba5725a
--- /dev/null
+++ b/comms/wsjtx/files/jt65code.1.gz
diff --git a/comms/wsjtx/files/jt9.1.gz b/comms/wsjtx/files/jt9.1.gz
new file mode 100644
index 000000000000..a757f4d4c2d8
--- /dev/null
+++ b/comms/wsjtx/files/jt9.1.gz
diff --git a/comms/wsjtx/files/jt9code.1.gz b/comms/wsjtx/files/jt9code.1.gz
new file mode 100644
index 000000000000..234355ba4c96
--- /dev/null
+++ b/comms/wsjtx/files/jt9code.1.gz
diff --git a/comms/wsjtx/files/message_aggregator.1.gz b/comms/wsjtx/files/message_aggregator.1.gz
new file mode 100644
index 000000000000..4e00317271e1
--- /dev/null
+++ b/comms/wsjtx/files/message_aggregator.1.gz
diff --git a/comms/wsjtx/files/patch-CMakeLists.txt b/comms/wsjtx/files/patch-CMakeLists.txt
index cceb0d0281c3..3528f1fe7fa0 100644
--- a/comms/wsjtx/files/patch-CMakeLists.txt
+++ b/comms/wsjtx/files/patch-CMakeLists.txt
@@ -1,4 +1,4 @@
---- CMakeLists.txt.orig	2015-11-25 02:16:23 UTC
+--- CMakeLists.txt.orig	2015-12-11 00:00:13 UTC
 +++ CMakeLists.txt
 @@ -93,6 +93,13 @@ if (CMAKE_BUILD_TYPE MATCHES "[Dd][Ee][B
    set (is_debug_build 1)
@@ -9,52 +9,43 @@
 +endif()
 +
 +if (FREEBSD)
-+	set (WSJT_INCLUDE_KVASD Off)
++       set (WSJT_INCLUDE_KVASD Off)
 +endif ()
  
  #
  # Options & features
-@@ -152,7 +159,14 @@ set (WSJT_BIN_DESTINATION bin)
- set (WSJT_LIB_DESTINATION lib)
- set (WSJT_SHARE_DESTINATION share)
- set (WSJT_DOC_DESTINATION doc/${CMAKE_PROJECT_NAME})
--set (WSJT_MANPAGE_DESTINATION share)
+@@ -153,7 +160,14 @@ set (LIB_DESTINATION lib)
+ set (SHARE_DESTINATION share)
+ set (DOC_DESTINATION doc/${CMAKE_PROJECT_NAME})
+ set (DATA_DESTINATION ${CMAKE_PROJECT_NAME})
+-set (MANPAGE_DESTINATION ${SHARE_DESTINATION})
 +if (NOT FREEBSD)
 +  message (STATUS "NOT FREEBSD")
-+  set (WSJT_MANPAGE_DESTINATION share)
++  set (MANPAGE_DESTINATION share)
 +else()
 +  message (STATUS "FREEBSD")
-+  set (WSJT_MANPAGE_DESTINATION "${CMAKE_INSTALL_PREFIX}" )
++  set (MANPAGE_DESTINATION "${CMAKE_INSTALL_PREFIX}" )
 +endif()
-+message (STATUS WSJT_MANPAGE_DESTINATION ${WSJT_MANPAGE_DESTINATION})
- set (WSJT_PLUGIN_DESTINATION lib/plugins)
- set (WSJT_QT_CONF_DESTINATION bin)
++message (STATUS MANPAGE_DESTINATION ${MANPAGE_DESTINATION})
+ set (PLUGIN_DESTINATION lib/plugins)
+ set (QT_CONF_DESTINATION bin)
  
-@@ -881,7 +895,13 @@ set_target_properties (wsjtx PROPERTIES
+@@ -937,7 +951,13 @@ set_target_properties (wsjtx PROPERTIES
    MACOSX_BUNDLE_GUI_IDENTIFIER "org.k1jt.wsjtx"
    )
  
--target_link_libraries (wsjtx wsjt_fort wsjt_cxx wsjt_qt ${hamlib_LIBRARIES} ${FFTW3_LIBRARIES})
+-target_link_libraries (wsjtx wsjt_fort wsjt_cxx wsjt_qt ${hamlib_LIBRARIES} ${FFTW3_LIBRARIES} Qt5::Multimedia)
 +if(FREEBSD)
 +  set (extraLIBS "ltdl" "usb")
 +else()
 +  set (extraLIBS "")
 +endif()
 +
-+target_link_libraries (wsjtx wsjt_fort wsjt_cxx wsjt_qt ${hamlib_LIBRARIES} ${extraLIBS} ${FFTW3_LIBRARIES})
- qt5_use_modules (wsjtx Widgets OpenGL Network Multimedia SerialPort)
++target_link_libraries (wsjtx wsjt_fort wsjt_cxx wsjt_qt ${hamlib_LIBRARIES} ${extraLIBS} ${FFTW3_LIBRARIES} Qt5::Multimedia)
+ qt5_use_modules (wsjtx SerialPort) # not sure why the interface link library syntax above doesn't work
  
  add_resources (message_aggregator_RESOURCES /qss ${message_aggregator_STYLESHEETS})
-@@ -942,7 +962,7 @@ install (TARGETS jt9 jt65code jt9code me
-   )
- 
- if (WSJT_INCLUDE_KVASD)
--  install (PROGRAMS
-+    install (PROGRAMS
-     ${CMAKE_BINARY_DIR}/${KVASD_BINARY}
-     DESTINATION ${WSJT_BIN_DESTINATION} COMPONENT runtime
-   )
-@@ -956,20 +976,6 @@ else (WSJT_INCLUDE_KVASD)
+@@ -1011,20 +1031,6 @@ else (WSJT_INCLUDE_KVASD)
    endif (APPLE)
  endif (WSJT_INCLUDE_KVASD)
  
diff --git a/comms/wsjtx/files/patch-Configuration.cpp b/comms/wsjtx/files/patch-Configuration.cpp
new file mode 100644
index 000000000000..11c5a96b285f
--- /dev/null
+++ b/comms/wsjtx/files/patch-Configuration.cpp
@@ -0,0 +1,18 @@
+--- Configuration.cpp.orig	2015-12-11 00:00:14 UTC
++++ Configuration.cpp
+@@ -2507,13 +2507,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));
+ }
+ 
diff --git a/comms/wsjtx/files/patch-Radio.cpp b/comms/wsjtx/files/patch-Radio.cpp
index a9e3c59534c2..dce8d69c8f46 100644
--- a/comms/wsjtx/files/patch-Radio.cpp
+++ b/comms/wsjtx/files/patch-Radio.cpp
@@ -1,17 +1,20 @@
---- Radio.cpp.orig	2015-11-25 02:16:24 UTC
+--- Radio.cpp.orig	2015-12-11 00:00:13 UTC
 +++ Radio.cpp
-@@ -38,12 +38,12 @@ namespace Radio
- 
-   Frequency frequency (QVariant const& v, int scale)
-   {
--    return std::llround (v.toDouble () * std::pow (10., scale));
-+    return llround (v.toDouble () * std::pow (10., scale));
+@@ -33,7 +33,7 @@ namespace Radio
+       {
+         value = v.toDouble ();
+       }
+-    return std::llround (value * std::pow (10., scale));
++    return llround (value * std::pow (10., scale));
    }
  
-   FrequencyDelta frequency_delta (QVariant const& v, int scale)
-   {
--    return std::llround (v.toDouble () * std::pow (10., scale));
-+    return llround (v.toDouble () * std::pow (10., scale));
+   FrequencyDelta frequency_delta (QVariant const& v, int scale, QLocale const& locale)
+@@ -47,7 +47,7 @@ namespace Radio
+       {
+         value = v.toDouble ();
+       }
+-    return std::llround (value * std::pow (10., scale));
++    return llround (value * std::pow (10., scale));
    }
  
  
diff --git a/comms/wsjtx/files/patch-WFPalette.hpp b/comms/wsjtx/files/patch-WFPalette.hpp
index 31235ea3f1f7..44e179bd833f 100644
--- a/comms/wsjtx/files/patch-WFPalette.hpp
+++ b/comms/wsjtx/files/patch-WFPalette.hpp
@@ -1,10 +1,6 @@
-Fix build with Qt >= 5.5:
-
-./WFPalette.hpp:53:1: error: unknown type name 'Q_DECLARE_METATYPE'
-Q_DECLARE_METATYPE (WFPalette::Colours);
---- WFPalette.hpp.orig	2016-01-21 09:38:31 UTC
+--- WFPalette.hpp.orig	2015-12-11 00:00:14 UTC
 +++ WFPalette.hpp
-@@ -4,6 +4,7 @@
+@@ -5,6 +5,7 @@
  #include <QList>
  #include <QVector>
  #include <QColor>
diff --git a/comms/wsjtx/files/patch-lib_wsprd_Makefile b/comms/wsjtx/files/patch-lib_wsprd_Makefile
new file mode 100644
index 000000000000..7a92ce29727d
--- /dev/null
+++ b/comms/wsjtx/files/patch-lib_wsprd_Makefile
@@ -0,0 +1,16 @@
+--- lib/wsprd/Makefile.orig	2015-12-11 00:00:13 UTC
++++ lib/wsprd/Makefile
+@@ -1,9 +1,9 @@
+-CC = gcc
++#CC = gcc
+ #CC = clang
+-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
++#LDFLAGS = -L/usr/lib
+ LIBS = -lfftw3 -lm
+ 
+ # Default rules
diff --git a/comms/wsjtx/files/patch-manpages_CMakeLists.txt b/comms/wsjtx/files/patch-manpages_CMakeLists.txt
index 613e5b9be6f1..5df0b01e3b12 100644
--- a/comms/wsjtx/files/patch-manpages_CMakeLists.txt
+++ b/comms/wsjtx/files/patch-manpages_CMakeLists.txt
@@ -1,4 +1,4 @@
---- manpages/CMakeLists.txt.orig	2015-11-25 02:16:24 UTC
+--- manpages/CMakeLists.txt.orig	2015-12-11 00:00:14 UTC
 +++ manpages/CMakeLists.txt
 @@ -1,8 +1,6 @@
  set (ASCIIDOC_MANS
@@ -6,6 +6,6 @@
    man1/jt65code.1.txt
 -  man1/rigctl-wsjtx.1.txt
 -  man1/rigctld-wsjtx.1.txt
+   man1/message_aggregator.1.txt
    )
  
- find_program (A2X_EXECUTABLE NAMES a2x a2x.py)
diff --git a/comms/wsjtx/files/wsjtx.1.gz b/comms/wsjtx/files/wsjtx.1.gz
new file mode 100644
index 000000000000..4c419b89af03
--- /dev/null
+++ b/comms/wsjtx/files/wsjtx.1.gz
diff --git a/comms/wsjtx/files/wsprd.1.gz b/comms/wsjtx/files/wsprd.1.gz
new file mode 100644
index 000000000000..6bcb68266c79
--- /dev/null
+++ b/comms/wsjtx/files/wsprd.1.gz
diff --git a/comms/wsjtx/pkg-descr b/comms/wsjtx/pkg-descr
index 9ab059ba54dd..6d96b8c691b8 100644
--- a/comms/wsjtx/pkg-descr
+++ b/comms/wsjtx/pkg-descr
@@ -4,4 +4,4 @@ at VHF/UHF, as well as HF skywave propagation.  The program can decode
 fraction-of-a-second signals reflected from ionized meteor trails and
 steady signals 10 dB below the audible threshold.  
 
-WWW: http://physics.princeton.edu/pulsar/K1JT
+WWW: http://physics.princeton.edu/pulsar/k1jt/wsjtx.html
diff --git a/comms/wsjtx/pkg-plist b/comms/wsjtx/pkg-plist
index 541750fd403a..c86d98bd5cc6 100644
--- a/comms/wsjtx/pkg-plist
+++ b/comms/wsjtx/pkg-plist
@@ -1,14 +1,18 @@
+bin/jt4code
 bin/jt65code
-bin/jt9code
 bin/jt9
+bin/jt9code
 bin/message_aggregator
 bin/wsjtx
+bin/wsprd
+man/man1/jt4code.1.gz
 man/man1/jt65code.1.gz
+man/man1/jt9.1.gz
 man/man1/jt9code.1.gz
+man/man1/message_aggregator.1.gz
 man/man1/wsjtx.1.gz
-man/man1/jt9.1.gz
+man/man1/wsprd.1.gz
 share/applications/wsjtx.desktop
-share/pixmaps/wsjtx_icon.png
 %%DOCSDIR%%/AUTHORS
 %%DOCSDIR%%/BUGS
 %%DOCSDIR%%/COPYING
@@ -18,5 +22,6 @@ share/pixmaps/wsjtx_icon.png
 %%DOCSDIR%%/THANKS
 %%DOCSDIR%%/changelog.Debian.gz
 %%DOCSDIR%%/copyright
-%%DOCSDIR%%/wsjtx-main-1.5.0.html
-%%DOCSDIR%%/wsjtx-main.html
+%%DOCSDIR%%/wsjtx-main-1.6.0.html
+share/pixmaps/wsjtx_icon.png
+%%DATADIR%%/JPLEPH