From nobody Thu Apr 06 22:11:02 2023 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 4PswgW0G7Xz43Rtj; Thu, 6 Apr 2023 22:11:03 +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 4PswgV69qKz3Hyb; Thu, 6 Apr 2023 22:11:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680819062; 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=1PhzBtjdGJMcKq3MJe9vak3DXYwiegdZlvxcc8hkt40=; b=UKaFtwh20B4LbBYwW8aw0Q5TIDE4I7X1/w0VqQmT1VuCpsZTP6waDLU2BVgigGbsuNDwRi RJF5/dEmOEJBUitMqqqaJXRKUQNU0C3de72Dm5LQjfCkzrbVeQitojGoLOCF1YkHdkul3U AX9lDXURuK0Dbd6HptbJj1Uwr5A+Ge6uks2PIa0jtmCV4yo7+XZOW+t+HVscD1CTPS/0rZ gxEdyr2Xcm9ndGZjmgkKG+I6wT8Z3UciFdjz5ekvCa6CHqek4WBTX/zkGWBApO/jzRU/2a voP0Uo+fDlNUNPQmfota17Eb+1GYe23yu0v9r4GS/QsDBxpZEW/VZHNd0QxAoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680819062; 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=1PhzBtjdGJMcKq3MJe9vak3DXYwiegdZlvxcc8hkt40=; b=hbMHml+y1I7n5xddTd1n/MQadNzD5jBb9YrKqOPdSieY74pRso9Wc/+kjM+A+UZLf42P2O WRFPDjkN34G/IQeSMbk85dV0CBUOjUMWhyI4w4vdWzacNf7LSmQBAoSYBPgd6znBHO1Z9w TpbFeeovsDt22QgyBnHgQRCUvSpv7rBaRHMAMh5DVT8XjN0W7SGHFKrX+p8BoTaSS6WYvI orH2wn4205S1B6vh7nWXhmjoZJUo7swT6MdlkFWM3CDzJQVVbnJCTqk8wxuMDg11SokjRU CQcmLQcnLZlIQ+yKavBEJY4EX82RkbzFABsOy7PTHO5Ln1GxEF3FkrISOZyxXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680819062; a=rsa-sha256; cv=none; b=KnGKpS/1kuK8zXY8JJpdWs6y7wBS1m/h/SBr2/SokOfKtCqZXtNEokPRNvFSyubnQzxjbg ZmYewku/kS39aNkMNOApSCBST3UcN4BYupaUPA1ugu76F4XJYG6CXOqxu8GIqHpt2hnWFx A95Mo+pJes/795EzXIeriZx7XZ2b+4/2ltN89Cl7YLI+G2b71IAoFCbFHWvYtdt5nrbhvf eMycXVcTOC6D4t+iAXehdDImHiU6l+eC8peQL7DbzhA+DYqCdSGwCZvwExcA4HtpZ7aQTg qR3XuiTy0GOFPP7w3+O8k8iK/fnzucGZ8BiEBoMpKbbiJKewMTVcR61eBp+plA== 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 4PswgV4fSHzLYM; Thu, 6 Apr 2023 22:11:02 +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 336MB22k015311; Thu, 6 Apr 2023 22:11:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 336MB2vO015310; Thu, 6 Apr 2023 22:11:02 GMT (envelope-from git) Date: Thu, 6 Apr 2023 22:11:02 GMT Message-Id: <202304062211.336MB2vO015310@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: d8aaf784e18b - 2023Q2 - sysutils/nut-devel: Only install nut-usb.conf with USB option 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/2023Q2 X-Git-Reftype: branch X-Git-Commit: d8aaf784e18b64eb765fd0515ac4f4bcd2bba65f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q2 has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=d8aaf784e18b64eb765fd0515ac4f4bcd2bba65f commit d8aaf784e18b64eb765fd0515ac4f4bcd2bba65f Author: Cy Schubert AuthorDate: 2023-04-06 21:44:20 +0000 Commit: Cy Schubert CommitDate: 2023-04-06 21:50:54 +0000 sysutils/nut-devel: Only install nut-usb.conf with USB option ${LOCALBASE}/etc/devd/nut-usb.conf was installed unconditionally. This is incorrect. It should only be installed when the USB option is selected. MFH: 2023Q2 (cherry picked from commit 3d2be436ee8b8269c3e2a63fe42616705b2270dd) --- sysutils/nut-devel/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sysutils/nut-devel/Makefile b/sysutils/nut-devel/Makefile index 82b70c4f3cca..d16f0c9a808b 100644 --- a/sysutils/nut-devel/Makefile +++ b/sysutils/nut-devel/Makefile @@ -1,5 +1,6 @@ PORTNAME= nut PORTVERSION= ${NUT_COMMIT_DATE} +PORTREVISION= 1 CATEGORIES= sysutils PKGNAMESUFFIX= -devel # MASTER_SITES= http://www.networkupstools.org/source/${PORTVERSION:R}/ @@ -147,7 +148,9 @@ pre-configure: pre-install: @${MKDIR} ${STAGEDIR}${PREFIX}/libexec/nut +.if ${PORT_OPTIONS:MUSB} @${REINPLACE_CMD} -e 's/device-name\*/cdev/g' ${WRKSRC}/scripts/devd/nut-usb.conf +.endif post-install: @${MKDIR} ${STAGEDIR}${STATEDIR}