git: 0d56f2f09390 - main - comms/flrig: Update to 2.0.05
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 30 Dec 2023 15:31:03 UTC
The branch main has been updated by db:
URL: https://cgit.FreeBSD.org/ports/commit/?id=0d56f2f0939038e79f75ee772f94a0e50069b538
commit 0d56f2f0939038e79f75ee772f94a0e50069b538
Author: Diane Bruce <db@FreeBSD.org>
AuthorDate: 2023-12-30 15:29:21 +0000
Commit: Diane Bruce <db@FreeBSD.org>
CommitDate: 2023-12-30 15:29:21 +0000
comms/flrig: Update to 2.0.05
2023-12-29 dave-w1hkj <w1hkj@bellsouth.net>
fb72498d: MinGW compile warning
e2ce0334: FT 891/991/991A
afb6943c: TMD710
35a47a1e: vector interpolator
2023-12-16 Philip Rose GM3ZZA <gm3zza@btinternet.com>
af9b8bd5: IC705
2023-12-16 dave-w1hkj <w1hkj@bellsouth.net>
b323c9ba: qmx14
8b6b0d8f: mingw64 warnings
2023-12-08 Michael Black <mdblack98@yahoo.com>
bc7eba83: XMLrpc get_swr
2023-12-05 dave-w1hkj <w1hkj@bellsouth.net>
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 <mdblack98@yahoo.com>
39aee6d1: gcc 13 mingw fixes
2023-11-10 dave-w1hkj <w1hkj@bellsouth.net>
b8d35aa9: SWR xmlrpc
2023-10-28 db VA3DB <db@db.net>
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 <termios.h>
- #include <glob.h>
- # ifndef __APPLE__
--# include <error.h>
-+# ifndef __FreeBSD__
-+# include <error.h>
-+# 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 <fcntl.h>
- #include <poll.h>
-
-+#ifdef __FreeBSD__
-+typedef unsigned short uint16_t;
-+typedef unsigned char __u8;
-+typedef unsigned long __u32;
-+#include <dev/hid/hidraw.h>
-+/* These are from linux */
-+#define BUS_USB 0x03
-+#define BUS_BLUETOOTH 0x05
-+#include <libudev.h>
-+#else
- /* Linux */
- #include <linux/hidraw.h>
- #include <linux/version.h>
- #include <linux/input.h>
- #include <libudev.h>
--
-+#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 <termios.h>
- #include <glob.h>
- # ifndef __APPLE__
--# include <error.h>
-+# ifndef __FreeBSD__
-+# include <error.h>
-+# 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++) {