From nobody Tue Sep 12 10:52:08 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RlL4n1Kwvz4t4Bf; Tue, 12 Sep 2023 10:52:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RlL4m6ltxz4fLp; Tue, 12 Sep 2023 10:52:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694515928; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Nn+ixbZ9EC2qG0+ycIf+rmw9vGYncob6zi+Qp4TlfqY=; b=tFVrIBOwOkJ10SltFGZLKCHLqxu0IuUTURc/sJi+G5zaRoduAgMF/7Xtk84N7SVXj8KzQu 7XKh+AQL4U5iI/umFUWWKnyZNFBoudNSpiXX4Mw4LjDqnjYNGz5vei/H1Im6ee1xslI2e2 4UjNCwv49S5IkTGIkPu2q0NYzQQKlbw/nCI4uE/bOOX59x1wqRVaoN9Yixt4nWzv0DyX1f YWwzJC0Z0ecLTlkNEJVCqZqx+mgT+74o4SU3yz8WomCFLiAfO7YGP/lL0nMEmfnCBySkGX /mEL5GyZVoFhgC3IkDUh8bm7Df5ixl7z2VVVWVj94cXZE4rqIOH9l+LGQzkrtg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694515928; a=rsa-sha256; cv=none; b=j3BAkqcpT8qbc8vD9RsuJrwsw7oyIaLVPT4Yc8H/GONuikQSHO5rPFVmTorwIr0Zg25iIk UnafRIlKJpjgX+3nKP4JmKzAOf/6CqICllH6prTaPdDXPkfsZdHVLhIGT+9ad7nOY0AzW3 TjeCP4e64RJkQCLl7gEG9a1BdTlp5+BTwfCE9FCxGU1VqiSRDKzCRNUaTybrA4bL5LPJLh J1oxiEQB2S/ZLB0XvzKSj2qUBXnYhgSO8wHk7OWkehUeQfIlRys/ae9ov6xppKBskOirv7 BFgPFdwN+XQiUq532RDQwEaNkKNeTr5EMXoAu0NWdSPIUQanvPkNE0zQqGAHJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694515928; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Nn+ixbZ9EC2qG0+ycIf+rmw9vGYncob6zi+Qp4TlfqY=; b=DP/zhehGF4sBIWNYxmrz2CifeECYOitWDS0FhesrJlzqS7WIjispvo/HCkUUpbFHWgIutC 1O2IGsbECketstmZxgY9NijGPMO1wXxhqLDnvWOyp3qjXgWI8RonNxSIhSCtTavK3OukYN IloLFoWjU85r7vdO35MhnbmTuZFzgV7xqpGSfxAQhLOX37JkXyMBPA3qZAyYdFwPs8f5I6 g2YGLmAy8jkbUBAEUpizSSece1+ZzMQux0GeFyr/l1ddlgSYbMWPDcAxyuCRP/9g80lKgc GPC/34TEAe05O171JLSxLszCj/pAj7cOxRJV7Z7KxJwjhyIjKQ2GMiDehddfaQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RlL4m5q82zTgb; Tue, 12 Sep 2023 10:52:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38CAq8lh081876; Tue, 12 Sep 2023 10:52:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38CAq8wp081873; Tue, 12 Sep 2023 10:52:08 GMT (envelope-from git) Date: Tue, 12 Sep 2023 10:52:08 GMT Message-Id: <202309121052.38CAq8wp081873@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Diane Bruce Subject: git: 5e3351caf5c6 - main - comms/wsjtx: Stray line left in broke build List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: db X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5e3351caf5c6df3fb50c2e0493b4debc7842026a Auto-Submitted: auto-generated The branch main has been updated by db: URL: https://cgit.FreeBSD.org/ports/commit/?id=5e3351caf5c6df3fb50c2e0493b4debc7842026a commit 5e3351caf5c6df3fb50c2e0493b4debc7842026a Author: Diane Bruce AuthorDate: 2023-09-12 10:43:04 +0000 Commit: Diane Bruce CommitDate: 2023-09-12 10:43:04 +0000 comms/wsjtx: Stray line left in broke build wsjtx has it's own patch system which is hard to work with. I goofed and somehow left a line in which broke the build completely. :-( PR: ports/262937 --- comms/wsjtx/Makefile | 2 +- comms/wsjtx/files/wsjtx.patch | 33 +++++++++++++-------------------- 2 files changed, 14 insertions(+), 21 deletions(-) diff --git a/comms/wsjtx/Makefile b/comms/wsjtx/Makefile index 6b7b0decbf5b..da0ada6fbe6e 100644 --- a/comms/wsjtx/Makefile +++ b/comms/wsjtx/Makefile @@ -1,6 +1,6 @@ PORTNAME= wsjtx DISTVERSION= 2.5.4 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= comms hamradio MASTER_SITES= SF/wsjt/${PORTNAME}-${PORTVERSION}${DISTVERSIONSUFFIX} diff --git a/comms/wsjtx/files/wsjtx.patch b/comms/wsjtx/files/wsjtx.patch index 4cd6321db885..36015bda3556 100644 --- a/comms/wsjtx/files/wsjtx.patch +++ b/comms/wsjtx/files/wsjtx.patch @@ -1,17 +1,10 @@ ---- wsjtx/wsjtx_config.h.in.orig 2023-09-03 10:51:04.025598000 -0400 -+++ wsjtx/wsjtx_config.h.in 2023-09-03 10:51:06.011258000 -0400 -@@ -18,7 +18,6 @@ - - #cmakedefine CMAKE_INSTALL_DATAROOTDIR "@CMAKE_INSTALL_DATAROOTDIR@" - #cmakedefine CMAKE_INSTALL_DOCDIR "@CMAKE_INSTALL_DOCDIR@" --#cmakedefine CMAKE_INSTALL_DATADIR "@CMAKE_INSTALL_DATADIR@" - #cmakedefine CMAKE_PROJECT_NAME "@CMAKE_PROJECT_NAME@" - #cmakedefine PROJECT_VENDOR "@PROJECT_VENDOR@" - #cmakedefine PROJECT_NAME "@PROJECT_NAME@" -@@ -58,16 +57,23 @@ +--- wsjtx/wsjtx_config.h.in.orig 2021-12-28 04:31:58.000000000 -0500 ++++ wsjtx/wsjtx_config.h.in 2023-09-10 09:55:54.397156000 -0400 +@@ -57,17 +57,22 @@ + # endif #endif - /* typedef for consistent gfortran ABI for charlen type hidden arguments */ +- /* typedef for consistent gfortran ABI for charlen type hidden arguments */ -#if __GNUC__ > 7 -#ifdef __cplusplus -#include @@ -20,6 +13,8 @@ -#endif - typedef size_t fortran_charlen_t; -#else +- typedef int fortran_charlen_t; +-#endif +#if (__GNUC__ > 7) + #ifdef __cplusplus + #include @@ -28,8 +23,6 @@ + #endif + typedef size_t fortran_charlen_t; + #else - typedef int fortran_charlen_t; --#endif +/* typedef for consistent gfortran ABI for charlen type hidden arguments */ + #if defined(__clang__) + #include @@ -42,7 +35,7 @@ #ifdef __cplusplus } --- wsjtx/CMakeLists.txt.orig 2021-12-28 04:31:58.000000000 -0500 -+++ wsjtx/CMakeLists.txt 2023-09-03 10:35:34.257208000 -0400 ++++ wsjtx/CMakeLists.txt 2023-09-10 09:39:14.606813000 -0400 @@ -41,7 +41,7 @@ endif () @@ -89,7 +82,7 @@ add_executable (jt4code lib/jt4code.f90) target_link_libraries (jt4code wsjt_fort wsjt_cxx) --- wsjtx/Radio.cpp.orig 2021-12-28 04:31:58.000000000 -0500 -+++ wsjtx/Radio.cpp 2023-09-03 10:35:34.257683000 -0400 ++++ wsjtx/Radio.cpp 2023-09-10 09:39:14.607286000 -0400 @@ -54,7 +54,8 @@ value *= std::pow (10., scale); if (ok) @@ -110,7 +103,7 @@ value = 0.; *ok = false; --- wsjtx/widgets/FrequencyLineEdit.cpp.orig 2021-12-28 04:31:58.000000000 -0500 -+++ wsjtx/widgets/FrequencyLineEdit.cpp 2023-09-03 10:35:34.258093000 -0400 ++++ wsjtx/widgets/FrequencyLineEdit.cpp 2023-09-10 09:39:14.607697000 -0400 @@ -39,7 +39,8 @@ FrequencyLineEdit::FrequencyLineEdit (QWidget * parent) : QLineEdit (parent) @@ -122,7 +115,7 @@ auto FrequencyLineEdit::frequency () const -> Frequency --- wsjtx/widgets/FrequencyDeltaLineEdit.cpp.orig 2021-12-28 04:31:58.000000000 -0500 -+++ wsjtx/widgets/FrequencyDeltaLineEdit.cpp 2023-09-03 10:35:34.258484000 -0400 ++++ wsjtx/widgets/FrequencyDeltaLineEdit.cpp 2023-09-10 09:39:14.608093000 -0400 @@ -39,8 +39,8 @@ FrequencyDeltaLineEdit::FrequencyDeltaLineEdit (QWidget * parent) : QLineEdit (parent) @@ -135,7 +128,7 @@ auto FrequencyDeltaLineEdit::frequency_delta () const -> FrequencyDelta --- wsjtx/CMake/Modules/FindUsb.cmake.orig 2021-12-28 04:31:58.000000000 -0500 -+++ wsjtx/CMake/Modules/FindUsb.cmake 2023-09-03 10:35:34.258886000 -0400 ++++ wsjtx/CMake/Modules/FindUsb.cmake 2023-09-10 09:39:14.608507000 -0400 @@ -13,25 +13,35 @@ # Usb::Usb - The libusb library # @@ -202,7 +195,7 @@ ) +endif() --- wsjtx/CMake/Modules/FindHamlib.cmake.orig 2021-12-28 04:31:58.000000000 -0500 -+++ wsjtx/CMake/Modules/FindHamlib.cmake 2023-09-03 10:35:34.259262000 -0400 ++++ wsjtx/CMake/Modules/FindHamlib.cmake 2023-09-10 09:39:14.608876000 -0400 @@ -18,7 +18,9 @@ FIND_LIBRARY hamlib )