From nobody Sat Dec 30 15:31:03 2023 X-Original-To: dev-commits-ports-all@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 4T2R6H5fRyz55Rss; Sat, 30 Dec 2023 15:31:03 +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 4T2R6H53Pzz3ZTp; Sat, 30 Dec 2023 15:31:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703950263; 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=12hABYRBHWYJ07aXYOToB6IxqAUh9plu9f0+hCfCIww=; b=KGhlScO90f5OmkfOP0bS46dGAd6GVFrTj7JrTfovwsCbEXkcD6rbe5r0hMcF/gLorQxVzl +pzSiPTYccTrb8DnGZC1WqsX2rrTPaPvR8psOR9R8iyS8YFBlEP1/JsLaeuelJNzWx0GZC SYefTvGwRVTrOIf/Tm3k9MWUKDw7IYRc3/C16DdSW0IKmqsH+A8/2atTUKoeOUiIW97xqc lNuhfauV10g0InT7Ad4dzGWUM/zK8EtTHBhYLbZodbLPTZnBNePZ0hpidYGnLyph1Q8ngJ o1FEEqwLjX1odmRU+a0J4ZwUkFoYWOUWvML9+383r+FyRJDl51F9o1/a62oN7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703950263; a=rsa-sha256; cv=none; b=vlid40V5HI73NYnTrud+91AIZ8e+sdQp1kfk6aVSy0DyEyjT3hxZNdX86xrFOUdxfg12v5 vjqKUjPXlTFefs1HEWfNVhk30IBElSh4wAJUYBvl1YMNTaT9ciTib8zsM/fR1QOaM/QmqW IUJw4QPrFx9VYcULCh4CTD4kBHLHosQbIc9sbahqNbWmt9dpX+OWPOu9iNzQmFrJfhppV0 hoZ4rzPWbi08lhB9yNhUHvkleJVGvHb407zmu+ovvR1az/5ssjryDZNRjlyT4WEltvOR/b +JVv5Lp74TE1tYqoe2hnPDqm4zbJsqAubDF0//tlweGNpUadH/5UXwqbjuusrw== 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=1703950263; 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=12hABYRBHWYJ07aXYOToB6IxqAUh9plu9f0+hCfCIww=; b=NHENp0PnFfogUnUORuA8P7ddpkxD1iztMVOB4+GOrvi7XN40YwLszp5ZMjzSrpDVxN6u0s 9H6qb6F/qHRbnl30Tbn0vI52FwT3TmplOHtCJ2cp+7j7N1hjeNvQAUKn89MXaD1bx/JSzD LWxewwmNwQ/Wh5saWAer/dhEwmgal28481FXtM60TDKBIWbUXF26ynoBWRvEOkFcX3QVtV DEWh89yrNPRIe3tEgSO2+ql+6CGQyrJUcJM4lVaSUd5ICINUgeAunX/S80/le/CFliR4kZ zgNtLGWm1nHzAeTK66vLJakqOFtMCnJj/RfVYbOdyBu09dIEcDzsyNn6nJ+pMQ== 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 4T2R6H46YKzw53; Sat, 30 Dec 2023 15:31:03 +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 3BUFV3ta029402; Sat, 30 Dec 2023 15:31:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BUFV3Ad029399; Sat, 30 Dec 2023 15:31:03 GMT (envelope-from git) Date: Sat, 30 Dec 2023 15:31:03 GMT Message-Id: <202312301531.3BUFV3Ad029399@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: 0d56f2f09390 - main - comms/flrig: Update to 2.0.05 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 0d56f2f0939038e79f75ee772f94a0e50069b538 Auto-Submitted: auto-generated The branch main has been updated by db: URL: https://cgit.FreeBSD.org/ports/commit/?id=0d56f2f0939038e79f75ee772f94a0e50069b538 commit 0d56f2f0939038e79f75ee772f94a0e50069b538 Author: Diane Bruce AuthorDate: 2023-12-30 15:29:21 +0000 Commit: Diane Bruce CommitDate: 2023-12-30 15:29:21 +0000 comms/flrig: Update to 2.0.05 2023-12-29 dave-w1hkj fb72498d: MinGW compile warning e2ce0334: FT 891/991/991A afb6943c: TMD710 35a47a1e: vector interpolator 2023-12-16 Philip Rose GM3ZZA af9b8bd5: IC705 2023-12-16 dave-w1hkj b323c9ba: qmx14 8b6b0d8f: mingw64 warnings 2023-12-08 Michael Black bc7eba83: XMLrpc get_swr 2023-12-05 dave-w1hkj b6919ea4: Documentation Overhaul 5f4894e8: K4 update 3cd14cb8: Value Wheel Slider 208f4f1e: xml client fix 64f1b867: FT710 bug fix 0d8ca1b3: xml trace b533a9e4: Test mode add2a5e1: UI cosmetics 2023-11-10 Michael Black 39aee6d1: gcc 13 mingw fixes 2023-11-10 dave-w1hkj b8d35aa9: SWR xmlrpc 2023-10-28 db VA3DB 3aed89e1: FreeBSD fixes --- comms/flrig/Makefile | 5 ++-- comms/flrig/distinfo | 6 ++-- comms/flrig/files/patch-src_cmedia_cmedia.cxx | 13 --------- comms/flrig/files/patch-src_cmedia_hid__lin.cxx | 26 ----------------- comms/flrig/files/patch-src_cmedia_tmate2.cxx | 13 --------- comms/flrig/files/patch-src_support_dialogs.cxx | 37 ------------------------- 6 files changed, 5 insertions(+), 95 deletions(-) diff --git a/comms/flrig/Makefile b/comms/flrig/Makefile index a18daee579f5..5aed045a55fe 100644 --- a/comms/flrig/Makefile +++ b/comms/flrig/Makefile @@ -1,6 +1,5 @@ PORTNAME= flrig -PORTVERSION= 2.0.04 -PORTREVISION= 1 +PORTVERSION= 2.0.05 CATEGORIES= comms hamradio MASTER_SITES= SF/fldigi/${PORTNAME} \ http://www.w1hkj.com/files/fldigi/ @@ -9,7 +8,7 @@ MAINTAINER= hamradio@FreeBSD.org COMMENT= Ham Radio rig control program, cooperates with fldigi WWW= http://www.w1hkj.com/flrig-help/index.html -IGNORE_FreeBSD_12= no hid support +BROKEN_FreeBSD_12= no hid support LICENSE= GPLv2 diff --git a/comms/flrig/distinfo b/comms/flrig/distinfo index 8e1960a5c115..5fe54d681afb 100644 --- a/comms/flrig/distinfo +++ b/comms/flrig/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1697039885 -SHA256 (flrig-2.0.04.tar.gz) = f80710ee5d515c50d556b698c9205413ff990b208e3223362f82f245716ab947 -SIZE (flrig-2.0.04.tar.gz) = 1108760 +TIMESTAMP = 1703941314 +SHA256 (flrig-2.0.05.tar.gz) = 31cdc025f05db489fd9ba087eb4d8c8f85168fc3aa9cf95fe488b02d780c62b0 +SIZE (flrig-2.0.05.tar.gz) = 1112204 diff --git a/comms/flrig/files/patch-src_cmedia_cmedia.cxx b/comms/flrig/files/patch-src_cmedia_cmedia.cxx deleted file mode 100644 index 4e2e1b9b8583..000000000000 --- a/comms/flrig/files/patch-src_cmedia_cmedia.cxx +++ /dev/null @@ -1,13 +0,0 @@ ---- src/cmedia/cmedia.cxx.orig 2023-09-23 00:17:45 UTC -+++ src/cmedia/cmedia.cxx -@@ -42,7 +42,9 @@ - #include - #include - # ifndef __APPLE__ --# include -+# ifndef __FreeBSD__ -+# include -+# endif - # endif - #endif - diff --git a/comms/flrig/files/patch-src_cmedia_hid__lin.cxx b/comms/flrig/files/patch-src_cmedia_hid__lin.cxx deleted file mode 100644 index 20a1a5619c4e..000000000000 --- a/comms/flrig/files/patch-src_cmedia_hid__lin.cxx +++ /dev/null @@ -1,26 +0,0 @@ ---- src/cmedia/hid_lin.cxx.orig 2023-10-05 17:27:21 UTC -+++ src/cmedia/hid_lin.cxx -@@ -35,12 +35,22 @@ - #include - #include - -+#ifdef __FreeBSD__ -+typedef unsigned short uint16_t; -+typedef unsigned char __u8; -+typedef unsigned long __u32; -+#include -+/* These are from linux */ -+#define BUS_USB 0x03 -+#define BUS_BLUETOOTH 0x05 -+#include -+#else - /* Linux */ - #include - #include - #include - #include -- -+#endif - #include "hidapi.h" - - /* Definitions from linux/hidraw.h. Since these are new, some distros diff --git a/comms/flrig/files/patch-src_cmedia_tmate2.cxx b/comms/flrig/files/patch-src_cmedia_tmate2.cxx deleted file mode 100644 index f9526c9d4643..000000000000 --- a/comms/flrig/files/patch-src_cmedia_tmate2.cxx +++ /dev/null @@ -1,13 +0,0 @@ ---- src/cmedia/tmate2.cxx.orig 2022-03-21 23:27:19 UTC -+++ src/cmedia/tmate2.cxx -@@ -45,7 +45,9 @@ - #include - #include - # ifndef __APPLE__ --# include -+# ifndef __FreeBSD__ -+# include -+# endif - # endif - #endif - diff --git a/comms/flrig/files/patch-src_support_dialogs.cxx b/comms/flrig/files/patch-src_support_dialogs.cxx deleted file mode 100644 index ee0be91120f6..000000000000 --- a/comms/flrig/files/patch-src_support_dialogs.cxx +++ /dev/null @@ -1,37 +0,0 @@ ---- src/support/dialogs.cxx.orig 2023-10-11 20:05:33 UTC -+++ src/support/dialogs.cxx -@@ -179,7 +179,7 @@ void init_port_combos() - add_combos(gbuf.gl_pathv[j]); - } - globfree(&gbuf); -- -+#ifndef __FreeBSD__ - glob("/dev/serial/by-id/*", 0, NULL, &gbuf); - for (size_t j = 0; j < gbuf.gl_pathc; j++) { - if ( !(stat(gbuf.gl_pathv[j], &st) == 0 && S_ISCHR(st.st_mode)) || -@@ -189,7 +189,7 @@ void init_port_combos() - add_combos(gbuf.gl_pathv[j]); - } - globfree(&gbuf); -- -+#endif - glob("/dev/tty*", 0, NULL, &gbuf); - for (size_t j = 0; j < gbuf.gl_pathc; j++) { - if ( !(stat(gbuf.gl_pathv[j], &st) == 0 && S_ISCHR(st.st_mode)) || -@@ -296,9 +296,15 @@ out: - } - - const char* tty_fmt[] = { -- "/dev/ttyS%u", -+#ifndef __FreeBSD__ - "/dev/ttyUSB%u", -+ "/dev/ttyS%u", - "/dev/usb/ttyUSB%u" -+#endif -+#ifdef __FreeBSD__ -+ "/dev/cuau%u", -+ "/dev/cuaU%u", -+#endif - }; - LOG_QUIET("%s", "Serial port discovery via 'stat'"); - for (size_t i = 0; i < sizeof(tty_fmt)/sizeof(*tty_fmt); i++) {