Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 18 Jan 2026 23:11:45 +0000
From:      Vladimir Druzenko <vvd@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Cc:        Hiroo Ono <hiroo.ono+freebsd@gmail.com>
Subject:   git: 8ee7012cf61a - main - net/kea: Fix malformed manpages, improve port
Message-ID:  <696d68b1.36bdc.262e5662@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch main has been updated by vvd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=8ee7012cf61a6c638c72339e408086f803e40d8f

commit 8ee7012cf61a6c638c72339e408086f803e40d8f
Author:     Hiroo Ono <hiroo.ono+freebsd@gmail.com>
AuthorDate: 2026-01-18 23:07:44 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2026-01-18 23:11:35 +0000

    net/kea: Fix malformed manpages, improve port
    
    Manuals are malformed like:
    ----------
        kea-admin - Shell script for managing Kea databases -
    
         System Message: ERROR/3 (kea-admin.8.rst:, line 11)
                Unknown directive type "iscman".
    
            .. iscman:: kea-admin
    ----------
    
    ----------
         :program:`kea-admin`
          [command] [backend] [-h database_host] [-P database_port] [-u
         database_username] [-p [database_password]] [-n database_name] [-d
         script_directory] [-v] [-x extra_argument [-x extra_argument ...]] [-4 |
         -6] [-i input_file] [-o output_file] [-y]
    
         System Message: ERROR/3 (kea-admin.8.rst:, line 19)
                Unknown interpreted text role "program".
    ----------
    Remove directives that rst2man (py-docutils) does not understand.
    
    Improve port (no functional changes):
    - Fix warnings from portclippy.
    - Sort USES.
    - Optimize post-install.
    
    PR:             292094
    MFH:            2026Q1
    Co-authored-by: Vladimir Druzenko <vvd@FreeBSD.org>
---
 net/kea/Makefile | 44 ++++++++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/net/kea/Makefile b/net/kea/Makefile
index 28e65ad38749..a47b18345ece 100644
--- a/net/kea/Makefile
+++ b/net/kea/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	kea
 DISTVERSION=	3.0.2
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	ISC/kea/${DISTVERSION}
 
@@ -10,17 +11,13 @@ WWW=		https://kea.isc.org/
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libboost_date_time.so:devel/boost-libs \
-		liblog4cplus.so:devel/log4cplus
-
-USES=		compiler:c++11-lang cpe iconv pathfix ssl python tar:xz meson pkgconfig cmake:indirect shebangfix
-MESON_ARGS=	--auto-features=disabled \
-		-Dcrypto=openssl \
-		-Dnetconf=disabled
-
 BUILD_DEPENDS=	googletest>0:devel/googletest \
 		rst2man:textproc/py-docutils@${PY_FLAVOR}
+LIB_DEPENDS=	libboost_date_time.so:devel/boost-libs \
+		liblog4cplus.so:devel/log4cplus
 
+USES=		cmake:indirect compiler:c++11-lang cpe iconv meson pathfix \
+		pkgconfig python shebangfix ssl tar:xz
 CPE_VENDOR=	isc
 CPE_VERSION=	${DISTVERSION:C/-.*//}
 .if ${DISTVERSION:M*-*}
@@ -30,12 +27,16 @@ CPE_UPDATE=	${DISTVERSION:C/.*-//:tl}
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	${PORTNAME}
 
-PORTDOCS=	AUTHORS CONTRIBUTING.md COPYING ChangeLog README SECURITY.md \
-		code_of_conduct.md examples platforms.rst
-
 SHEBANG_GLOB=	*.py *.in
 python_OLD_CMD+=@PYTHON@
 
+MESON_ARGS=	--auto-features=disabled \
+		-Dcrypto=openssl \
+		-Dnetconf=disabled
+
+PORTDOCS=	AUTHORS CONTRIBUTING.md COPYING ChangeLog README SECURITY.md \
+		code_of_conduct.md examples platforms.rst
+
 OPTIONS_DEFINE=	DOCS MYSQL PGSQL
 OPTIONS_SUB=	yes
 
@@ -51,16 +52,19 @@ PGSQL_SUB_LIST_OFF=	REQ_PGSQL=""
 PGSQL_VARS=		WANT_PGSQL=client
 
 post-build:
-	cd ${WRKSRC}/doc/sphinx/man; \
-	for i in *.8.rst; do rst2man $$i > $$(basename $$i .rst); done
+	(cd ${WRKSRC}/doc/sphinx/man; \
+	for i in *.8.rst; do \
+		${REINPLACE_CMD} -e 's|iscman::||' \
+			-e 's|:manpage:||g' -e 's|:program:||' $$i; \
+		rst2man $$i > $$(basename $$i .rst); \
+	done)
 
 post-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/kea ${STAGEDIR}/var/db/kea \
-	${STAGEDIR}/var/run/kea
-	@${RM} -rf ${STAGEDIR}${PREFIX}/var
-	@cd ${WRKSRC}/doc/sphinx/man; \
-	${CP} *.8 ${STAGEDIR}${PREFIX}/share/man/man8
-	@cd ${WRKSRC}/_build/src/bin/keactrl; \
-	for i in *.conf; do ${CP} $$i ${STAGEDIR}${PREFIX}/etc/kea/$$i.sample; done
+	@${MKDIR} ${STAGEDIR}${ETCDIR} ${STAGEDIR}/var/db/kea ${STAGEDIR}/var/run/kea
+	${INSTALL_MAN} ${WRKSRC}/doc/sphinx/man/*.8 ${STAGEDIR}${PREFIX}/share/man/man8
+	@(cd ${WRKSRC}/_build/src/bin/keactrl; \
+	for i in *.conf; do \
+		${INSTALL_DATA} $$i ${STAGEDIR}${ETCDIR}/$$i.sample; \
+	done)
 
 .include <bsd.port.mk>


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?696d68b1.36bdc.262e5662>