summaryrefslogtreecommitdiff
path: root/comms/wsjtz
diff options
context:
space:
mode:
Diffstat (limited to 'comms/wsjtz')
-rw-r--r--comms/wsjtz/Makefile46
-rw-r--r--comms/wsjtz/distinfo6
-rw-r--r--comms/wsjtz/files/patch-CMakeLists.txt21
-rw-r--r--comms/wsjtz/files/patch-CMake_Modules_FindUsb.cmake2
-rw-r--r--comms/wsjtz/files/patch-Radio.cpp20
-rw-r--r--comms/wsjtz/files/patch-widgets_FrequencyDeltaLineEdit.cpp13
-rw-r--r--comms/wsjtz/files/patch-widgets_FrequencyLineEdit.cpp11
-rw-r--r--comms/wsjtz/pkg-plist22
8 files changed, 59 insertions, 82 deletions
diff --git a/comms/wsjtz/Makefile b/comms/wsjtz/Makefile
index 59c62c57d250..48def3b9c0b2 100644
--- a/comms/wsjtz/Makefile
+++ b/comms/wsjtz/Makefile
@@ -1,6 +1,5 @@
PORTNAME= wsjtz
-DISTVERSION= 2.5.4-1.22
-PORTREVISION= 13
+DISTVERSION= 2.7.0-rc7-1.48
CATEGORIES= comms hamradio
MASTER_SITES= SF/wsjt-z/Source
@@ -9,45 +8,45 @@ COMMENT= Clone of WSJT-X software with additional features
WWW= https://sourceforge.net/projects/wsjt-z/
LICENSE= GPLv3
+LICENSE_FILE= ${WRKSRC}/COPYING
-LIB_DEPENDS= libboost_log_setup.so:devel/boost-libs \
- libfftw3.so:math/fftw3 \
- libfftw3f.so:math/fftw3-float \
- libhamlib.so:comms/hamlib \
- libreadline.so:devel/readline
+PATCH_DEPENDS= dos2unix:converters/dos2unix
BUILD_DEPENDS= ${LOCALBASE}/share/xsl/docbook:textproc/docbook-xsl \
a2x:textproc/asciidoc \
asciidoctor:textproc/rubygem-asciidoctor \
boost-libs>0:devel/boost-libs \
libtool:devel/libtool
+LIB_DEPENDS= libboost_log_setup.so:devel/boost-libs \
+ libfftw3.so:math/fftw3 \
+ libfftw3f.so:math/fftw3-float \
+ libhamlib.so:comms/hamlib \
+ libreadline.so:devel/readline
USES= cmake compiler:c++14-lang fortran makeinfo pkgconfig qt:5 zip
USE_QT= concurrent core gui multimedia network printsupport serialport \
sql sql-sqlite3 testlib widgets buildtools:build \
linguisttools:build qmake:build
-CONFLICTS= wsjtx
-
-CMAKE_ARGS+= -DCMAKE_PREFIX_PATH+=${LOCALBASE}/wsjtx/lib \
+CMAKE_ARGS+= -DCMAKE_PREFIX_PATH+=${LOCALBASE}/${PORTNAME:S/z/x/}/lib \
-DLOCALBASE::STRING="${LOCALBASE}"
# for detailed debugging uncomment the next line
#CMAKE_ARGS+= --debug-output --trace
-PLIST_SUB+= PORTVERSION="${PORTVERSION}"
-
-OPTIONS_DEFINE= DOCS
-PORTDOCS= *
+CONFLICTS= wsjtx
-DOCSDIR= ${PREFIX}/share/doc/${PORTNAME:S/z/x/}
DATADIR= ${PREFIX}/share/${PORTNAME:S/z/x/}
-WRKSRC= ${WRKDIR}/wsjtx
+DOCSDIR= ${PREFIX}/share/doc/${PORTNAME:S/z/x/}
+
+WRKSRC= ${WRKDIR}/${PORTNAME:S/z/x/}
-.include <bsd.port.pre.mk>
+PLIST_SUB= PORTVERSION="${PORTVERSION}"
-.if ${GCC_DEFAULT} >= 10
-# workaround for More actual than formal arguments in procedure call at (1)
-FFLAGS+= -fallow-argument-mismatch
-.endif
+OPTIONS_DEFINE= DOCS
+OPTIONS_SUB= yes
+
+pre-patch:
+ ${FIND} ${WRKSRC} -type f -not -name '*.png' \
+ -exec dos2unix {} > /dev/null 2>&1 \;
post-install:
.for f in fcal fmeasure fmtave fst4sim ft8code jt4code jt65code jt9 jt9code \
@@ -55,4 +54,7 @@ post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${f}
.endfor
-.include <bsd.port.post.mk>
+post-install-DOCS-off:
+ ${RM} -r ${STAGEDIR}${DOCSDIR}
+
+.include <bsd.port.mk>
diff --git a/comms/wsjtz/distinfo b/comms/wsjtz/distinfo
index 2df0a6f4cc0f..39823eb69cc4 100644
--- a/comms/wsjtz/distinfo
+++ b/comms/wsjtz/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1653239901
-SHA256 (wsjtz-2.5.4-1.22.zip) = a2944ebc961e6d2ecfd1f36a07f4ec5ad6d6f80a528d8ef6f894794b247c3fe9
-SIZE (wsjtz-2.5.4-1.22.zip) = 38009881
+TIMESTAMP = 1761124730
+SHA256 (wsjtz-2.7.0-rc7-1.48.zip) = 4af4a008eadbe49eb5d620a0802691550d83605c235573a3e859a3013937b933
+SIZE (wsjtz-2.7.0-rc7-1.48.zip) = 39190543
diff --git a/comms/wsjtz/files/patch-CMakeLists.txt b/comms/wsjtz/files/patch-CMakeLists.txt
index 012db69b5b5a..d6783c509153 100644
--- a/comms/wsjtz/files/patch-CMakeLists.txt
+++ b/comms/wsjtz/files/patch-CMakeLists.txt
@@ -1,9 +1,10 @@
---- CMakeLists.txt.orig 2022-04-18 18:07:26 UTC
+--- CMakeLists.txt.orig 2025-01-07 04:30:42 UTC
+++ CMakeLists.txt
-@@ -141,6 +141,12 @@ attach a debugger which will then receive the console
+@@ -145,7 +145,12 @@ attach a debugger which will then receive the console
# install locations
#
+-
+if (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+ set (FREEBSD TRUE)
+ link_directories("/usr/lib" "${LOCALBASE}/lib")
@@ -13,7 +14,7 @@
if (APPLE)
set (CMAKE_INSTALL_BINDIR ${CMAKE_PROJECT_NAME}.app/Contents/MacOS)
set (CMAKE_INSTALL_DATAROOTDIR ${CMAKE_PROJECT_NAME}.app/Contents/Resources)
-@@ -875,8 +881,20 @@ find_package (Boost 1.62 REQUIRED COMPONENTS log_setup
+@@ -936,8 +941,20 @@ find_package (Boost 1.62 REQUIRED COMPONENTS log_setup
#
# OpenMP
#
@@ -35,7 +36,7 @@
#
# fftw3 single precision library
#
-@@ -923,7 +941,7 @@ set (CMAKE_VISIBILITY_INLINES_HIDDEN ON)
+@@ -986,7 +1003,7 @@ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra")
#
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra")
@@ -44,8 +45,8 @@
if (NOT APPLE)
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-pragmas")
-@@ -1169,7 +1187,7 @@ add_executable (encode77 lib/77bit/encode77.f90)
- target_link_libraries (encode77 wsjt_fort wsjt_cxx)
+@@ -1247,7 +1264,7 @@ add_executable (wsprsim ${wsprsim_CSRCS})
+ target_link_libraries (hash22calc wsjt_fort wsjt_cxx)
add_executable (wsprsim ${wsprsim_CSRCS})
-target_link_libraries (wsprsim ${LIBM_LIBRARIES})
@@ -53,7 +54,7 @@
add_executable (jt4code lib/jt4code.f90)
target_link_libraries (jt4code wsjt_fort wsjt_cxx)
-@@ -1211,6 +1229,12 @@ target_link_libraries (ldpcsim240_74 wsjt_fort wsjt_cx
+@@ -1301,6 +1318,12 @@ endif(WSJT_BUILD_UTILS)
endif(WSJT_BUILD_UTILS)
@@ -66,7 +67,7 @@
add_executable (fmtave lib/fmtave.f90)
add_executable (fcal lib/fcal.f90)
-@@ -1410,6 +1434,11 @@ if (${OPENMP_FOUND} OR APPLE)
+@@ -1499,6 +1522,11 @@ endif (${OPENMP_FOUND} OR APPLE)
else (${OPENMP_FOUND} OR APPLE)
target_link_libraries (jt9 wsjt_fort wsjt_cxx fort_qt)
endif (${OPENMP_FOUND} OR APPLE)
@@ -77,8 +78,8 @@
+endif ()
if (WIN32)
- # build map65
-@@ -1601,12 +1630,12 @@ install (PROGRAMS
+ find_package (Portaudio REQUIRED)
+@@ -1690,12 +1718,12 @@ install (PROGRAMS
RENAME rigctld-wsjtx${CMAKE_EXECUTABLE_SUFFIX}
)
diff --git a/comms/wsjtz/files/patch-CMake_Modules_FindUsb.cmake b/comms/wsjtz/files/patch-CMake_Modules_FindUsb.cmake
index 75c7a19faca7..b010b31b571a 100644
--- a/comms/wsjtz/files/patch-CMake_Modules_FindUsb.cmake
+++ b/comms/wsjtz/files/patch-CMake_Modules_FindUsb.cmake
@@ -1,4 +1,4 @@
---- CMake/Modules/FindUsb.cmake.orig 2021-12-28 16:31:58 UTC
+--- CMake/Modules/FindUsb.cmake.orig 2024-09-27 09:47:22 UTC
+++ CMake/Modules/FindUsb.cmake
@@ -27,7 +27,7 @@ libfind_pkg_detect (Usb usb-1.0
endif ()
diff --git a/comms/wsjtz/files/patch-Radio.cpp b/comms/wsjtz/files/patch-Radio.cpp
deleted file mode 100644
index 482155884385..000000000000
--- a/comms/wsjtz/files/patch-Radio.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- Radio.cpp.orig 2021-12-28 16:31:58 UTC
-+++ Radio.cpp
-@@ -54,7 +54,7 @@ namespace Radio
- value *= std::pow (10., scale);
- if (ok)
- {
-- if (value < 0. || value > std::numeric_limits<Frequency>::max ())
-+ if (value < 0. || value > (float)std::numeric_limits<Frequency>::max ())
- {
- value = 0.;
- *ok = false;
-@@ -92,7 +92,7 @@ namespace Radio
- if (ok)
- {
- if (value < -std::numeric_limits<Frequency>::max ()
-- || value > std::numeric_limits<Frequency>::max ())
-+ || value > (float)std::numeric_limits<Frequency>::max ())
- {
- value = 0.;
- *ok = false;
diff --git a/comms/wsjtz/files/patch-widgets_FrequencyDeltaLineEdit.cpp b/comms/wsjtz/files/patch-widgets_FrequencyDeltaLineEdit.cpp
deleted file mode 100644
index 1b677344d795..000000000000
--- a/comms/wsjtz/files/patch-widgets_FrequencyDeltaLineEdit.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
---- widgets/FrequencyDeltaLineEdit.cpp.orig 2021-02-01 18:08:30 UTC
-+++ widgets/FrequencyDeltaLineEdit.cpp
-@@ -39,8 +39,8 @@ namespace
- FrequencyDeltaLineEdit::FrequencyDeltaLineEdit (QWidget * parent)
- : QLineEdit (parent)
- {
-- setValidator (new MHzValidator {-std::numeric_limits<FrequencyDelta>::max () / 10.e6,
-- std::numeric_limits<FrequencyDelta>::max () / 10.e6, this});
-+ setValidator (new MHzValidator {-(float)std::numeric_limits<FrequencyDelta>::max () / 10.e6,
-+ (float)std::numeric_limits<FrequencyDelta>::max () / 10.e6, this});
- }
-
- auto FrequencyDeltaLineEdit::frequency_delta () const -> FrequencyDelta
diff --git a/comms/wsjtz/files/patch-widgets_FrequencyLineEdit.cpp b/comms/wsjtz/files/patch-widgets_FrequencyLineEdit.cpp
deleted file mode 100644
index 10b456242781..000000000000
--- a/comms/wsjtz/files/patch-widgets_FrequencyLineEdit.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- widgets/FrequencyLineEdit.cpp.orig 2021-02-01 18:08:30 UTC
-+++ widgets/FrequencyLineEdit.cpp
-@@ -39,7 +39,7 @@ namespace
- FrequencyLineEdit::FrequencyLineEdit (QWidget * parent)
- : QLineEdit (parent)
- {
-- setValidator (new MHzValidator {0., std::numeric_limits<Radio::Frequency>::max () / 10.e6, this});
-+ setValidator (new MHzValidator {0., (float)std::numeric_limits<Radio::Frequency>::max () / 10.e6, this});
- }
-
- auto FrequencyLineEdit::frequency () const -> Frequency
diff --git a/comms/wsjtz/pkg-plist b/comms/wsjtz/pkg-plist
index bd7c426ca0d1..7520e73a7be7 100644
--- a/comms/wsjtz/pkg-plist
+++ b/comms/wsjtz/pkg-plist
@@ -1,8 +1,25 @@
+%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/BUGS
+%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/README
+%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/THANKS
+%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/changelog.gz
+%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/copyright
+%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/example_log_configurations/README
+%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/example_log_configurations/wsjtx_log_config.ini.console
+%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/example_log_configurations/wsjtx_log_config.ini.debugger
+%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/example_log_configurations/wsjtx_log_config.ini.rig_control
+%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/example_log_configurations/wsjtx_log_config.ini.simple_verbose
+%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/wsjtx-main-2.7.0-rc7.html
+bin/cablog
+bin/echosim
bin/fcal
bin/fmeasure
bin/fmtave
bin/fst4sim
bin/ft8code
+bin/hash22calc
bin/jt4code
bin/jt65code
bin/jt9
@@ -17,6 +34,8 @@ bin/udp_daemon
bin/wsjtx
bin/wsjtx_app_version
bin/wsprd
+share/applications/message_aggregator.desktop
+share/applications/wsjtx.desktop
share/man/man1/fcal.1.gz
share/man/man1/fmeasure.1.gz
share/man/man1/fmtave.1.gz
@@ -36,10 +55,9 @@ share/man/man1/rigctld-wsjtx.1.gz
share/man/man1/udp_daemon.1.gz
share/man/man1/wsjtx.1.gz
share/man/man1/wsprd.1.gz
-share/applications/message_aggregator.desktop
-share/applications/wsjtx.desktop
share/pixmaps/wsjtx_icon.png
%%DATADIR%%/JPLEPH
%%DATADIR%%/USState.db
%%DATADIR%%/cty.dat
%%DATADIR%%/cty.dat_copyright.txt
+%%DATADIR%%/eclipse.txt
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-19 18:02:36 +0000