svn commit: r453119 - in head/comms/wsjtx: . files
Diane Bruce
db at FreeBSD.org
Sun Oct 29 14:54:08 UTC 2017
Author: db
Date: Sun Oct 29 14:54:07 2017
New Revision: 453119
URL: https://svnweb.freebsd.org/changeset/ports/453119
Log:
The WSJT Development Group is pleased to announce the full General
Availability release of WSJT-X Version 1.8.0.
Changes since "Release Candidate 3" (wsjtx-1.8.0-rc3) are very minor; they are
described in the Release Notes posted here:
http://physics.princeton.edu/pulsar/k1jt/Release_Notes_1.8.0.txt
Installation packages for Windows, Linux, Macintosh, and Raspian Jessie
have been posted on the WSJT web site here:
http://physics.princeton.edu/pulsar/k1jt/wsjtx.html
You can also download the packages from our SourceForge site:
https://sourceforge.net/projects/wsjt/files/wsjtx-1.8.0-rc3/
(It may take a short time for the SourceForge site to be updated.)
If you are upgrading from -rc1, you will need to do a one-time reset of
the default list of suggested operating frequencies. Go to
*File->Settings->Frequencies*, right click on the table and select *Reset*.
We hope you will enjoy using WSJT-X Version 1.8.0.
-- 73, Joe, K1JT, for the WSJT Development Group
Deleted:
head/comms/wsjtx/files/patch-Radio.cpp
head/comms/wsjtx/files/patch-WFPalette.hpp
Modified:
head/comms/wsjtx/Makefile
head/comms/wsjtx/distinfo (contents, props changed)
head/comms/wsjtx/files/patch-CMakeLists.txt
head/comms/wsjtx/files/patch-Configuration.cpp
head/comms/wsjtx/files/patch-lib_wsprd_Makefile
head/comms/wsjtx/files/patch-manpages_CMakeLists.txt
head/comms/wsjtx/pkg-plist (contents, props changed)
Modified: head/comms/wsjtx/Makefile
==============================================================================
--- head/comms/wsjtx/Makefile Sun Oct 29 14:26:07 2017 (r453118)
+++ head/comms/wsjtx/Makefile Sun Oct 29 14:54:07 2017 (r453119)
@@ -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 at 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 \
Modified: head/comms/wsjtx/distinfo
==============================================================================
Binary file (source and/or target). No diff available.
Modified: head/comms/wsjtx/files/patch-CMakeLists.txt
==============================================================================
--- head/comms/wsjtx/files/patch-CMakeLists.txt Sun Oct 29 14:26:07 2017 (r453118)
+++ head/comms/wsjtx/files/patch-CMakeLists.txt Sun Oct 29 14:54:07 2017 (r453119)
@@ -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}
Modified: head/comms/wsjtx/files/patch-Configuration.cpp
==============================================================================
--- head/comms/wsjtx/files/patch-Configuration.cpp Sun Oct 29 14:26:07 2017 (r453118)
+++ head/comms/wsjtx/files/patch-Configuration.cpp Sun Oct 29 14:54:07 2017 (r453119)
@@ -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));
}
Modified: head/comms/wsjtx/files/patch-lib_wsprd_Makefile
==============================================================================
--- head/comms/wsjtx/files/patch-lib_wsprd_Makefile Sun Oct 29 14:26:07 2017 (r453118)
+++ head/comms/wsjtx/files/patch-lib_wsprd_Makefile Sun Oct 29 14:54:07 2017 (r453119)
@@ -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
Modified: head/comms/wsjtx/files/patch-manpages_CMakeLists.txt
==============================================================================
--- head/comms/wsjtx/files/patch-manpages_CMakeLists.txt Sun Oct 29 14:26:07 2017 (r453118)
+++ head/comms/wsjtx/files/patch-manpages_CMakeLists.txt Sun Oct 29 14:54:07 2017 (r453119)
@@ -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
Modified: head/comms/wsjtx/pkg-plist
==============================================================================
Binary file (source and/or target). No diff available.
More information about the svn-ports-head
mailing list