Index: head/comms/wsjtx/Makefile
===================================================================
--- head/comms/wsjtx/Makefile	(revision 547489)
+++ head/comms/wsjtx/Makefile	(revision 547490)
@@ -1,61 +1,63 @@
 # $FreeBSD$
 
 PORTNAME=	wsjtx
 DISTVERSION=	2.1.2
-PORTREVISION=	1
+PORTREVISION=	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
 
 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}"
+# for detailed debugging uncomment the next line
+#CMAKE_ARGS+=   --debug-output --trace
 PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 
 _PATCHES=	wsjtx.patch hamlib.patch
 
 post-patch:
 .  for _patch in ${_PATCHES}
 	# Keep a copy of the blank patch for the post-build target below
 	${MV} ${WRKSRC}/${_patch} ${WRKSRC}/${_patch}.orig
 	# Copy the patch provided by the ports system
 	${CP} ${FILESDIR}/${_patch}  ${WRKSRC}
 .  endfor
 
 post-build:
 	# With cmake 3.18, the patching stage in the internal build
-	# is ran again, trick it by removing the patch again.
+	# is run again, trick it by removing the patch again.
 .  for _patch in ${_PATCHES}
 	${MV} ${WRKSRC}/${_patch}.orig  ${WRKSRC}/${_patch}
 .  endfor
 
 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 <bsd.port.mk>
Index: head/comms/wsjtx/files/wsjtx.patch
===================================================================
--- head/comms/wsjtx/files/wsjtx.patch	(revision 547489)
+++ head/comms/wsjtx/files/wsjtx.patch	(revision 547490)
@@ -1,76 +1,88 @@
 --- 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
 @@ -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
  #
 @@ -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
  #
 @@ -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
 --- wsjtx/qt_helpers.hpp.orig	2020-04-04 19:19:54.667679000 +0200
 +++ wsjtx/qt_helpers.hpp	2020-04-04 19:20:37.899375000 +0200
 @@ -78,6 +78,7 @@
    }
  };
  
 +#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
  namespace std
  {
    // std::hash<> specialization for QString based on the dbj2
 @@ -97,6 +98,7 @@
      }
    };
  }
 +#endif
  
  // Register some useful Qt types with QMetaType
  Q_DECLARE_METATYPE (QHostAddress);
+
+--- wsjtx/lib/wsprd/jelinek.h.orig	2020-08-23 10:47:23.539369000 -0400
++++ wsjtx/lib/wsprd/jelinek.h	2020-08-23 10:40:31.539503000 -0400
+@@ -10,7 +10,7 @@
+     unsigned int jpointer;
+ };
+ 
+-struct snode *stack;
++static struct snode *stack;
+ 
+ int jelinek(unsigned int *metric,
+             unsigned int *cycles,