Release: WSJT-X Version 1.7.0

		-----------------------------

Short list of new features
--------------------------
1.  New modes: ISCAT, MSK144, QRA64.
2.  Newly implemented submodes: JT65B-C, JT9B-H (wide and fast).
3.  FT decoder replaces KV decoder for JT65; KVASD is no longer used.
4.  Improvements to JT4, JT9, and JT65 decoders.
5.  Multi-pass decoding now implemented for JT65 as well as WSPR.
6.  Many improvements to Rig Control.
7.  Improved convenience features for EME Doppler tracking.
8.  Multiple configurations can be saved and restored.
9.  Sample-file download facility.
10. Optional auto-sequencing for Fast modes.
11. Power settings optionally remembered for Transmit and Tune on a
    band-by-band basis.

New Modes
---------

1. MSK144 is intended for meteor scatter at 50 MHz and higher.  It
uses a low-density parity check code (LDPC) designed by Steve Franke,
K9AN.  The mode is a direct descendant of the now-defunct mode JTMSK,
with a number of improvements for better performance on weak and short
meteor pings.  The effective character transmission rate is about 250
cps, compared with 147 cps for FSK441.  Like JT4, JT9, JT65, and
QRA64, MSK144 uses strong forward error correction.  Message decoding
is all or nothing: partial decodes do not occur, and you will see
little or no garbage on your screen.

Standard MSK144 message frames are 72 ms long, compared with about 120
ms for an equivalent FSK441 message.  The MSK144 waveform allows
coherent demodulation, allowing up to 3 dB better sensitivity.  After
QSO partners have exchanged callsigns, MSK144 can use even shorter
messages, only 20 ms long.  As in all the fast modes in WSJT-X, the 72
ms (or 20 ms) messages are repeated without gaps for the duration of a
transmission cycle.  For most purposes we recommend a T/R cycle
duration of 15 s, but 5 s and 10 s sequences are also supported.

Short ("Sh") messages in MSK144 are intended primarily for 144 MHz and
higher frequencies, where most pings are very short.  These messages
do not contain full callsigns; instead, they contain a hash of the two
callsigns along with a report, acknowledgement, or 73.  Short messages
are fully decodable only by the station to whom they are addressed, as
part of an ongoing QSO, because only then will the received hash match
that calculated using the known strings for "My Call" and "DX Call".
If you are monitoring someone else's QSO, you will not be able to
decode its Sh messages.

An MSK144 signal occupies the full bandwidth of a typical SSB
transmitter, so transmissions are always centered at an offset of
1500Hz.  For best results, selectable or adjustable Rx and Tx filters
should be set to provide the flattest possible response over at least
300 - 2700 Hz.  The maximum permissible frequency offset between you
and your QSO partner is 200 Hz, and less is better.

2. QRA64 is a intended for EME and other weak-signal use.  Its
internal code was designed by Nico Palermo, IV3NWV, and implemented in
WSJT-X by K1JT.  The protocol uses a "Q-ary Repeat Accumulate" code --
along with LDPC, another one of the latest research areas in
communication theory.  The QRA64 code is inherently better than the
Reed Solomon (63,12) code used in JT65, yielding already a 1.3 dB
advantage.  QRA64 uses a new synchronizing scheme based on a 7 x 7
Costas array, so you will not see a bright sync tone at the lowest
tone frequency.  This change yields another 1.9 dB advantage.

In most respects our implementation of QRA64 is operationally similar
to JT65.  QRA64 does not use two-tone shorthand messages, and it makes
no use of a callsign database.  Rather, additional sensitivity is
gained by making use of "already known" information as a QSO
progresses -- for example, when reports are being exchanged and you
have already decoded both callsigns in a previous transmission.  QRA64
presently offers no message averaging capability, though that may be
added.  In our early tests, many EME QSOs have already been made using
submodes QRA64A-E on bands from 144 MHz to 10 GHz.

3. ISCAT is essentially the same as in recent versions of program WSJT.
For details consult the WSJT User Guide:
http://physics.princeton.edu/pulsar/K1JT/doc/wsjt/

Program Setup
-------------

Many of the new program capabilities are enabled when you check
"Enable VHF/UHF/Microwave features" on the Settings | General tab.
For MSK144 mode, we suggest setting "T/R 15 s" and "F Tol 100 Hz".
Check "Sh" to enable the use of short messages and "Auto Seq" for
auto-sequencing.  For QRA64 mode, set Tx and Rx frequencies to 1000
Hz.  We encourage you to check "Save all" when making tests, and to
save any of the resulting .wav files that might help us to improve
program performance or behavior, or to illustrate a problem that you
identify.

Final Comments
--------------

We will be grateful for any and all reports from users; these will
surely help us to make further improvements to WSJT-X.  The most
helpful bug reports describe the problem clearly and include a
complete recipe to reproduce it.  Feature requests are also welcome.
Send your reports to wsjtgroup@yahoogroups.com, or to the developers
list wsjt-devel@lists.sourceforge.net.

9 files changed, 87 insertions, 49 deletions

diff --git a/comms/wsjtx/Makefile b/comms/wsjtx/Makefile
index 27fa7b5551cb..58b7d7e49a5c 100644
--- a/comms/wsjtx/Makefile
+++ b/comms/wsjtx/Makefile
@@ -1,8 +1,7 @@
 # $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}
@@ -12,22 +11,28 @@ 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}
diff --git a/comms/wsjtx/distinfo b/comms/wsjtx/distinfo
index e2e24c442fb7..14da98dacc83 100644
--- a/comms/wsjtx/distinfo
+++ b/comms/wsjtx/distinfo
@@ -1,4 +1,3 @@
-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
+TIMESTAMP = 1482183615
+SHA256 (wsjtx-1.7.0.tgz) = e7b3f31dad87b2b9cfb0a39bbba466f7039200541d37bfd181974fd11956a358
+SIZE (wsjtx-1.7.0.tgz) = 21293155
diff --git a/comms/wsjtx/files/patch-CMakeLists.txt b/comms/wsjtx/files/patch-CMakeLists.txt
index 3528f1fe7fa0..28c575020ed7 100644
--- a/comms/wsjtx/files/patch-CMakeLists.txt
+++ b/comms/wsjtx/files/patch-CMakeLists.txt
@@ -1,20 +1,25 @@
---- CMakeLists.txt.orig	2015-12-11 00:00:13 UTC
+--- CMakeLists.txt.orig	2017-01-05 12:39:50 UTC
 +++ CMakeLists.txt
-@@ -93,6 +93,13 @@ if (CMAKE_BUILD_TYPE MATCHES "[Dd][Ee][B
+@@ -1,5 +1,4 @@
+ cmake_minimum_required (VERSION 2.8.10 FATAL_ERROR)
+-
+ if (APPLE)
+   #
+   # The following variables define the portability and compatability attributes of the Mac OS X build
+@@ -97,6 +96,12 @@ if (CMAKE_BUILD_TYPE MATCHES "[Dd][Ee][B
    set (is_debug_build 1)
  endif ()
  
 +if (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
-+ set (FREEBSD 1)
++  set (FREEBSD TRUE)
++  link_directories("/usr/lib" "${LOCALBASE}/lib")
++  include_directories("/usr/lib" "${LOCALBASE}/include")
 +endif()
 +
-+if (FREEBSD)
-+       set (WSJT_INCLUDE_KVASD Off)
-+endif ()
  
  #
  # Options & features
-@@ -153,7 +160,14 @@ set (LIB_DESTINATION lib)
+@@ -161,7 +166,14 @@ set (INCLUDE_DESTINATION include)
  set (SHARE_DESTINATION share)
  set (DOC_DESTINATION doc/${CMAKE_PROJECT_NAME})
  set (DATA_DESTINATION ${CMAKE_PROJECT_NAME})
@@ -30,24 +35,45 @@
  set (PLUGIN_DESTINATION lib/plugins)
  set (QT_CONF_DESTINATION bin)
  
-@@ -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} Qt5::Multimedia)
-+if(FREEBSD)
-+  set (extraLIBS "ltdl" "usb")
+@@ -721,7 +733,20 @@ find_program(ETAGS etags)
+ #
+ # OpenMP
+ #
+-find_package (OpenMP)
++message (status "ZZZ About to find_package (OpenMP)")
++#    OpenMP_C_FLAGS - flags to add to the C compiler for OpenMP support
++#    OpenMP_CXX_FLAGS - flags to add to the CXX compiler for OpenMP support
++#    OpenMP_Fortran_FLAGS - flags to add to the Fortran compiler for OpenMP support
++#    OPENMP_FOUND - true if openmp is detected
++
++if (FREEBSD)
++  set (OpenMP_C_FLAGS "-openmp")
++  set (OpenMP_CXX_FLAGS "-openmp")
++  set (OpenMP_Fortran_FLAGS "-openmp")
++  set (OPENMP_FOUND TRUE)
 +else()
-+  set (extraLIBS "")
++  find_package (OpenMP)
 +endif()
-+
-+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})
-@@ -1011,20 +1031,6 @@ else (WSJT_INCLUDE_KVASD)
-   endif (APPLE)
- endif (WSJT_INCLUDE_KVASD)
+ #
+ # fftw3 single precision library
+@@ -1132,6 +1157,13 @@ if (APPLE)
+   target_link_libraries (wsjtx wsjt_fort wsjt_cxx wsjt_qt wsjt_qtmm ${hamlib_LIBRARIES} ${FFTW3_LIBRARIES})
+ else ()
+   target_link_libraries (wsjtx wsjt_fort_omp wsjt_cxx wsjt_qt wsjt_qtmm ${hamlib_LIBRARIES} ${FFTW3_LIBRARIES})
++
++  if(FREEBSD)
++    set (extraLIBS "ltdl" "usb")
++  else()
++    set (extraLIBS "")
++  endif()
++  
+   set_target_properties (wsjtx PROPERTIES
+     COMPILE_FLAGS "${OpenMP_C_FLAGS}"
+     LINK_FLAGS "${OpenMP_C_FLAGS}"
+@@ -1232,20 +1264,6 @@ install (TARGETS jt9 jt65code qra64code 
+   BUNDLE DESTINATION ${WSJT_BIN_DESTINATION} COMPONENT runtime
+   )
  
 -install (PROGRAMS
 -  ${RIGCTL_EXE}
diff --git a/comms/wsjtx/files/patch-Configuration.cpp b/comms/wsjtx/files/patch-Configuration.cpp
index 11c5a96b285f..9d66d578b48d 100644
--- a/comms/wsjtx/files/patch-Configuration.cpp
+++ b/comms/wsjtx/files/patch-Configuration.cpp
@@ -1,6 +1,6 @@
---- 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
  {
diff --git a/comms/wsjtx/files/patch-Radio.cpp b/comms/wsjtx/files/patch-Radio.cpp
index dce8d69c8f46..7ce1b1d8546c 100644
--- a/comms/wsjtx/files/patch-Radio.cpp
+++ b/comms/wsjtx/files/patch-Radio.cpp
@@ -1,6 +1,6 @@
---- Radio.cpp.orig	2015-12-11 00:00:13 UTC
+--- Radio.cpp.orig	2017-01-05 12:39:50 UTC
 +++ Radio.cpp
-@@ -33,7 +33,7 @@ namespace Radio
+@@ -30,7 +30,7 @@ namespace Radio
        {
          value = v.toDouble ();
        }
@@ -9,7 +9,7 @@
    }
  
    FrequencyDelta frequency_delta (QVariant const& v, int scale, QLocale const& locale)
-@@ -47,7 +47,7 @@ namespace Radio
+@@ -44,7 +44,7 @@ namespace Radio
        {
          value = v.toDouble ();
        }
diff --git a/comms/wsjtx/files/patch-WFPalette.hpp b/comms/wsjtx/files/patch-WFPalette.hpp
index 44e179bd833f..f75a3b7e3ca2 100644
--- a/comms/wsjtx/files/patch-WFPalette.hpp
+++ b/comms/wsjtx/files/patch-WFPalette.hpp
@@ -1,4 +1,4 @@
---- WFPalette.hpp.orig	2015-12-11 00:00:14 UTC
+--- WFPalette.hpp.orig	2017-01-05 12:39:50 UTC
 +++ WFPalette.hpp
 @@ -5,6 +5,7 @@
  #include <QList>
diff --git a/comms/wsjtx/files/patch-lib_wsprd_Makefile b/comms/wsjtx/files/patch-lib_wsprd_Makefile
index 7a92ce29727d..c6d9580d8ffb 100644
--- a/comms/wsjtx/files/patch-lib_wsprd_Makefile
+++ b/comms/wsjtx/files/patch-lib_wsprd_Makefile
@@ -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
diff --git a/comms/wsjtx/files/patch-manpages_CMakeLists.txt b/comms/wsjtx/files/patch-manpages_CMakeLists.txt
index 5df0b01e3b12..15aa8662cdb4 100644
--- a/comms/wsjtx/files/patch-manpages_CMakeLists.txt
+++ b/comms/wsjtx/files/patch-manpages_CMakeLists.txt
@@ -1,11 +1,11 @@
---- manpages/CMakeLists.txt.orig	2015-12-11 00:00:14 UTC
+--- manpages/CMakeLists.txt.orig	2017-01-05 12:39:52 UTC
 +++ manpages/CMakeLists.txt
-@@ -1,8 +1,6 @@
- set (ASCIIDOC_MANS
+@@ -2,8 +2,6 @@ set (ASCIIDOC_MANS
    man1/wsjtx.1.txt
+   man1/wsprd.1.txt
    man1/jt65code.1.txt
 -  man1/rigctl-wsjtx.1.txt
 -  man1/rigctld-wsjtx.1.txt
    man1/message_aggregator.1.txt
+   man1/udp_daemon.1.txt
    )
- 
diff --git a/comms/wsjtx/pkg-plist b/comms/wsjtx/pkg-plist
index c86d98bd5cc6..05205b745a4c 100644
--- a/comms/wsjtx/pkg-plist
+++ b/comms/wsjtx/pkg-plist
@@ -3,6 +3,10 @@ bin/jt65code
 bin/jt9
 bin/jt9code
 bin/message_aggregator
+bin/msk144code
+bin/qra64code
+bin/qra64sim
+bin/udp_daemon
 bin/wsjtx
 bin/wsprd
 man/man1/jt4code.1.gz
@@ -10,8 +14,10 @@ man/man1/jt65code.1.gz
 man/man1/jt9.1.gz
 man/man1/jt9code.1.gz
 man/man1/message_aggregator.1.gz
+man/man1/udp_daemon.1.gz
 man/man1/wsjtx.1.gz
 man/man1/wsprd.1.gz
+share/applications/message_aggregator.desktop
 share/applications/wsjtx.desktop
 %%DOCSDIR%%/AUTHORS
 %%DOCSDIR%%/BUGS
@@ -22,6 +28,6 @@ share/applications/wsjtx.desktop
 %%DOCSDIR%%/THANKS
 %%DOCSDIR%%/changelog.Debian.gz
 %%DOCSDIR%%/copyright
-%%DOCSDIR%%/wsjtx-main-1.6.0.html
+%%DOCSDIR%%/wsjtx-main-1.7.0.html
 share/pixmaps/wsjtx_icon.png
 %%DATADIR%%/JPLEPH