From nobody Mon May 09 18:11:29 2022 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 B36971ADD5B8; Mon, 9 May 2022 18:11:29 +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 4Kxq4K4PTxz3F8x; Mon, 9 May 2022 18:11:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652119889; 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=u3cLk2hbp1y/xF4jgElrTR2XjqmvHVuEEqKccrHuwvc=; b=RRBSN84WA+YuPJnImrVg3CXbNq8Yn5vrB5hfIb95dS3qFk83afYodtc22t9tgkZGLliEqd cqR+9Tl3jlyIqvSd0ssckVji163wNjgX0YazfF8qBKcACf/vZyQPl+VXw8RbEjAkIsBzbx xevyeaYH7ABK13LTptu15B202VpbxFU9tRzRfRCEp7Eh2ZYLDUjtz51Nc54Tth5uWJgOM7 gSGr+4M3WUBy1xZv67xfGDHb3/aac3fiXmhuSKHj7rxRoNgRlkQlRs9bDzhap+WXnbQAX1 u0UVP1fyJX5h5iajrndM6gsTAZJKVjglB7Yl2Z1k4H3TnKxgZwYH4xqtpPdJ6Q== 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 7588E15B69; Mon, 9 May 2022 18:11:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 249IBTHB086388; Mon, 9 May 2022 18:11:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 249IBTIj086387; Mon, 9 May 2022 18:11:29 GMT (envelope-from git) Date: Mon, 9 May 2022 18:11:29 GMT Message-Id: <202205091811.249IBTIj086387@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: 64080a2f32ba - main - sysutils/nut*: Correctly use libusb.so 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: cy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 64080a2f32ba282291fec3f9b4c6d37c7594b723 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652119889; 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=u3cLk2hbp1y/xF4jgElrTR2XjqmvHVuEEqKccrHuwvc=; b=iYE++ZNYpsmg0T8qTcfS/yR0yM1ODOVkzfH1pQ7hYY15SKNjXMbBbKgRUA4Iua/tZ20rnj pfYKn0j4b5E+zy374bt5Po5sPoPa2rg20ZpTgK6wlKXZ6Yg1rj38vdk4UscLdS16Imc6I7 hOJhFdQvIMfig0WaD51vXV4oeFcLLdRBQDipuZpiM6nOOCMuuzkmKfo1OtTDwEJZc+gzNG AcRMo2oJQB6rqbACh3NqR5FHNQ0Wy/oJ/cPZ6MQ+bd9x6P2R8WxRBcE76vJvCoF/klyBPw Tz2O5ZMp9rWkeqOF+GjaMVsxlE9xsDvi70pC1BilUzvVklbsXDplhDRtTUka0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652119889; a=rsa-sha256; cv=none; b=L0PVP602rPbeROvpRRvdbPyAOBq3Ek1jaUmyBSo+/X5A2Bt5EY5Uw4eu5FgFN1onSn+ieA e4+U8Ltdflesw4nROzF4Miv7WlkOYtfGFo2fUYS0w9SyCBib+PvNTKlBoCH4hbweXMFfyn 1pV5yo2mDQE1u+z+kvDZUCtsr3vHgcfdzebESk8uWFEB4kXhjNpEnpzzNRxIcLqAsMB7Q8 H86aa+h6r2svI1OesXfMSshQM9vClQelzsww/8hOC2UHxVvQ/UZPA9XEJZBwfy+edC5yDh 1MGtOjFt4vO09caDiUpZuyPPmH03QGhFu82OIDoKA3fBnxuhjpCt5kNetYh2rA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=64080a2f32ba282291fec3f9b4c6d37c7594b723 commit 64080a2f32ba282291fec3f9b4c6d37c7594b723 Author: Cy Schubert AuthorDate: 2022-05-09 17:10:33 +0000 Commit: Cy Schubert CommitDate: 2022-05-09 17:49:29 +0000 sysutils/nut*: Correctly use libusb.so FreeBSD has no libusb-1.0.so, even though pkgconf identifies it as such. The ABI is the same but the name is different. Reported by: Paul Arakelyan --- sysutils/nut-devel/Makefile | 2 +- .../files/patch-tools_nut-scanner_nutscan-init.c | 16 ++++++++++++++++ sysutils/nut/Makefile | 2 +- .../nut/files/patch-tools_nut-scanner_nutscan-init.c | 16 ++++++++++++++++ 4 files changed, 34 insertions(+), 2 deletions(-) diff --git a/sysutils/nut-devel/Makefile b/sysutils/nut-devel/Makefile index 7aea1a1f7a28..d72db98f03a0 100644 --- a/sysutils/nut-devel/Makefile +++ b/sysutils/nut-devel/Makefile @@ -2,7 +2,7 @@ PORTNAME= nut PORTVERSION= ${NUT_COMMIT_DATE} -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= sysutils PKGNAMESUFFIX= -devel # MASTER_SITES= http://www.networkupstools.org/source/${PORTVERSION:R}/ diff --git a/sysutils/nut-devel/files/patch-tools_nut-scanner_nutscan-init.c b/sysutils/nut-devel/files/patch-tools_nut-scanner_nutscan-init.c new file mode 100644 index 000000000000..bc341494ce73 --- /dev/null +++ b/sysutils/nut-devel/files/patch-tools_nut-scanner_nutscan-init.c @@ -0,0 +1,16 @@ +diff --git tools/nut-scanner/nutscan-init.c.orig tools/nut-scanner/nutscan-init.c +index 9ea3f5d..13f4e78 100644 +--- tools/nut-scanner/nutscan-init.c.orig ++++ tools/nut-scanner/nutscan-init.c +@@ -133,7 +133,11 @@ void nutscan_init(void) + char *libname = NULL; + #ifdef WITH_USB + #if WITH_LIBUSB_1_0 ++ #ifdef __FreeBSD__ ++ libname = get_libname("libusb.so"); ++ #else + libname = get_libname("libusb-1.0.so"); ++ #endif + #else + libname = get_libname("libusb-0.1.so"); + if (!libname) { diff --git a/sysutils/nut/Makefile b/sysutils/nut/Makefile index fcb96c79ad9d..d91fe5efc9fc 100644 --- a/sysutils/nut/Makefile +++ b/sysutils/nut/Makefile @@ -2,7 +2,7 @@ PORTNAME= nut PORTVERSION= 2.8.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= sysutils MASTER_SITES= http://www.networkupstools.org/source/${PORTVERSION:R}/ 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..bc341494ce73 --- /dev/null +++ b/sysutils/nut/files/patch-tools_nut-scanner_nutscan-init.c @@ -0,0 +1,16 @@ +diff --git tools/nut-scanner/nutscan-init.c.orig tools/nut-scanner/nutscan-init.c +index 9ea3f5d..13f4e78 100644 +--- tools/nut-scanner/nutscan-init.c.orig ++++ tools/nut-scanner/nutscan-init.c +@@ -133,7 +133,11 @@ void nutscan_init(void) + char *libname = NULL; + #ifdef WITH_USB + #if WITH_LIBUSB_1_0 ++ #ifdef __FreeBSD__ ++ libname = get_libname("libusb.so"); ++ #else + libname = get_libname("libusb-1.0.so"); ++ #endif + #else + libname = get_libname("libusb-0.1.so"); + if (!libname) {