git: 44ef3146ebad - main - security/krb5*: Fix DOCS

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Cy Schubert <cy_at_FreeBSD.org>
Date: Wed, 05 Mar 2025 06:56:41 UTC
The branch main has been updated by cy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=44ef3146ebad2d03de5017b86cb0bd94e3702704

commit 44ef3146ebad2d03de5017b86cb0bd94e3702704
Author:     Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2025-02-27 00:16:19 +0000
Commit:     Cy Schubert <cy@FreeBSD.org>
CommitDate: 2025-03-05 06:55:36 +0000

    security/krb5*: Fix DOCS
    
    Fix docs install by searching for docs in the correct source dir.
    Without this fix docs were never installed. They are installed now.
---
 security/krb5-120/Makefile    | 31 +++++++++++++------------------
 security/krb5-120/pkg-plist   |  4 ++--
 security/krb5-121/Makefile    | 30 +++++++++++++-----------------
 security/krb5-121/pkg-plist   |  4 ++--
 security/krb5-devel/pkg-plist |  4 ++--
 5 files changed, 32 insertions(+), 41 deletions(-)

diff --git a/security/krb5-120/Makefile b/security/krb5-120/Makefile
index d9dfaa94f83c..077e438d4862 100644
--- a/security/krb5-120/Makefile
+++ b/security/krb5-120/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=		krb5
 PORTVERSION=		1.20.2
-PORTREVISION=		3
+PORTREVISION=		4
 CATEGORIES=		security
 MASTER_SITES=		http://web.mit.edu/kerberos/dist/${PORTNAME}/${PORTVERSION:C/^[0-9]*\.[0-9]*/&X/:C/X\.[0-9]*$//:C/X//}/
 .if !defined(MASTERDIR)
@@ -115,42 +115,37 @@ BROKEN=			LIB_DEPENDS when using KRB5_HOME is broken
 CONFIGURE_ARGS+=	--program-transform-name="${PROGRAM_TRANSFORM_NAME}"
 .endif
 
-HTML_DOC_DIR=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/doc/html
-PDF_DOC_DIR=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/doc/pdf
-
 .include <bsd.port.pre.mk>
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/krb5
 # html documentation
 .if ${PORT_OPTIONS:MKRB5_PDF}
-	pdf_files=`${FIND} ${PDF_DOC_DIR} ! -type d`
-	pdf_dirs=`${FIND} ${PDF_DOC_DIR} -type d`
+	cd ${WRKDIR}/${PORTNAME}-${PORTVERSION}; \
+	pdf_files=`${FIND} doc/pdf ! -type d`; \
+	pdf_dirs=`${FIND} doc/pdf -type d`; \
 	for i in $${pdf_dirs}; do \
 		${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/krb5/$${i}; \
 	done; \
 	for i in $${pdf_files}; do \
-		${INSTALL_DATA} $${pdf} ${PREFIX}/share/doc/krb5/$${i}; \
+		${INSTALL_DATA} $${i} ${STAGEDIR}${PREFIX}/share/doc/krb5/$${i}; \
 		${ECHO_CMD} share/doc/krb5/$${i} >> ${TMPPLIST}; \
 	done
+	for i in $${pdf_dirs}; do \
+		${ECHO_CMD} @dir share/doc/krb5/$${i} >> ${TMPPLIST}; \
+	done | ${TAIL} -r >> ${TMPPLIST}
 .endif
 .if ${PORT_OPTIONS:MKRB5_HTML}
-	html_files=`${FIND} ${HTML_DOC_DIR} ! -type d | ${GREP} -v /_sources`
-	html_dirs=`${FIND} ${HTML_DOC_DIR} -type d | ${GREP} -v /_sources`
+	cd ${WRKDIR}/${PORTNAME}-${PORTVERSION}; \
+	html_files=`${FIND} doc/html ! -type d | ${GREP} -v /_sources`; \
+	html_dirs=`${FIND} doc/html -type d | ${GREP} -v /_sources`; \
 	for i in $${html_dirs}; do \
-		${MKDIR} ${PREFIX}/share/doc/krb5/$${i}; \
+		${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/krb5/$${i}; \
 	done; \
 	for i in $${html_files}; do \
-		${INSTALL_DATA} $${i} ${PREFIX}/share/doc/krb5/$${i}; \
+		${INSTALL_DATA} $${i} ${STAGEDIR}${PREFIX}/share/doc/krb5/$${i}; \
 		${ECHO_CMD} share/doc/krb5/$${i} >> ${TMPPLIST}; \
 	done
-.endif
-.if ${PORT_OPTIONS:MKRB5_PDF}
-	for i in $${pdf_dirs}; do \
-		${ECHO_CMD} @dir share/doc/krb5/$${i} >> ${TMPPLIST}; \
-	done | ${TAIL} -r >> ${TMPPLIST}
-.endif
-.if ${PORT_OPTIONS:MKRB5_HTML}
 	for i in $${html_dirs}; do \
 		${ECHO_CMD} @dir share/doc/krb5/$${i} >> ${TMPPLIST}; \
 	done | ${TAIL} -r >> ${TMPPLIST}
diff --git a/security/krb5-120/pkg-plist b/security/krb5-120/pkg-plist
index 546b4e659af4..946d2e181cd2 100644
--- a/security/krb5-120/pkg-plist
+++ b/security/krb5-120/pkg-plist
@@ -168,8 +168,8 @@ share/et/et_c.awk
 share/et/et_h.awk
 %%NLS%%share/locale/de/LC_MESSAGES/mit-krb5.mo
 %%NLS%%share/locale/en_US/LC_MESSAGES/mit-krb5.mo
-%%LDAP%%%%DATADIR%%/kerberos.schema
-%%LDAP%%%%DATADIR%%/kerberos.ldif
+%%LDAP%%share/krb5/kerberos.schema
+%%LDAP%%share/krb5/kerberos.ldif
 @dir lib/krb5/plugins/authdata
 @dir lib/krb5/plugins/libkrb5
 @dir %%KRB5_RUNSTATEDIR%%/krb5kdc
diff --git a/security/krb5-121/Makefile b/security/krb5-121/Makefile
index 1536ddb9cbb6..8aca1ba8cfed 100644
--- a/security/krb5-121/Makefile
+++ b/security/krb5-121/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=		krb5
 PORTVERSION=		1.21.3
+PORTREVISION=		1
 CATEGORIES=		security
 MASTER_SITES=		http://web.mit.edu/kerberos/dist/${PORTNAME}/${PORTVERSION:C/^[0-9]*\.[0-9]*/&X/:C/X\.[0-9]*$//:C/X//}/
 .if !defined(MASTERDIR)
@@ -114,42 +115,37 @@ BROKEN=			LIB_DEPENDS when using KRB5_HOME is broken
 CONFIGURE_ARGS+=	--program-transform-name="${PROGRAM_TRANSFORM_NAME}"
 .endif
 
-HTML_DOC_DIR=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/doc/html
-PDF_DOC_DIR=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/doc/pdf
-
 .include <bsd.port.pre.mk>
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/krb5
 # html documentation
 .if ${PORT_OPTIONS:MKRB5_PDF}
-	pdf_files=`${FIND} ${PDF_DOC_DIR} ! -type d`
-	pdf_dirs=`${FIND} ${PDF_DOC_DIR} -type d`
+	cd ${WRKDIR}/${PORTNAME}-${PORTVERSION}; \
+	pdf_files=`${FIND} doc/pdf ! -type d`; \
+	pdf_dirs=`${FIND} doc/pdf -type d`; \
 	for i in $${pdf_dirs}; do \
 		${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/krb5/$${i}; \
 	done; \
 	for i in $${pdf_files}; do \
-		${INSTALL_DATA} $${pdf} ${PREFIX}/share/doc/krb5/$${i}; \
+		${INSTALL_DATA} $${i} ${STAGEDIR}${PREFIX}/share/doc/krb5/$${i}; \
 		${ECHO_CMD} share/doc/krb5/$${i} >> ${TMPPLIST}; \
 	done
+	for i in $${pdf_dirs}; do \
+		${ECHO_CMD} @dir share/doc/krb5/$${i} >> ${TMPPLIST}; \
+	done | ${TAIL} -r >> ${TMPPLIST}
 .endif
 .if ${PORT_OPTIONS:MKRB5_HTML}
-	html_files=`${FIND} ${HTML_DOC_DIR} ! -type d | ${GREP} -v /_sources`
-	html_dirs=`${FIND} ${HTML_DOC_DIR} -type d | ${GREP} -v /_sources`
+	cd ${WRKDIR}/${PORTNAME}-${PORTVERSION}; \
+	html_files=`${FIND} doc/html ! -type d | ${GREP} -v /_sources`; \
+	html_dirs=`${FIND} doc/html -type d | ${GREP} -v /_sources`; \
 	for i in $${html_dirs}; do \
-		${MKDIR} ${PREFIX}/share/doc/krb5/$${i}; \
+		${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/krb5/$${i}; \
 	done; \
 	for i in $${html_files}; do \
-		${INSTALL_DATA} $${i} ${PREFIX}/share/doc/krb5/$${i}; \
+		${INSTALL_DATA} $${i} ${STAGEDIR}${PREFIX}/share/doc/krb5/$${i}; \
 		${ECHO_CMD} share/doc/krb5/$${i} >> ${TMPPLIST}; \
 	done
-.endif
-.if ${PORT_OPTIONS:MKRB5_PDF}
-	for i in $${pdf_dirs}; do \
-		${ECHO_CMD} @dir share/doc/krb5/$${i} >> ${TMPPLIST}; \
-	done | ${TAIL} -r >> ${TMPPLIST}
-.endif
-.if ${PORT_OPTIONS:MKRB5_HTML}
 	for i in $${html_dirs}; do \
 		${ECHO_CMD} @dir share/doc/krb5/$${i} >> ${TMPPLIST}; \
 	done | ${TAIL} -r >> ${TMPPLIST}
diff --git a/security/krb5-121/pkg-plist b/security/krb5-121/pkg-plist
index 3b9d73184549..fd0774890425 100644
--- a/security/krb5-121/pkg-plist
+++ b/security/krb5-121/pkg-plist
@@ -169,8 +169,8 @@ share/et/et_h.awk
 %%NLS%%share/locale/de/LC_MESSAGES/mit-krb5.mo
 %%NLS%%share/locale/en_US/LC_MESSAGES/mit-krb5.mo
 %%NLS%%share/locale/ka/LC_MESSAGES/mit-krb5.mo
-%%LDAP%%%%DATADIR%%/kerberos.schema
-%%LDAP%%%%DATADIR%%/kerberos.ldif
+%%LDAP%%share/krb5/kerberos.schema
+%%LDAP%%share/krb5/kerberos.ldif
 @dir lib/krb5/plugins/authdata
 @dir lib/krb5/plugins/libkrb5
 @dir %%KRB5_RUNSTATEDIR%%/krb5kdc
diff --git a/security/krb5-devel/pkg-plist b/security/krb5-devel/pkg-plist
index 6869a0e5b0eb..be06f441a999 100644
--- a/security/krb5-devel/pkg-plist
+++ b/security/krb5-devel/pkg-plist
@@ -169,8 +169,8 @@ share/et/et_h.awk
 %%NLS%%share/locale/de/LC_MESSAGES/mit-krb5.mo
 %%NLS%%share/locale/en_US/LC_MESSAGES/mit-krb5.mo
 %%NLS%%share/locale/ka/LC_MESSAGES/mit-krb5.mo
-%%LDAP%%%%DATADIR%%/kerberos.schema
-%%LDAP%%%%DATADIR%%/kerberos.ldif
+%%LDAP%%share/krb5/kerberos.schema
+%%LDAP%%share/krb5/kerberos.ldif
 @dir lib/krb5/plugins/authdata
 @dir lib/krb5/plugins/libkrb5
 @dir %%KRB5_RUNSTATEDIR%%/krb5kdc