Index: head/comms/wsjtx/Makefile =================================================================== --- head/comms/wsjtx/Makefile (revision 453118) +++ head/comms/wsjtx/Makefile (revision 453119) @@ -1,43 +1,42 @@ # $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 LICENSE= GPLv3 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 \ libomp.so.0:devel/openmp 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 \ -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} BROKEN_i386= does not build on i386 due to openmp .include Index: head/comms/wsjtx/distinfo =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: head/comms/wsjtx/distinfo ___________________________________________________________________ Modified: svn:mime-type ## -1 +1 ## -application/octet-stream \ No newline at end of property +text/plain \ No newline at end of property Index: head/comms/wsjtx/files/patch-WFPalette.hpp =================================================================== --- head/comms/wsjtx/files/patch-WFPalette.hpp (revision 453118) +++ head/comms/wsjtx/files/patch-WFPalette.hpp (nonexistent) @@ -1,10 +0,0 @@ ---- WFPalette.hpp.orig 2017-01-05 15:57:44 UTC -+++ WFPalette.hpp -@@ -5,6 +5,7 @@ - #include - #include - #include -+#include - - class QString; - Property changes on: head/comms/wsjtx/files/patch-WFPalette.hpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -1 \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/comms/wsjtx/files/patch-Radio.cpp =================================================================== --- head/comms/wsjtx/files/patch-Radio.cpp (revision 453118) +++ head/comms/wsjtx/files/patch-Radio.cpp (nonexistent) @@ -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)); - } - - Property changes on: head/comms/wsjtx/files/patch-Radio.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -1 \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/comms/wsjtx/files/patch-CMakeLists.txt =================================================================== --- head/comms/wsjtx/files/patch-CMakeLists.txt (revision 453118) +++ head/comms/wsjtx/files/patch-CMakeLists.txt (revision 453119) @@ -1,94 +1,57 @@ ---- 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) - 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 () +if (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") + set (FREEBSD TRUE) + link_directories("/usr/lib" "${LOCALBASE}/lib") + include_directories("/usr/include" "${LOCALBASE}/include") +endif() + # # 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 # -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() + find_package (OpenMP) +endif() # # 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} Index: head/comms/wsjtx/files/patch-Configuration.cpp =================================================================== --- head/comms/wsjtx/files/patch-Configuration.cpp (revision 453118) +++ head/comms/wsjtx/files/patch-Configuration.cpp (revision 453119) @@ -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)); } Index: head/comms/wsjtx/files/patch-lib_wsprd_Makefile =================================================================== --- head/comms/wsjtx/files/patch-lib_wsprd_Makefile (revision 453118) +++ head/comms/wsjtx/files/patch-lib_wsprd_Makefile (revision 453119) @@ -1,18 +1,18 @@ ---- 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 +#CC = gcc #CC = clang-3.5 -FC = gfortran +#FC = gfortran -CFLAGS= -I/usr/include -Wall -Wno-missing-braces -O3 -ffast-math -LDFLAGS = -L/usr/lib -FFLAGS = -O2 -Wall -Wno-conversion +#CFLAGS= -I/usr/include -Wall -Wno-missing-braces -O3 -ffast-math +#LDFLAGS = -L/usr/lib +#FFLAGS = -O2 -Wall -Wno-conversion LIBS = -lfftw3f -lm # Default rules Index: head/comms/wsjtx/files/patch-manpages_CMakeLists.txt =================================================================== --- head/comms/wsjtx/files/patch-manpages_CMakeLists.txt (revision 453118) +++ head/comms/wsjtx/files/patch-manpages_CMakeLists.txt (revision 453119) @@ -1,11 +1,11 @@ ---- 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 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 ) Index: head/comms/wsjtx/pkg-plist =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: head/comms/wsjtx/pkg-plist ___________________________________________________________________ Modified: svn:mime-type ## -1 +1 ## -application/octet-stream \ No newline at end of property +text/plain \ No newline at end of property