git: 40efd24799a5 - main - security/krb5-12{0,1}: Consolidate KRB5_{PDF,HTML} options into canonical DOCS option

The branch main has been updated by michaelo:

URL: https://cgit.FreeBSD.org/ports/commit/?id=40efd24799a566015d0e093273d52ac82bf58e43

commit 40efd24799a566015d0e093273d52ac82bf58e43
Author:     Michael Osipov <michaelo@FreeBSD.org>
AuthorDate: 2025-06-10 09:34:50 +0000
Commit:     Michael Osipov <michaelo@FreeBSD.org>
CommitDate: 2025-06-10 13:19:42 +0000

    security/krb5-12{0,1}: Consolidate KRB5_{PDF,HTML} options into canonical DOCS option
    
    Let users globally decide whether they want to have these docs in their ports.
    
    PR:             287340
    Approved by:    otis (mentor), cy (maintainer)
    Differential Revision:  https://reviews.freebsd.org/D50775
---
 UPDATING                   |  7 +++++++
 security/krb5-120/Makefile | 13 +++----------
 security/krb5-121/Makefile | 13 +++----------
 3 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/UPDATING b/UPDATING
index 13e6da53db10..f38c0e131d0b 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,13 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20250610:
+  AFFECTS: users of security/krb5-12{0,1}
+  AUTHOR: michaelo@FreeBSD.org
+
+  The KRB5_{PDF,HTML} options have been consolidated into canonical DOCS option
+  to match the name with other ports and the description from Mk/bsd.options.desc.mk.
+
 20250606:
   AFFECTS: users of net-mgmt/unifi9
   AUTHOR: ronald@FreeBSD.org
diff --git a/security/krb5-120/Makefile b/security/krb5-120/Makefile
index 077e438d4862..5586dcae1715 100644
--- a/security/krb5-120/Makefile
+++ b/security/krb5-120/Makefile
@@ -42,13 +42,11 @@ CPE_PRODUCT=		kerberos
 
 FLAVORS=		default ldap
 
-OPTIONS_DEFINE=		EXAMPLES NLS KRB5_PDF KRB5_HTML DNS_FOR_REALM LDAP LMDB
-OPTIONS_DEFAULT=	KRB5_PDF KRB5_HTML READLINE
+OPTIONS_DEFINE=		EXAMPLES NLS DOCS DNS_FOR_REALM LDAP LMDB
+OPTIONS_DEFAULT=	DOCS READLINE
 OPTIONS_RADIO=		CMD_LINE_EDITING
 OPTIONS_RADIO_CMD_LINE_EDITING=	READLINE LIBEDIT LIBEDIT_BASE
 CMD_LINE_EDITING_DESC=	Command line editing for kadmin and ktutil
-KRB5_PDF_DESC=		Install krb5 PDF documentation
-KRB5_HTML_DESC=		Install krb5 HTML documentation
 DNS_FOR_REALM_DESC=	Enable DNS lookups for Kerberos realm names
 DNS_FOR_REALM_CONFIGURE_ENABLE=	dns-for-realm
 LDAP=			Enable LDAP support
@@ -117,10 +115,8 @@ CONFIGURE_ARGS+=	--program-transform-name="${PROGRAM_TRANSFORM_NAME}"
 
 .include <bsd.port.pre.mk>
 
-post-install:
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/krb5
-# html documentation
-.if ${PORT_OPTIONS:MKRB5_PDF}
 	cd ${WRKDIR}/${PORTNAME}-${PORTVERSION}; \
 	pdf_files=`${FIND} doc/pdf ! -type d`; \
 	pdf_dirs=`${FIND} doc/pdf -type d`; \
@@ -134,8 +130,6 @@ post-install:
 	for i in $${pdf_dirs}; do \
 		${ECHO_CMD} @dir share/doc/krb5/$${i} >> ${TMPPLIST}; \
 	done | ${TAIL} -r >> ${TMPPLIST}
-.endif
-.if ${PORT_OPTIONS:MKRB5_HTML}
 	cd ${WRKDIR}/${PORTNAME}-${PORTVERSION}; \
 	html_files=`${FIND} doc/html ! -type d | ${GREP} -v /_sources`; \
 	html_dirs=`${FIND} doc/html -type d | ${GREP} -v /_sources`; \
@@ -149,7 +143,6 @@ post-install:
 	for i in $${html_dirs}; do \
 		${ECHO_CMD} @dir share/doc/krb5/$${i} >> ${TMPPLIST}; \
 	done | ${TAIL} -r >> ${TMPPLIST}
-.endif
 	${ECHO_CMD} @dir share/doc/krb5 >> ${TMPPLIST}
 
 post-install-LDAP-on:
diff --git a/security/krb5-121/Makefile b/security/krb5-121/Makefile
index 8aca1ba8cfed..237691cdbc61 100644
--- a/security/krb5-121/Makefile
+++ b/security/krb5-121/Makefile
@@ -42,13 +42,11 @@ CPE_PRODUCT=		kerberos
 
 FLAVORS=		default ldap
 
-OPTIONS_DEFINE=		EXAMPLES NLS KRB5_PDF KRB5_HTML DNS_FOR_REALM LDAP LMDB
-OPTIONS_DEFAULT=	KRB5_PDF KRB5_HTML READLINE
+OPTIONS_DEFINE=		EXAMPLES NLS DOCS DNS_FOR_REALM LDAP LMDB
+OPTIONS_DEFAULT=	DOCS READLINE
 OPTIONS_RADIO=		CMD_LINE_EDITING
 OPTIONS_RADIO_CMD_LINE_EDITING=	READLINE LIBEDIT LIBEDIT_BASE
 CMD_LINE_EDITING_DESC=	Command line editing for kadmin and ktutil
-KRB5_PDF_DESC=		Install krb5 PDF documentation
-KRB5_HTML_DESC=		Install krb5 HTML documentation
 DNS_FOR_REALM_DESC=	Enable DNS lookups for Kerberos realm names
 DNS_FOR_REALM_CONFIGURE_ENABLE=	dns-for-realm
 LDAP=			Enable LDAP support
@@ -117,10 +115,8 @@ CONFIGURE_ARGS+=	--program-transform-name="${PROGRAM_TRANSFORM_NAME}"
 
 .include <bsd.port.pre.mk>
 
-post-install:
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/krb5
-# html documentation
-.if ${PORT_OPTIONS:MKRB5_PDF}
 	cd ${WRKDIR}/${PORTNAME}-${PORTVERSION}; \
 	pdf_files=`${FIND} doc/pdf ! -type d`; \
 	pdf_dirs=`${FIND} doc/pdf -type d`; \
@@ -134,8 +130,6 @@ post-install:
 	for i in $${pdf_dirs}; do \
 		${ECHO_CMD} @dir share/doc/krb5/$${i} >> ${TMPPLIST}; \
 	done | ${TAIL} -r >> ${TMPPLIST}
-.endif
-.if ${PORT_OPTIONS:MKRB5_HTML}
 	cd ${WRKDIR}/${PORTNAME}-${PORTVERSION}; \
 	html_files=`${FIND} doc/html ! -type d | ${GREP} -v /_sources`; \
 	html_dirs=`${FIND} doc/html -type d | ${GREP} -v /_sources`; \
@@ -149,7 +143,6 @@ post-install:
 	for i in $${html_dirs}; do \
 		${ECHO_CMD} @dir share/doc/krb5/$${i} >> ${TMPPLIST}; \
 	done | ${TAIL} -r >> ${TMPPLIST}
-.endif
 	${ECHO_CMD} @dir share/doc/krb5 >> ${TMPPLIST}
 
 post-install-LDAP-on: