From nobody Fri Feb 17 23:48:56 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 4PJT6d0qSRz3rxgP; Fri, 17 Feb 2023 23:48:57 +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 4PJT6d0Qptz3N8n; Fri, 17 Feb 2023 23:48:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676677737; 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=XLW03zqEdjI7Ddt+9Ua50dtXnvDe2J2/WbnrAtr5yBc=; b=orClha6eyCrTaPVeUEopFla2k50ldmIi+WAz9y+3Hd9H9Lf4f+Ct5y6ttro4FapCKvK9C5 lIIsXkkFy6w9SnHGFS/8x7gdHO0yBf0S7x9VL6LbMyJrDAIkLd3qEhrY/CRkxg1woDt9qr TFV1mukROMwyzJSYUSaeL5wr1qzDs2rTG9YEG8r/tt+lW8Eryb0PoCR1tHrY9K/X50o47J ZRtxunLwX1z2wHDT5P3kcDLfgmONluBm8rIuPiTusN84O4GRA7RrjBvrmppda8HVt7vWCz Vamqonr858pvMY4oWtnJkLe+/oni/7b277I0nsNLvcHSg+8RPMafvyDsYaVmcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676677737; 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=XLW03zqEdjI7Ddt+9Ua50dtXnvDe2J2/WbnrAtr5yBc=; b=O5iGZ6U9oQZ8FT45w52DVWFVq0E2AuaHo78iVIaYSLyo5A/CPmeeVVOVJdqbx2Y8ipEtKN t4qWt+kwJPutfEIxPCAVZzeEU8Eh5YXGbAbhMuP1DT8egSz3fcayzlKMbMQJ+GtrTL1Tac S08/LnS26MRFTaNTv28tvksxy4Y3S+ifQYEPw4G1wcftH5gNyNaGt/Hif9g9tD2J9rges/ tNvAqLXB+2qgQVJEHAkY1szPgSNqOJJEC3LA9zPf0QcGJR8lKEU1jGqS18V/FUX1ehzIBa y9GmyCJqhE1bUtixysvyG9bQzUUnQRToBWDqrkE2KsAYTVRgQpZ80P+WbNDZ/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676677737; a=rsa-sha256; cv=none; b=kaZa3Dv3sW1hUDjAbN4aXdNfAmho9vHxy0mdIDqo9JrOHTCSi1nQflvsYadJ6uiD7jOJUN apWX2AoingM+99DFIj9w+kwIca0X9fGOjDw/FXfJ5sNwy9xxc5q03NKhN0/CrM0fh/644x jFi4weKpYmHRS8Mb2r3kpcFa00nzvc7DhXFctb7Mr14Y7UQL53w2njL5Mcxj+1mJEL65dY iyrryCk0UxstrK+HGsLv9HPXkmZ/ArM/3cMeJXtrlinSO0nHq9WEb7mdFaXx9HwxdjA2dc yiB9e42gVO3ZvdRhKsKqNpxQzgC/jRhJloy1gxVju96kkhNsk6ylRbPuRAohBA== 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 4PJT6c6YKQz11fZ; Fri, 17 Feb 2023 23:48:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31HNmucv026078; Fri, 17 Feb 2023 23:48:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31HNmuXv026077; Fri, 17 Feb 2023 23:48:56 GMT (envelope-from git) Date: Fri, 17 Feb 2023 23:48:56 GMT Message-Id: <202302172348.31HNmuXv026077@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: adf4a629799a - main - comms/wsjtx: Same bug as hamlib treating a function like a variable 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: adf4a629799aecd35618a47236fcec91e315b283 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by db: URL: https://cgit.FreeBSD.org/ports/commit/?id=adf4a629799aecd35618a47236fcec91e315b283 commit adf4a629799aecd35618a47236fcec91e315b283 Author: Diane Bruce AuthorDate: 2023-02-17 23:47:32 +0000 Commit: Diane Bruce CommitDate: 2023-02-17 23:47:32 +0000 comms/wsjtx: Same bug as hamlib treating a function like a variable wsjtx insist on packaging their own version of hamlib which means the fix to hamlib meant the bug was still in wsjtx --- comms/wsjtx/Makefile | 4 ++-- comms/wsjtx/files/hamlib.patch | 24 ++++++++++++++++++------ 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/comms/wsjtx/Makefile b/comms/wsjtx/Makefile index 2f3e20bb1b3e..604e41b5689a 100644 --- a/comms/wsjtx/Makefile +++ b/comms/wsjtx/Makefile @@ -1,6 +1,6 @@ PORTNAME= wsjtx DISTVERSION= 2.5.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= comms hamradio MASTER_SITES= SF/wsjt/${PORTNAME}-${PORTVERSION}${DISTVERSIONSUFFIX} @@ -41,7 +41,7 @@ _PATCHES= wsjtx.patch hamlib.patch FFLAGS+= -fallow-argument-mismatch .endif -_HAMLIB_PATCHES= configure hamlib.pc.in tests/rigtestlibusb.c +_HAMLIB_PATCHES= configure hamlib.pc.in tests/rigtestlibusb.c src/misc.c make-hamlib-patch: ${MV} ${FILESDIR}/hamlib.patch ${FILESDIR}/hamlib.patch.old . for f in ${_HAMLIB_PATCHES} diff --git a/comms/wsjtx/files/hamlib.patch b/comms/wsjtx/files/hamlib.patch index 448098d51819..335e13502141 100644 --- a/comms/wsjtx/files/hamlib.patch +++ b/comms/wsjtx/files/hamlib.patch @@ -1,5 +1,5 @@ ---- hamlib/configure.orig 2022-01-02 11:10:19.000000000 +0100 -+++ hamlib/configure 2022-04-13 12:51:01.174492000 +0200 +--- hamlib/configure.orig 2022-01-02 05:10:19.000000000 -0500 ++++ hamlib/configure 2023-02-17 16:55:21.413328000 -0500 @@ -19135,7 +19135,7 @@ case "$host_os" in #( freebsd*) : @@ -17,8 +17,8 @@ LIBUSB="" ---- hamlib/hamlib.pc.in.orig 2022-01-02 11:10:11.000000000 +0100 -+++ hamlib/hamlib.pc.in 2022-04-13 12:34:36.119285000 +0200 +--- hamlib/hamlib.pc.in.orig 2022-01-02 05:10:11.000000000 -0500 ++++ hamlib/hamlib.pc.in 2023-02-17 16:55:21.413939000 -0500 @@ -7,7 +7,6 @@ Description: Library to control radio and rotator equipment. URL: @PACKAGE_URL@ @@ -29,8 +29,8 @@ -Libs.private: @MATH_LIBS@ @DL_LIBS@ @NET_LIBS@ @PTHREAD_LIBS@ +Libs: -L${libdir} ${libdir}/libhamlib.a +Libs.private: @MATH_LIBS@ @DL_LIBS@ @NET_LIBS@ @PTHREAD_LIBS@ -lusb ---- hamlib/tests/rigtestlibusb.c.orig 2022-01-02 11:10:11.000000000 +0100 -+++ hamlib/tests/rigtestlibusb.c 2022-04-13 12:34:36.119728000 +0200 +--- hamlib/tests/rigtestlibusb.c.orig 2022-01-02 05:10:11.000000000 -0500 ++++ hamlib/tests/rigtestlibusb.c 2023-02-17 16:55:21.414509000 -0500 @@ -115,7 +115,10 @@ printf(" wSpeedSupported: %u\n", ss_usb_cap->wSpeedSupported); printf(" bFunctionalitySupport: %u\n", ss_usb_cap->bFunctionalitySupport); @@ -60,3 +60,15 @@ libusb_free_bos_descriptor(bos); } +--- hamlib/src/misc.c.orig 2023-02-17 18:06:57.171679000 -0500 ++++ hamlib/src/misc.c 2023-02-17 18:13:49.377881000 -0500 +@@ -2550,7 +2550,8 @@ + if (localtime) + { + mytm = localtime_r(&t, &result); +- mytimezone = timezone; ++ /* For FreeBSD */ ++ mytimezone = mytm->tm_gmtoff; + } + else + {