From nobody Fri Oct 15 03:15:40 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 D8F85180BE6C; Fri, 15 Oct 2021 03:15:40 +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 4HVrxm5BJKz3kph; Fri, 15 Oct 2021 03:15:40 +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 8B9601F29B; Fri, 15 Oct 2021 03:15:40 +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 19F3Fe8k036603; Fri, 15 Oct 2021 03:15:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19F3FeZR036602; Fri, 15 Oct 2021 03:15:40 GMT (envelope-from git) Date: Fri, 15 Oct 2021 03:15:40 GMT Message-Id: <202110150315.19F3FeZR036602@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: a5c1d44aa544 - 2021Q4 - sysutils/nut-devel: 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: a5c1d44aa54422f38de3f11bb59cfd83b33e66ee Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=a5c1d44aa54422f38de3f11bb59cfd83b33e66ee commit a5c1d44aa54422f38de3f11bb59cfd83b33e66ee Author: Cy Schubert AuthorDate: 2021-10-14 03:10:06 +0000 Commit: Cy Schubert CommitDate: 2021-10-15 03:15:09 +0000 sysutils/nut-devel: 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 2f65a74419f81de566ea103f8e2d8c854d211b24) --- sysutils/nut-devel/Makefile | 5 ++++- sysutils/nut-devel/pkg-plist | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/sysutils/nut-devel/Makefile b/sysutils/nut-devel/Makefile index dfcdee60c12a..4b1d949cf972 100644 --- a/sysutils/nut-devel/Makefile +++ b/sysutils/nut-devel/Makefile @@ -2,7 +2,7 @@ PORTNAME= nut PORTVERSION= ${NUT_COMMIT_DATE} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils PKGNAMESUFFIX= -devel # MASTER_SITES= http://www.networkupstools.org/source/${PORTVERSION:R}/ @@ -69,6 +69,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 + BUILD_DEPENDS= asciidoc:textproc/asciidoc .if ${PORT_OPTIONS:MCGI} diff --git a/sysutils/nut-devel/pkg-plist b/sysutils/nut-devel/pkg-plist index c20f86209e65..2e93f9586d30 100644 --- a/sysutils/nut-devel/pkg-plist +++ b/sysutils/nut-devel/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 @@ -47,6 +48,10 @@ lib/libnutclientstub.a lib/libnutclientstub.so lib/libnutclientstub.so.1 lib/libnutclientstub.so.1.0.0 +lib/libnutscan.a +lib/libnutscan.so +lib/libnutscan.so.1 +lib/libnutscan.so.1.0.0 libdata/pkgconfig/libnutclient.pc libdata/pkgconfig/libnutscan.pc libdata/pkgconfig/libupsclient.pc