From nobody Thu Mar 14 13:14:33 2024 X-Original-To: dev-commits-ports-main@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 4TwSX96Dc1z5D019; Thu, 14 Mar 2024 13:14:33 +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 4TwSX942Jnz4hd6; Thu, 14 Mar 2024 13:14:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710422073; 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=ettOEBEgLRU+OTLaSYlQoj6tsuG5hCcl9Q7jCaBi5co=; b=QAs11tRp9WLv1FMia4+eKVZObC4MjE6lnw29n63fefhP9Qc3z6h0fMzpNKxaKQovMYke1P VrrJMXx/udWr+a3UBAgBRJbRIgl5jOV2liwjNARP3ryzFxIwndt/68ckXhwLOTxS7A8VRU nDkjYox/c60RWhq+PQSwHyXuGWmYfiYoKpdXlDO1m0ZKjLLfqO7ZQwY86KXfgMOB4UZ34f P81cLpR6PS3xWHzHhQhRlpMS6V8tgZOLYrUdNSD5t2c19DVJrdtjTeLlm61uWcqIBYTX1K keS/KvW6jqtV2QDABXI73AnlIhYXyv7YViq8Vj+m5DQPCYUCn/48MpHgqvDPQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710422073; a=rsa-sha256; cv=none; b=gnyGR/oijEzkD4yyvxCDfVFwiCJrS4iHArFZXxizNJ882e8JRBmx7q2nLkwKseS/1zPVQu lu07sbrTB6co5OwBAbKL/wVZRu6DCHQkothof9tMThARAjaEmXFYF0G412NJmv5+NeCTFG 6n34RorZyKwXPBgzJHRlPwirwBYLW+uZBqy0sgah+pHTdwJVU49DZMlHY2ivCZyRmoheRe Vud8IfjXgj9Kx6YPRVZ4Hw6EpBUSt3e/6VirfoiUHnQ8gtF5E7tuvUP16FQ2FgDiHv6M5o t9UtD6Z6h6M7obSMnAet6jNam1LUSh0Dq6/uUdAkoD4y82jVwQ5BEdJtXHh6kQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710422073; 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=ettOEBEgLRU+OTLaSYlQoj6tsuG5hCcl9Q7jCaBi5co=; b=KKo5dG3uh47Jj2nNh2fZJsxcjrvEuFdwVz9cPBY1Jv/PSDPsIpD3q6JmrhqvW5eumcIncW oOP+QqFReB1tWcl5Zq0Jv0GPty0OL3XLAj5uENbnzJkPwxDTEzaOzI2ZRgRRFbfeXwEujl slRCmhUFVHclCRHJNEqdZBz99UiYMM3qwUwMT2rQ7lp1qruIpZVKCddYuSMn0tLarxDwbk XPT+MYFSecrdY3ChvcpB8Lbufx9DygPYcA2xCy0v3ykK4lPhwfNFC0mKEl+YQPJWySrpWb PPUlGloSKSKvGBIr5ygMyL1skgpT2rnEHgUPzskr/Ru3Nj375Vt7rnRt8NEKRg== 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 4TwSX93f6YzSjm; Thu, 14 Mar 2024 13:14:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42EDEXbO097253; Thu, 14 Mar 2024 13:14:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42EDEXWF097250; Thu, 14 Mar 2024 13:14:33 GMT (envelope-from git) Date: Thu, 14 Mar 2024 13:14:33 GMT Message-Id: <202403141314.42EDEXWF097250@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Christian Weisgerber Subject: git: 708c87b104bb - main - net-mgmt/ipacctd: Move man pages to share/man List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: naddy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 708c87b104bb16b04995c313a7bc25954ba6e566 Auto-Submitted: auto-generated The branch main has been updated by naddy: URL: https://cgit.FreeBSD.org/ports/commit/?id=708c87b104bb16b04995c313a7bc25954ba6e566 commit 708c87b104bb16b04995c313a7bc25954ba6e566 Author: Christian Weisgerber AuthorDate: 2024-03-14 12:55:41 +0000 Commit: Christian Weisgerber CommitDate: 2024-03-14 12:55:41 +0000 net-mgmt/ipacctd: Move man pages to share/man Approved by: portmgr (blanket) --- net-mgmt/ipacctd/Makefile | 6 +----- net-mgmt/ipacctd/files/patch-man__ru_Makefile | 13 +++++++++++++ net-mgmt/ipacctd/files/patch-src_Makefile | 10 ++++++++++ net-mgmt/ipacctd/pkg-plist | 4 ++-- 4 files changed, 26 insertions(+), 7 deletions(-) diff --git a/net-mgmt/ipacctd/Makefile b/net-mgmt/ipacctd/Makefile index 42dc70c29457..0eecc4b0e244 100644 --- a/net-mgmt/ipacctd/Makefile +++ b/net-mgmt/ipacctd/Makefile @@ -1,6 +1,6 @@ PORTNAME= ipacctd PORTVERSION= 1.47 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-mgmt MASTER_SITES= LOCAL/skv @@ -11,16 +11,12 @@ LICENSE= BSD2CLAUSE USES= uidfix USE_RC_SUBR= ipacctd -MAKE_ENV= BINDIR="${PREFIX}/sbin" OPTIONS_DEFINE= DOCS post-extract: @${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC} -post-patch: - @${REINPLACE_CMD} 's,{MANDIR},{DESTDIR}$$&,' ${WRKSRC}/man_ru/Makefile - post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR}/ru ${INSTALL_DATA} ${WRKSRC}/README.ipacctd ${STAGEDIR}${DOCSDIR}/ru diff --git a/net-mgmt/ipacctd/files/patch-man__ru_Makefile b/net-mgmt/ipacctd/files/patch-man__ru_Makefile new file mode 100644 index 000000000000..5eb0968422d8 --- /dev/null +++ b/net-mgmt/ipacctd/files/patch-man__ru_Makefile @@ -0,0 +1,13 @@ +--- man_ru/Makefile.orig 2024-03-14 12:52:55 UTC ++++ man_ru/Makefile +@@ -1,8 +1,8 @@ PREFIX?= /usr/local + PREFIX?= /usr/local +-MANDIR= ${PREFIX}/man/ru.KOI8-R/man ++MANDIR= ${PREFIX}/share/man/ru.KOI8-R/man + MAN8= ipacctd.8 + + beforeinstall: +- mkdir -p ${MANDIR}8 ++ mkdir -p ${DESTDIR}${MANDIR}8 + + .include diff --git a/net-mgmt/ipacctd/files/patch-src_Makefile b/net-mgmt/ipacctd/files/patch-src_Makefile new file mode 100644 index 000000000000..bea885ec5713 --- /dev/null +++ b/net-mgmt/ipacctd/files/patch-src_Makefile @@ -0,0 +1,10 @@ +--- src/Makefile.orig 2024-03-14 12:52:32 UTC ++++ src/Makefile +@@ -8,6 +8,6 @@ MAN= ipacctd.8 + CFLAGS+= -g + + MAN= ipacctd.8 +-MANDIR= ${PREFIX}/man/man ++MANDIR= ${PREFIX}/share/man/man + + .include diff --git a/net-mgmt/ipacctd/pkg-plist b/net-mgmt/ipacctd/pkg-plist index c4fb925e2cd8..47357ab7de21 100644 --- a/net-mgmt/ipacctd/pkg-plist +++ b/net-mgmt/ipacctd/pkg-plist @@ -1,4 +1,4 @@ -man/man8/ipacctd.8.gz -man/ru.KOI8-R/man8/ipacctd.8.gz sbin/ipacctd %%PORTDOCS%%%%DOCSDIR%%/ru/README.ipacctd +share/man/man8/ipacctd.8.gz +share/man/ru.KOI8-R/man8/ipacctd.8.gz