From nobody Wed Apr 1 19:25:00 2026 X-Original-To: dev-commits-ports-main@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 4fmFLN6qMGz6YMsG for ; Wed, 01 Apr 2026 19:25:00 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fmFLN6M81z3bZq for ; Wed, 01 Apr 2026 19:25:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775071500; 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=/fRYx6wawYMREUrXxS4/9ljAUjm/iFN/1BjIt0k9pwo=; b=HBVFII6BY/PDLbwDSSGeWoXnEortuo5DBANTbWCyv0/YLvfpc/uiPgJF22KKB+bS7rNcVu JES0c0dHqGrmyW18v0ZbiGfgW3xPH6YJi6l4Ofrl0zjsP8pfy1MpmgSd35Y0OPwCeThD7T qVCa54V/4KGR11y2Xx2fQxmF9om7wAanb19xmlzmd69Nj1LimNrbIKF2wwiwH5Km+NMBJQ nMeG3QidommqQuPtQKOQcpjqW1xrrJ8zsOkEBdsQsE9GxIiWjgg4pi57ri1O3g4VZodkNA LkhzLUKxJ5h3wq3urj2aZv7GnECOyuqcGIkK9vzML+ZZyCFmnkYYoJlrIRIXlw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775071500; a=rsa-sha256; cv=none; b=Q9Wq1DdU6zViRgpfTwmOR9kHKxeoIJOXYs0KlIw2Co9zD4YypRS61nWL2aqF06rHPQZnJC B+d4RI8I8DsMIwy1nU4vRv8XXr1mHcv9pGEisaiTsXdXyGnTusFVMHp41Wb3WtqKXVMmHs oicE/0i6ydpSqBz/JQyojlqZzkoSHcVpwbjzXTJzFDlmqTTItBb6M4csuvExqEyVcmEf91 b5afZeEXToJH5V261nTxAlu0kCzoDSKtLPHde+BT2UQ/cpnQECcpooGYZlfRWdtKGnmKk7 YloJ1U6R6nWG+hbDTDdrMaVIVahitbnWArPKlbehxDBpbj02QB+QfBekt9obrw== 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=1775071500; 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=/fRYx6wawYMREUrXxS4/9ljAUjm/iFN/1BjIt0k9pwo=; b=MM/mZGQL9YNxLeoLrl4KPArS9wLyMlrJsA8jVdRDzes7rfeg/DkaSYJvpJVEW8guLEQYPU BDaVSSvkq/f2LcN8cgrBeT/9ACLhFd6irOxt9/6gJ6FSf0qEZOUqV8GY3TWHPUGMjiumNW BU5sLSDvfr1I7T5eYdtETHIZspz/EvRd77nItmWtMa6vhD+eINuLavTNsgc3rzvBe0wrW6 uA2lv2UoR7okuitAgIYrwM23Bij8sCsK38QGwSL/sRcfNh8NW9ZF9Y4Kbi3OUXo5xjDaT0 ulEdYtnVPJuzN/GugK2BX59E+4D/llNytu+pbbmuo+MrSL0ldq90wXtiLZ5ABA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fmFLN59QdzD52 for ; Wed, 01 Apr 2026 19:25:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30f95 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 01 Apr 2026 19:25:00 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: 904bc0c893ec - main - sysutils/nut: Add two missing patches List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 904bc0c893ec3474065c132749a68c7a7556af12 Auto-Submitted: auto-generated Date: Wed, 01 Apr 2026 19:25:00 +0000 Message-Id: <69cd710c.30f95.2e798a11@gitrepo.freebsd.org> The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=904bc0c893ec3474065c132749a68c7a7556af12 commit 904bc0c893ec3474065c132749a68c7a7556af12 Author: Cy Schubert AuthorDate: 2026-04-01 19:23:59 +0000 Commit: Cy Schubert 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) {