Index: head/comms/wsjtx/Makefile =================================================================== --- head/comms/wsjtx/Makefile (revision 522160) +++ head/comms/wsjtx/Makefile (revision 522161) @@ -1,49 +1,48 @@ # $FreeBSD$ PORTNAME= wsjtx -DISTVERSION= 2.1.0 -PORTREVISION= 1 +DISTVERSION= 2.1.2 CATEGORIES= comms hamradio MASTER_SITES= SF/wsjt/${PORTNAME}-${PORTVERSION}${DISTVERSIONSUFFIX} MAINTAINER= hamradio@FreeBSD.org COMMENT= Weak signal ham radio communication package LICENSE= GPLv3 BUILD_DEPENDS= asciidoctor:textproc/rubygem-asciidoctor \ autoconf>=2.69:devel/autoconf \ automake>=1.16.1:devel/automake \ a2x:textproc/asciidoc \ libtool:devel/libtool \ ${LOCALBASE}/share/xsl/docbook:textproc/docbook-xsl LIB_DEPENDS= libfftw3.so:math/fftw3 \ libfftw3f.so:math/fftw3-float \ libxslt.so:textproc/libxslt \ libomp.so:devel/openmp USES= cmake compiler:c++11-lib fortran gl \ makeinfo pkgconfig qt:5 tar:tgz USE_GL= glu USE_QT= core gui network widgets \ multimedia concurrent printsupport serialport sql sql-sqlite3 \ buildtools_build linguisttools_build qmake_build CMAKE_ARGS+= -DCMAKE_PREFIX_PATH+=${LOCALBASE}/wsjtx/lib \ -DLOCALBASE::STRING="${LOCALBASE}" PLIST_SUB+= PORTVERSION="${PORTVERSION}" post-patch: ${CP} ${FILESDIR}/wsjtx.patch ${WRKSRC} ${CP} ${FILESDIR}/hamlib.patch ${WRKSRC} do-install: (cd ${CONFIGURE_WRKSRC};${MAKE} -f Makefile DESTDIR=${STAGEDIR} install) post-install: .for f in fcal fmeasure fmtave ft8code jt4code jt65code jt9 jt9code \ message_aggregator msk144code qra64code qra64sim udp_daemon wsjtx wsprd ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${f} .endfor .include Index: head/comms/wsjtx/distinfo =================================================================== --- head/comms/wsjtx/distinfo (revision 522160) +++ head/comms/wsjtx/distinfo (revision 522161) @@ -1,3 +1,3 @@ -TIMESTAMP = 1567227520 -SHA256 (wsjtx-2.1.0.tgz) = 9e6c5424b2c84534b9ae6b7cc8e014c9da6540a7c50df8f3b25636c09d87d411 -SIZE (wsjtx-2.1.0.tgz) = 44904654 +TIMESTAMP = 1578066901 +SHA256 (wsjtx-2.1.2.tgz) = d4af8703abc0295bd1242a0707013708f3f2543841656af8961c4bd9cbe3432a +SIZE (wsjtx-2.1.2.tgz) = 44928980 Index: head/comms/wsjtx/files/wsjtx.patch =================================================================== --- head/comms/wsjtx/files/wsjtx.patch (revision 522160) +++ head/comms/wsjtx/files/wsjtx.patch (revision 522161) @@ -1,162 +1,58 @@ ---- wsjtx/CMakeLists.txt.orig 2019-02-24 22:48:37.000000000 -0500 -+++ wsjtx/CMakeLists.txt 2019-03-01 08:30:47.282749000 -0500 +--- wsjtx/CMakeLists.txt.orig 2019-11-26 09:22:32.000000000 -0500 ++++ wsjtx/CMakeLists.txt 2020-01-03 11:52:01.553241000 -0500 @@ -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 -@@ -132,7 +131,13 @@ +@@ -136,7 +135,13 @@ 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 # -@@ -834,8 +839,20 @@ +@@ -859,8 +864,20 @@ # # OpenMP # -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 # -@@ -1258,6 +1275,13 @@ - target_link_libraries (msk144sim wsjt_fort wsjt_cxx) +@@ -1325,6 +1342,13 @@ + target_link_libraries (record_time_signal wsjt_cxx wsjt_qtmm wsjt_qt) endif(WSJT_BUILD_UTILS) + +if(FREEBSD) + set (extraLIBS "ltdl" "usb") + else() + set (extraLIBS "") +endif() + # build the main application add_executable (wsjtx MACOSX_BUNDLE ---- /dev/null 2019-03-02 11:25:56.795397000 -0500 ---- /dev/null 2019-03-02 11:44:18.831676000 -0500 -+++ wsjtx/clogf.c 2019-03-02 11:43:18.833490000 -0500 -@@ -0,0 +1,100 @@ -+#include -+#if __FreeBSD_version <= 1200000 -+ -+/* $NetBSD: clogf.c,v 1.1 2007/08/20 16:01:35 drochner Exp $ */ -+ -+/*- -+ * Copyright (c) 2007 The NetBSD Foundation, Inc. -+ * All rights reserved. -+ * -+ * This code is derived from software written by Stephen L. Moshier. -+ * It is redistributed by the NetBSD Foundation by permission of the author. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS -+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED -+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS -+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -+ * POSSIBILITY OF SUCH DAMAGE. -+ */ -+ -+#include -+#include -+ -+float complex -+clogf(float complex z) -+{ -+ float complex w; -+ float p, rr; -+ -+ rr = cabsf(z); -+ p = logf(rr); -+ rr = atan2f(cimagf(z), crealf(z)); -+ w = p + rr * I; -+ return w; -+} -+#endif -+#include -+#if __FreeBSD_version <= 1200000 -+ -+/* $NetBSD: clogf.c,v 1.1 2007/08/20 16:01:35 drochner Exp $ */ -+ -+/*- -+ * Copyright (c) 2007 The NetBSD Foundation, Inc. -+ * All rights reserved. -+ * -+ * This code is derived from software written by Stephen L. Moshier. -+ * It is redistributed by the NetBSD Foundation by permission of the author. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS -+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED -+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS -+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -+ * POSSIBILITY OF SUCH DAMAGE. -+ */ -+ -+#include -+#include -+ -+float complex -+clogf(float complex z) -+{ -+ float complex w; -+ float p, rr; -+ -+ rr = cabsf(z); -+ p = logf(rr); -+ rr = atan2f(cimagf(z), crealf(z)); -+ w = p + rr * I; -+ return w; -+} -+#endif