From nobody Thu Oct 12 12:45:14 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 4S5q9Q6q2zz4wK1Q; Thu, 12 Oct 2023 12:45:14 +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 4S5q9Q4H5Mz4GPK; Thu, 12 Oct 2023 12:45:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697114714; 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=Eu8PJ9IiMPM7k8NQS7OKeuxsZeJOazKm5Mof+41ICuY=; b=DiqdEb96yR93WYSlVJCYtMxXLT7EwRntchEJP/tVL+UqB/WLKu8R91/IgBwoiTdM9MKRAY ynJVKYUO9IKKTZk6To1RQ4Tuk2XqG0XTvEnGs1w/x99dCYAuWZeGqxS6BDJOGC9H8tEeA8 w+bqJ783VbmrlTUTISQk4+4D3OnpcBoG+eFPD85khWvhAiNjQsr+xaS0smzEPqyH8KuN0V bQYdWahZ9MjohtEqUXoa/k0S0DYGY1ukSKyctvmjRFY7KNjxWsbfzEHoHVmoovyHV+maPI P5wPD4UiFK9Jpwy9eAVmyG5cGNPTuCKeFtq/XjPUmqTUfmsMHy0hhsxIwL8hIg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697114714; a=rsa-sha256; cv=none; b=ffZacb5Z3g7+8QypO9uJoyojwlCN59QfD+0F4bYE63pvBYT98O2Sd+2nIop+mBpYJablXm htSsRHYAQ94jmESbDaMUrs2Kez1m49RpzhwaJM0cABUkF2ChjBz8RtsF5pwbigKsNTC0AY WDBLmU/Y3e11ZE6DC0ttXSjVjx5mnemW59+GC8YuqeWn6WOC9JUbfijrq1ylHgCjITr2bl fAQ8G4IHakgcWrI7Oerkk+OVNxZC5DqX7QSqCyjzwsioR/NKdZ0R7uBBOOrYsVR496J3Sd 34V6uTKDZTGcc49sjfL3ccGw8Vw9jhSMHA4qtnvjBhyO6NegBCHhD73zkfwDVA== 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=1697114714; 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=Eu8PJ9IiMPM7k8NQS7OKeuxsZeJOazKm5Mof+41ICuY=; b=pV+wifa6YPD527KE87P8kAVYpxynY9HfZWHtHqifjkcOk7zt0T9d7QwYd1H7Fwli1gwgDb PvnjFw1ySjC8Hm70zGgpwn9+4gyKQzqAdEXRW81FvHm3FFuLxKhBdcF/fn+e3p/KLpYlt/ /5fjtcr8lDFwjYemo+p8ihNMkWE2vP8a/iYcbNe3Z6nazgbaHmOhTaBKj3uas3d8z6EDXt GeggAdhUT6D6Y+7sHOiR3VV04AKw4saL3k+tHAmT+IygGmRQVPRg5oxz3HK/hFCXe626HJ Jmt9l2rGQ0PuT5UdhakVhKH/ov44wBof0AQnbNJLI16eDygaF5KMKVCJaUu4vw== 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 4S5q9Q3NXRz14Gw; Thu, 12 Oct 2023 12:45:14 +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 39CCjE8A022927; Thu, 12 Oct 2023 12:45:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39CCjEJ6022924; Thu, 12 Oct 2023 12:45:14 GMT (envelope-from git) Date: Thu, 12 Oct 2023 12:45:14 GMT Message-Id: <202310121245.39CCjEJ6022924@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: eb08338528c3 - main - comms/flrig: Update to latest 2.0.04 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: eb08338528c3c4416a95baff9cc8332445b2c523 Auto-Submitted: auto-generated The branch main has been updated by db: URL: https://cgit.FreeBSD.org/ports/commit/?id=eb08338528c3c4416a95baff9cc8332445b2c523 commit eb08338528c3c4416a95baff9cc8332445b2c523 Author: Diane Bruce AuthorDate: 2023-10-12 12:39:29 +0000 Commit: Diane Bruce CommitDate: 2023-10-12 12:39:29 +0000 comms/flrig: Update to latest 2.0.04 In tree version was very out of date. Major change here is the addition of hid support using devel/libudev-devd Additional rigs are now supported few other highlights. 2023-02-04 Leif Sawyer c26976a8: Rescale dialogs b4c30d05: fltk 1.4 update 2023-02-02 dave-w1hkj 7cf542ae: cwio timing d30e60ca: Warnings --- comms/flrig/Makefile | 11 ++++---- 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, 98 insertions(+), 8 deletions(-) diff --git a/comms/flrig/Makefile b/comms/flrig/Makefile index aff02a5d7393..86103810d550 100644 --- a/comms/flrig/Makefile +++ b/comms/flrig/Makefile @@ -1,8 +1,8 @@ PORTNAME= flrig -PORTVERSION= 1.3.54 -PORTREVISION= 2 +PORTVERSION= 2.0.04 CATEGORIES= comms hamradio -MASTER_SITES= SF/fldigi/${PORTNAME} +MASTER_SITES= SF/fldigi/${PORTNAME} \ + http://www.w1hkj.com/files/fldigi/ MAINTAINER= hamradio@FreeBSD.org COMMENT= Ham Radio rig control program, cooperates with fldigi @@ -12,9 +12,10 @@ LICENSE= GPLv2 LIB_DEPENDS= libpng.so:graphics/png \ libfontconfig.so:x11-fonts/fontconfig \ - libfltk.so:x11-toolkits/fltk + libfltk.so:x11-toolkits/fltk \ + libudev.so:devel/libudev-devd -USES= gmake jpeg xorg +USES= gmake jpeg xorg desktop-file-utils USE_XORG= x11 xrender xcursor xfixes xext xft xinerama GNU_CONFIGURE= yes diff --git a/comms/flrig/distinfo b/comms/flrig/distinfo index 33953f36cd44..8e1960a5c115 100644 --- a/comms/flrig/distinfo +++ b/comms/flrig/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1612452402 -SHA256 (flrig-1.3.54.tar.gz) = cf0d318b80159e6f158bfa16921d770bd06369b38a52d65a5662cdfbecca1ae8 -SIZE (flrig-1.3.54.tar.gz) = 891644 +TIMESTAMP = 1697039885 +SHA256 (flrig-2.0.04.tar.gz) = f80710ee5d515c50d556b698c9205413ff990b208e3223362f82f245716ab947 +SIZE (flrig-2.0.04.tar.gz) = 1108760 diff --git a/comms/flrig/files/patch-src_cmedia_cmedia.cxx b/comms/flrig/files/patch-src_cmedia_cmedia.cxx new file mode 100644 index 000000000000..4e2e1b9b8583 --- /dev/null +++ b/comms/flrig/files/patch-src_cmedia_cmedia.cxx @@ -0,0 +1,13 @@ +--- 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 new file mode 100644 index 000000000000..20a1a5619c4e --- /dev/null +++ b/comms/flrig/files/patch-src_cmedia_hid__lin.cxx @@ -0,0 +1,26 @@ +--- 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 new file mode 100644 index 000000000000..f9526c9d4643 --- /dev/null +++ b/comms/flrig/files/patch-src_cmedia_tmate2.cxx @@ -0,0 +1,13 @@ +--- 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 new file mode 100644 index 000000000000..ee0be91120f6 --- /dev/null +++ b/comms/flrig/files/patch-src_support_dialogs.cxx @@ -0,0 +1,37 @@ +--- 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++) {