freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Michael Osipov
2025-06-10 11:34:50 +02:00
parent 1a584faadb
commit 40efd24799
3 changed files with 13 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UPDATING
+7
View File
@@ -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
security/krb5-120/Makefile
+3 -10
View File
@@ -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:
security/krb5-121/Makefile
+3 -10
View File
@@ -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: