Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 01 Apr 2026 19:25:00 +0000
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: 904bc0c893ec - main - sysutils/nut: Add two missing patches
Message-ID:  <69cd710c.30f95.2e798a11@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch main has been updated by cy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=904bc0c893ec3474065c132749a68c7a7556af12

commit 904bc0c893ec3474065c132749a68c7a7556af12
Author:     Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2026-04-01 19:23:59 +0000
Commit:     Cy Schubert <cy@FreeBSD.org>
CommitDate: 2026-04-01 19:24:53 +0000

    sysutils/nut: Add two missing patches
    
    Add two patches not added in dc50ab13e8b2.
    
    Fixes:          dc50ab13e8b2
    PR:             294189
---
 sysutils/nut/files/patch-scripts_Makefile                 |  8 ++++++++
 sysutils/nut/files/patch-tools_nut-scanner_nutscan-init.c | 14 ++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/sysutils/nut/files/patch-scripts_Makefile b/sysutils/nut/files/patch-scripts_Makefile
new file mode 100644
index 000000000000..0fb15d83ac33
--- /dev/null
+++ b/sysutils/nut/files/patch-scripts_Makefile
@@ -0,0 +1,8 @@
+--- scripts/Makefile.am.orig	2020-02-09 10:44:01.000000000 -0800
++++ scripts/Makefile.am	2020-03-24 19:40:01.084978000 -0700
+@@ -25,4 +25,4 @@
+     Windows/halt.c \
+     Windows/Makefile
+ 
+-SUBDIRS = augeas devd hotplug python systemd udev Solaris upsdrvsvcctl
++SUBDIRS = augeas devd hotplug python udev upsdrvsvcctl
diff --git a/sysutils/nut/files/patch-tools_nut-scanner_nutscan-init.c b/sysutils/nut/files/patch-tools_nut-scanner_nutscan-init.c
new file mode 100644
index 000000000000..bcd884c3b786
--- /dev/null
+++ b/sysutils/nut/files/patch-tools_nut-scanner_nutscan-init.c
@@ -0,0 +1,14 @@
+--- tools/nut-scanner/nutscan-init.c.orig	2024-07-17 06:41:06.000000000 -0700
++++ tools/nut-scanner/nutscan-init.c	2024-07-18 13:41:55.306142000 -0700
+@@ -216,7 +216,11 @@
+ 	}
+ #  endif	/* SOFILE_LIBUSB1 */
+ 	if (!libname) {
++#    ifdef __FreeBSD__
++		libname = get_libname("libusb.so");
++#    else
+ 		libname = get_libname("libusb-1.0" SOEXT);
++#    endif
+ 	}
+ #  ifdef SOPATH_LIBUSB1
+ 	if (!libname) {


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69cd710c.30f95.2e798a11>