From nobody Thu Apr 06 21:49:37 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 4PswBp375cz43Qj5; Thu, 6 Apr 2023 21:49:38 +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 4PswBp1W8Wz4G7L; Thu, 6 Apr 2023 21:49:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680817778; 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=Guslor7IoOoo+XiYOS6OZWNhXePoDM31h+4WH3pAjBc=; b=bCg/rndK3+RkjC1VV0UJlxuMdvQWKJvBNEGZ4DeUDfkOc8MyqzY2swwIliGvzRUC6FKVOc T2j3ok91Aw78Bxc3G2z/ASu0bN+f+rfUZyOKdJfrIlELooCcpg72Ahacxv+nYCBIbQKxWg Nh+SJEDi7IqwPXsQoH1PrJ2ntAiV9WlcBOgIynAWNpcbcKXBBgbBxlxCEeLobYMfLqqyG2 F0LIUHqNsI+npbARZ9JCDA467q2v9Sd7jiTqxDkm8JnUP+5jQhDyMDcRqHk8KN+o1Yn2b/ qLxpy+EtS8jADmlR9vCkDFuTIKpiB1u0zfWIDkp/jh/6oguk7qyOb3rvr/Eznw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680817778; 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=Guslor7IoOoo+XiYOS6OZWNhXePoDM31h+4WH3pAjBc=; b=r/3Rv+l5OlVtH78kh005pNdBdQ9ZXLGZXBCc7RzcRFa9gA2AVEYMOlm++LIS454thM5jA+ cdtwNynH8O/z0XChV7xcm83H5ux9FW9VdPJMQdryItJ2miSU0cCTm3Pg006fhfu9yVtOjs LoluAavY2uXuS8iSfXRIF9f14RYM8iDOLxlU+JR57w2qYjWEsUScu3XnF5pDVPscP1FB6C Lmpbd6EdTwvZ1g1ytlXozwOGtahBK72uFk1BtanT9Yz0Kyx04H01e0SeP0CiigG06Cu+OK OFfmXSfarBzH7HtfTCqlZWctZrWjZobmh2mRXUr3eJM3DJWqt19nkpKen9rQow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680817778; a=rsa-sha256; cv=none; b=A0XzUPraBnJ5I73D2mNJ9J6iyndHITQsgvIOpqBYrJK/uJdGNZh3awcuIt2ttjNtvspg4O MsPYE/wLDpWd1/C3r8QIeaVbkbbzvtQzf4W87xY0lwr/GcaPlQcvtMocaLHQ5zbMcCxKGq bTDs192tiESnfERQiGCUSzLvZNUBPwBtEtYdATL9tHI2IB85fpkDKU+91Igl78alMgJDCo xpzNSXLKTpOzdVq4zOQrnx2BGVktXhdsgQjY4aWn2BtISN/VfR8/Pp/mIdl/7LlMdOD6He NofC352JA3bAtMnMg1IZQjfRU8URpSK0Nbqxu62meIRyL6Bat0fEXqjkvCIDeg== 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 4PswBn7558zLFk; Thu, 6 Apr 2023 21:49:37 +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 336Lnbtx072021; Thu, 6 Apr 2023 21:49:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 336Lnbsa072020; Thu, 6 Apr 2023 21:49:37 GMT (envelope-from git) Date: Thu, 6 Apr 2023 21:49:37 GMT Message-Id: <202304062149.336Lnbsa072020@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: 3d2be436ee8b - main - 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/main X-Git-Reftype: branch X-Git-Commit: 3d2be436ee8b8269c3e2a63fe42616705b2270dd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=3d2be436ee8b8269c3e2a63fe42616705b2270dd commit 3d2be436ee8b8269c3e2a63fe42616705b2270dd Author: Cy Schubert AuthorDate: 2023-04-06 21:44:20 +0000 Commit: Cy Schubert CommitDate: 2023-04-06 21:45:49 +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 --- 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}