Date: Sun, 9 Jun 2024 05:20:01 GMT From: Cy Schubert <cy@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 8930e017ab24 - main - net/wpa_supplicant_gui: Fix 15-CURRENT 108de784513d build Message-ID: <202406090520.4595K1I0078029@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=8930e017ab2424f8ad9526d5ec8ce16ae8ec2dbf commit 8930e017ab2424f8ad9526d5ec8ce16ae8ec2dbf Author: Cy Schubert <cy@FreeBSD.org> AuthorDate: 2024-06-09 05:18:41 +0000 Commit: Cy Schubert <cy@FreeBSD.org> CommitDate: 2024-06-09 05:19:47 +0000 net/wpa_supplicant_gui: Fix 15-CURRENT 108de784513d build On FreeBSD systems without 108de784513d the old definition will be used while on 108de784513d and newer the duplicate case will be removed. Obtained from: src 676041c41ba5 --- net/wpa_supplicant_gui/Makefile | 2 +- .../files/patch-src_utils_os__unix.c | 26 ++++++++++++---------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/net/wpa_supplicant_gui/Makefile b/net/wpa_supplicant_gui/Makefile index 68689f8c8e74..666ed2be8285 100644 --- a/net/wpa_supplicant_gui/Makefile +++ b/net/wpa_supplicant_gui/Makefile @@ -1,6 +1,6 @@ PORTNAME= wpa_supplicant_gui DISTVERSION= 2.10 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= https://w1.fi/releases/ \ LOCAL/yuri/net/wpa_supplicant_gui/:icons diff --git a/net/wpa_supplicant_gui/files/patch-src_utils_os__unix.c b/net/wpa_supplicant_gui/files/patch-src_utils_os__unix.c index ccb80bf9fbe6..612df647489e 100644 --- a/net/wpa_supplicant_gui/files/patch-src_utils_os__unix.c +++ b/net/wpa_supplicant_gui/files/patch-src_utils_os__unix.c @@ -1,13 +1,15 @@ ---- src/utils/os_unix.c.orig 2015-09-27 19:02:05 UTC -+++ src/utils/os_unix.c -@@ -23,6 +23,10 @@ - #include <mach/mach_time.h> - #endif /* __MACH__ */ - -+#ifdef __FreeBSD__ -+#define fdatasync fsync +--- src/utils/os_unix.c.orig 2022-01-16 12:51:29.000000000 -0800 ++++ src/utils/os_unix.c 2024-06-01 22:03:18.774245000 -0700 +@@ -103,10 +103,12 @@ + break; + #endif + #ifdef CLOCK_MONOTONIC ++#if !(defined(CLOCK_BOOTTIME) && CLOCK_BOOTTIME == CLOCK_MONOTONIC) + case CLOCK_MONOTONIC: + clock_id = CLOCK_REALTIME; + break; + #endif +#endif -+ - #include "os.h" - #include "common.h" - + case CLOCK_REALTIME: + return -1; + }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202406090520.4595K1I0078029>