9 files changed, 52 insertions, 113 deletions

diff --git a/comms/wsjtx/Makefile b/comms/wsjtx/Makefile
index 582b14d26584..853d560a1ea2 100644
--- a/comms/wsjtx/Makefile
+++ b/comms/wsjtx/Makefile
@@ -1,12 +1,11 @@
 # $FreeBSD$
 
 PORTNAME=	wsjtx
-PORTVERSION=	1.7.0
-PORTREVISION=	4
+PORTVERSION=	1.8.0
 CATEGORIES=	comms hamradio
-MASTER_SITES=	SF/wsjt/${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
-DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
-
+MASTER_SITES=	SF/wsjt/${PORTNAME}-${PORTVERSION}${DISTVERSIONSUFFIX}
+DISTNAME=	${PORTNAME}-${PORTVERSION}
+EXTRACT_SUFX=	.tgz
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Weak signal ham radio communication package
 
@@ -23,7 +22,7 @@ LIB_DEPENDS=	libfftw3.so:math/fftw3 \
 
 MAKE_JOBS_UNSAFE=	yes
 USE_GL=		yes
-USE_QT5=	gui buildtools qmake_build widgets multimedia concurrent serialport
+USE_QT5=	gui buildtools qmake_build widgets multimedia concurrent printsupport serialport
 USES=		cmake compiler:c++11-lib dos2unix fortran pkgconfig tar:tgz
 CMAKE_ARGS+=	-DPORT_BUILDING::STRING="ON" \
 		-DCMAKE_PREFIX_PATH+=${LOCALBASE}/wsjtx/lib \
diff --git a/comms/wsjtx/distinfo b/comms/wsjtx/distinfo
index 14da98dacc83..aa0138db4a41 100644
--- a/comms/wsjtx/distinfo
+++ b/comms/wsjtx/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1482183615
-SHA256 (wsjtx-1.7.0.tgz) = e7b3f31dad87b2b9cfb0a39bbba466f7039200541d37bfd181974fd11956a358
-SIZE (wsjtx-1.7.0.tgz) = 21293155
+TIMESTAMP = 1509288321
+SHA256 (wsjtx-1.8.0.tgz) = 21603ad4d5f43cd9c79a6e8cf468bde88c554654012b2c6c1ef9144cfbf668ce
+SIZE (wsjtx-1.8.0.tgz) = 29041865
diff --git a/comms/wsjtx/files/patch-CMakeLists.txt b/comms/wsjtx/files/patch-CMakeLists.txt
index 34cd2329dd9a..520b8d603c29 100644
--- a/comms/wsjtx/files/patch-CMakeLists.txt
+++ b/comms/wsjtx/files/patch-CMakeLists.txt
@@ -1,4 +1,4 @@
---- CMakeLists.txt.orig	2017-01-05 15:57:44 UTC
+--- CMakeLists.txt.orig	2017-10-19 22:13:49 UTC
 +++ CMakeLists.txt
 @@ -1,5 +1,4 @@
  cmake_minimum_required (VERSION 2.8.10 FATAL_ERROR)
@@ -6,7 +6,7 @@
  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
+@@ -132,6 +131,12 @@ if (CMAKE_BUILD_TYPE MATCHES "[Dd][Ee][B
    set (is_debug_build 1)
  endif ()
  
@@ -19,23 +19,7 @@
  
  #
  # Options & features
-@@ -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})
--set (MANPAGE_DESTINATION ${SHARE_DESTINATION})
-+if (NOT FREEBSD)
-+  message (STATUS "NOT FREEBSD")
-+  set (MANPAGE_DESTINATION share)
-+else()
-+  message (STATUS "FREEBSD")
-+  set (MANPAGE_DESTINATION "${CMAKE_INSTALL_PREFIX}" )
-+endif()
-+message (STATUS MANPAGE_DESTINATION ${MANPAGE_DESTINATION})
- set (PLUGIN_DESTINATION lib/plugins)
- set (QT_CONF_DESTINATION bin)
- 
-@@ -721,7 +733,20 @@ find_program(ETAGS etags)
+@@ -838,7 +843,20 @@ endif ()
  #
  # OpenMP
  #
@@ -57,38 +41,17 @@
  
  #
  # 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
-   )
+@@ -1282,6 +1300,13 @@ else (${OPENMP_FOUND} OR APPLE)
+   target_link_libraries (jt9 wsjt_fort wsjt_cxx Qt5::Core)
+ endif (${OPENMP_FOUND} OR APPLE)
  
--install (PROGRAMS
--  ${RIGCTL_EXE}
--  DESTINATION ${WSJT_BIN_DESTINATION}
--  #COMPONENT runtime
--  RENAME rigctl-wsjtx${CMAKE_EXECUTABLE_SUFFIX}
--  )
--
--install (PROGRAMS
--  ${RIGCTLD_EXE}
--  DESTINATION ${WSJT_BIN_DESTINATION}
--  #COMPONENT runtime
--  RENAME rigctld-wsjtx${CMAKE_EXECUTABLE_SUFFIX}
--  )
--
- install (FILES
-   README
-   COPYING
++if(FREEBSD)
++   set (extraLIBS "ltdl" "usb")
++ else()
++   set (extraLIBS "")
++endif()
++  
++
+ # build the main application
+ add_executable (wsjtx MACOSX_BUNDLE
+   ${wsjtx_CXXSRCS}
diff --git a/comms/wsjtx/files/patch-Configuration.cpp b/comms/wsjtx/files/patch-Configuration.cpp
index 7d93397cebc1..a00cad4ecec5 100644
--- a/comms/wsjtx/files/patch-Configuration.cpp
+++ b/comms/wsjtx/files/patch-Configuration.cpp
@@ -1,18 +1,19 @@
---- Configuration.cpp.orig	2017-01-05 15:57:44 UTC
+--- Configuration.cpp.orig	2017-10-19 22:13:43 UTC
 +++ Configuration.cpp
-@@ -2548,13 +2548,13 @@ void Configuration::impl::fill_port_comb
- 
+@@ -2681,14 +2681,14 @@ 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);
+   if (frequency_calibration_disabled_) return f;
+-  return std::llround (calibration_.intercept
++  return llround (calibration_.intercept
+                        + (1. + 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));
+   if (frequency_calibration_disabled_) return f;
+-  return std::llround ((f - calibration_.intercept)
++  return llround ((f - calibration_.intercept)
+                        / (1. + calibration_.slope_ppm / 1.e6));
  }
  
diff --git a/comms/wsjtx/files/patch-Radio.cpp b/comms/wsjtx/files/patch-Radio.cpp
deleted file mode 100644
index 00ae551e78c0..000000000000
--- a/comms/wsjtx/files/patch-Radio.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- Radio.cpp.orig	2017-01-05 15:57:45 UTC
-+++ Radio.cpp
-@@ -30,7 +30,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, QLocale const& locale)
-@@ -44,7 +44,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
deleted file mode 100644
index 802b3d983ac0..000000000000
--- a/comms/wsjtx/files/patch-WFPalette.hpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- WFPalette.hpp.orig	2017-01-05 15:57:44 UTC
-+++ WFPalette.hpp
-@@ -5,6 +5,7 @@
- #include <QList>
- #include <QVector>
- #include <QColor>
-+#include <QMetaType>
- 
- class QString;
- 
diff --git a/comms/wsjtx/files/patch-lib_wsprd_Makefile b/comms/wsjtx/files/patch-lib_wsprd_Makefile
index 0192bea73e7e..7b345c5a4d81 100644
--- a/comms/wsjtx/files/patch-lib_wsprd_Makefile
+++ b/comms/wsjtx/files/patch-lib_wsprd_Makefile
@@ -1,4 +1,4 @@
---- lib/wsprd/Makefile.orig	2017-01-05 15:57:44 UTC
+--- lib/wsprd/Makefile.orig	2017-10-19 22:13:43 UTC
 +++ lib/wsprd/Makefile
 @@ -1,10 +1,10 @@
 -CC = gcc
diff --git a/comms/wsjtx/files/patch-manpages_CMakeLists.txt b/comms/wsjtx/files/patch-manpages_CMakeLists.txt
index 9dff2c37367e..5d24a3f7a6bc 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	2017-01-05 15:57:47 UTC
+--- manpages/CMakeLists.txt.orig	2017-10-19 22:13:51 UTC
 +++ manpages/CMakeLists.txt
 @@ -2,8 +2,6 @@ set (ASCIIDOC_MANS
    man1/wsjtx.1.txt
diff --git a/comms/wsjtx/pkg-plist b/comms/wsjtx/pkg-plist
index 05205b745a4c..67a0759aaa6f 100644
--- a/comms/wsjtx/pkg-plist
+++ b/comms/wsjtx/pkg-plist
@@ -1,3 +1,6 @@
+bin/fcal
+bin/fmeasure
+bin/fmtave
 bin/jt4code
 bin/jt65code
 bin/jt9
@@ -6,8 +9,11 @@ bin/message_aggregator
 bin/msk144code
 bin/qra64code
 bin/qra64sim
+bin/rigctl-wsjtx
+bin/rigctld-wsjtx
 bin/udp_daemon
 bin/wsjtx
+bin/wspr_fsk8d
 bin/wsprd
 man/man1/jt4code.1.gz
 man/man1/jt65code.1.gz
@@ -19,15 +25,15 @@ man/man1/wsjtx.1.gz
 man/man1/wsprd.1.gz
 share/applications/message_aggregator.desktop
 share/applications/wsjtx.desktop
-%%DOCSDIR%%/AUTHORS
-%%DOCSDIR%%/BUGS
-%%DOCSDIR%%/COPYING
-%%DOCSDIR%%/INSTALL
-%%DOCSDIR%%/NEWS
-%%DOCSDIR%%/README
-%%DOCSDIR%%/THANKS
-%%DOCSDIR%%/changelog.Debian.gz
-%%DOCSDIR%%/copyright
-%%DOCSDIR%%/wsjtx-main-1.7.0.html
+share/doc/WSJT-X/AUTHORS
+share/doc/WSJT-X/BUGS
+share/doc/WSJT-X/COPYING
+share/doc/WSJT-X/INSTALL
+share/doc/WSJT-X/NEWS
+share/doc/WSJT-X/README
+share/doc/WSJT-X/THANKS
+share/doc/WSJT-X/changelog.Debian.gz
+share/doc/WSJT-X/copyright
+share/doc/WSJT-X/wsjtx-main-1.8.0.html
 share/pixmaps/wsjtx_icon.png
 %%DATADIR%%/JPLEPH