Date: Thu, 14 Mar 2024 13:14:33 GMT From: Christian Weisgerber <naddy@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 708c87b104bb - main - net-mgmt/ipacctd: Move man pages to share/man Message-ID: <202403141314.42EDEXWF097250@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by naddy: URL: https://cgit.FreeBSD.org/ports/commit/?id=708c87b104bb16b04995c313a7bc25954ba6e566 commit 708c87b104bb16b04995c313a7bc25954ba6e566 Author: Christian Weisgerber <naddy@FreeBSD.org> AuthorDate: 2024-03-14 12:55:41 +0000 Commit: Christian Weisgerber <naddy@FreeBSD.org> 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 <bsd.prog.mk> 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 <bsd.prog.mk> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202403141314.42EDEXWF097250>