From nobody Fri Oct 15 03:15:39 2021 X-Original-To: dev-commits-ports-branches@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 9F7FB180C12A; Fri, 15 Oct 2021 03:15:39 +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 4HVrxl3xV6z3ky0; Fri, 15 Oct 2021 03:15:39 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 66C511EED7; Fri, 15 Oct 2021 03:15:39 +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 19F3FdN8036574; Fri, 15 Oct 2021 03:15:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19F3FdXN036573; Fri, 15 Oct 2021 03:15:39 GMT (envelope-from git) Date: Fri, 15 Oct 2021 03:15:39 GMT Message-Id: <202110150315.19F3FdXN036573@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Cy Schubert Subject: git: 49e3b0f6a37f - 2021Q4 - sysutils/nut: Build nut-scanner(8) List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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/2021Q4 X-Git-Reftype: branch X-Git-Commit: 49e3b0f6a37fe94381ae6c0d216e642a72907b98 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=49e3b0f6a37fe94381ae6c0d216e642a72907b98 commit 49e3b0f6a37fe94381ae6c0d216e642a72907b98 Author: Cy Schubert AuthorDate: 2021-10-14 03:06:59 +0000 Commit: Cy Schubert CommitDate: 2021-10-15 03:14:09 +0000 sysutils/nut: Build nut-scanner(8) Depend on devel/ltdl and ensure that ${LOCALBASE}/include and ${LOCALBASE}/lib are available for ./configure to detect ltdl.h and libltdl to facilitate building nut-scanner(8). PR: 259153 Reported by: emaste (cherry picked from commit 75ca0c0a1067e17e31335a0cd1c85e2432d9e51a) --- sysutils/nut/Makefile | 5 ++++- sysutils/nut/pkg-plist | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/sysutils/nut/Makefile b/sysutils/nut/Makefile index 73868507ed9c..bb9792c23ae7 100644 --- a/sysutils/nut/Makefile +++ b/sysutils/nut/Makefile @@ -2,7 +2,7 @@ PORTNAME= nut PORTVERSION= 2.7.4 -PORTREVISION= 19 +PORTREVISION= 20 CATEGORIES= sysutils MASTER_SITES= http://www.networkupstools.org/source/${PORTVERSION:R}/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -62,6 +62,9 @@ CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/nut \ --with-group=${NUT_GROUP} \ --with-dev +CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib +LIB_DEPENDS+= libltdl.so:devel/libltdl + .if ${PORT_OPTIONS:MCGI} LIB_DEPENDS+= libgd.so:graphics/gd CGIDIR?= ${PREFIX}/www/cgi-bin/${PORTNAME} diff --git a/sysutils/nut/pkg-plist b/sysutils/nut/pkg-plist index 2fd0ddea5389..c29388ae986c 100644 --- a/sysutils/nut/pkg-plist +++ b/sysutils/nut/pkg-plist @@ -20,6 +20,7 @@ @sample %%EXAMPLESDIR%%/newsyslog.sample etc/newsyslog.conf.d/nut.conf @sample %%EXAMPLESDIR%%/syslog.sample etc/syslog.d/nut %%NUT_USB%%etc/devd/nut-usb.conf +bin/nut-scanner bin/upsc bin/upscmd bin/upslog @@ -37,6 +38,10 @@ lib/libnutclient.a lib/libnutclient.so lib/libnutclient.so.0 lib/libnutclient.so.0.0.0 +lib/libnutscan.a +lib/libnutscan.so +lib/libnutscan.so.1 +lib/libnutscan.so.1.0.0 lib/libupsclient.a lib/libupsclient.so lib/libupsclient.so.4