Date: Tue, 11 Apr 2023 19:24:43 GMT From: Marc Fonvieille <blackend@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: ec882ed3832f - main - misc/freebsd-doc-*: Fix some plist generation Message-ID: <202304111924.33BJOhJa008423@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by blackend: URL: https://cgit.FreeBSD.org/ports/commit/?id=ec882ed3832f265f80a896288f55fec7debe17bb commit ec882ed3832f265f80a896288f55fec7debe17bb Author: Marc Fonvieille <blackend@FreeBSD.org> AuthorDate: 2023-04-11 19:23:32 +0000 Commit: Marc Fonvieille <blackend@FreeBSD.org> CommitDate: 2023-04-11 19:23:32 +0000 misc/freebsd-doc-*: Fix some plist generation Approved by: doceng (implicit) --- misc/freebsd-doc-de/pkg-plist.extras | 4 ++-- misc/freebsd-doc-de/pkg-plist.pdf | 2 ++ misc/freebsd-doc-en/Makefile | 18 +++++++++++++++--- misc/freebsd-doc-en/pkg-plist.pdf | 5 +++++ misc/freebsd-doc-fr/pkg-plist.extras | 6 +++--- misc/freebsd-doc-fr/pkg-plist.pdf | 3 +++ misc/freebsd-doc-pt/pkg-plist.extras | 10 +++++----- misc/freebsd-doc-pt/pkg-plist.pdf | 5 +++++ misc/freebsd-doc-ru/pkg-plist.extras | 6 +++--- misc/freebsd-doc-ru/pkg-plist.pdf | 3 +++ 10 files changed, 46 insertions(+), 16 deletions(-) diff --git a/misc/freebsd-doc-de/pkg-plist.extras b/misc/freebsd-doc-de/pkg-plist.extras index 747ae22467f4..3baec084c833 100644 --- a/misc/freebsd-doc-de/pkg-plist.extras +++ b/misc/freebsd-doc-de/pkg-plist.extras @@ -1,2 +1,2 @@ -%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/diff.txt -%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/init.txt +source/articles/freebsd-update-server/diff.txt +source/articles/freebsd-update-server/init.txt diff --git a/misc/freebsd-doc-de/pkg-plist.pdf b/misc/freebsd-doc-de/pkg-plist.pdf index 9a4dd70ca7a1..04658a1cca60 100644 --- a/misc/freebsd-doc-de/pkg-plist.pdf +++ b/misc/freebsd-doc-de/pkg-plist.pdf @@ -11,3 +11,5 @@ %%DOCSDIR%%/%%DOCLANG%%/books/faq/faq_de.pdf %%DOCSDIR%%/%%DOCLANG%%/books/handbook/handbook_de.pdf %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/porters-handbook_de.pdf +%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/diff.txt +%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/init.txt diff --git a/misc/freebsd-doc-en/Makefile b/misc/freebsd-doc-en/Makefile index 0605104ead21..dddf43f51419 100644 --- a/misc/freebsd-doc-en/Makefile +++ b/misc/freebsd-doc-en/Makefile @@ -1,5 +1,6 @@ PORTNAME= freebsd-doc PORTVERSION= 20230410 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= misc docs MASTER_SITES= LOCAL/blackend @@ -63,14 +64,15 @@ BUILD_DEPENDS+= docproj-fonts-cjk>0:textproc/docproj-fonts-cjk .endif .endif -# when html is defined as the format, add HTML_COMMON. +# when html is defined as the format, add HTML_COMMON and extras +# extras files are example files, scripts, etc. coming with the doc .if ${PORT_OPTIONS:MHTML} -PLIST_FORMATS+= html-common +PLIST_FORMATS+= html-common extras .endif # example files, scripts, etc. coming with the doc and common # directories for all formats. -PLIST_FORMATS+= extras common +#PLIST_FORMATS+= extras common post-patch: @${REINPLACE_CMD} -e 's|enableGitInfo = true|#enableGitInfo = true|' \ @@ -90,10 +92,20 @@ do-build: do-install: ${MKDIR} ${STAGEDIR}${DESTDIR}${PREFIX}/${DOCBASE} ${CP} -R ${WRKSRC}/public/* ${STAGEDIR}${DESTDIR}${PREFIX}/${DOCBASE} +# For PDF format extras files are copied with the .pdf in same directory +.if ${PORT_OPTIONS:MPDF} + ${GREP} -E '(\.c|\.txt)' ${.CURDIR}/pkg-plist.pdf | \ + ${SED} -e 's|%%DOCSDIR%%/%%DOCLANG%%/||' | \ + ${XARGS} -t -I % ${CP} -v ${WRKSRC}/static/source/% ${STAGEDIR}${DESTDIR}${PREFIX}/${DOCBASE}/${DOCLANG}/%; +.endif +# For HTML format extras files are in source/ directory +.if ${PORT_OPTIONS:MHTML} if ${TEST} -f ${.CURDIR}/pkg-plist.extras; then \ + ${MKDIR} ${STAGEDIR}${DESTDIR}${PREFIX}/${DOCBASE}/source; \ ${CAT} ${.CURDIR}/pkg-plist.extras | \ ${SED} -e 's|%%DOCSDIR%%/||' | \ ${XARGS} -t -I % ${CP} -v ${WRKSRC}/static/% ${STAGEDIR}${DESTDIR}${PREFIX}/${DOCBASE}/; \ fi +.endif .include <bsd.port.mk> diff --git a/misc/freebsd-doc-en/pkg-plist.pdf b/misc/freebsd-doc-en/pkg-plist.pdf index e9aba0827029..24e157de916a 100644 --- a/misc/freebsd-doc-en/pkg-plist.pdf +++ b/misc/freebsd-doc-en/pkg-plist.pdf @@ -42,3 +42,8 @@ %%DOCSDIR%%/en/books/fdp-primer/fdp-primer_en.pdf %%DOCSDIR%%/en/books/handbook/handbook_en.pdf %%DOCSDIR%%/en/books/porters-handbook/porters-handbook_en.pdf +%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/diff.txt +%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/init.txt +%%DOCSDIR%%/%%DOCLANG%%/articles/pam/converse.c +%%DOCSDIR%%/%%DOCLANG%%/articles/pam/pam_unix.c +%%DOCSDIR%%/%%DOCLANG%%/articles/pam/su.c diff --git a/misc/freebsd-doc-fr/pkg-plist.extras b/misc/freebsd-doc-fr/pkg-plist.extras index 593e3fea745e..7aa3a3c1f48f 100644 --- a/misc/freebsd-doc-fr/pkg-plist.extras +++ b/misc/freebsd-doc-fr/pkg-plist.extras @@ -1,3 +1,3 @@ -%%DOCSDIR%%/%%DOCLANG%%/articles/pam/converse.c -%%DOCSDIR%%/%%DOCLANG%%/articles/pam/pam_unix.c -%%DOCSDIR%%/%%DOCLANG%%/articles/pam/su.c +source/articles/pam/converse.c +source/articles/pam/pam_unix.c +source/articles/pam/su.c diff --git a/misc/freebsd-doc-fr/pkg-plist.pdf b/misc/freebsd-doc-fr/pkg-plist.pdf index 3b17bf10fa10..88cd0206f7b7 100644 --- a/misc/freebsd-doc-fr/pkg-plist.pdf +++ b/misc/freebsd-doc-fr/pkg-plist.pdf @@ -16,3 +16,6 @@ %%DOCSDIR%%/%%DOCLANG%%/books/faq/faq_fr.pdf %%DOCSDIR%%/%%DOCLANG%%/books/handbook/handbook_fr.pdf %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/porters-handbook_fr.pdf +%%DOCSDIR%%/%%DOCLANG%%/articles/pam/converse.c +%%DOCSDIR%%/%%DOCLANG%%/articles/pam/pam_unix.c +%%DOCSDIR%%/%%DOCLANG%%/articles/pam/su.c diff --git a/misc/freebsd-doc-pt/pkg-plist.extras b/misc/freebsd-doc-pt/pkg-plist.extras index 8b441dcb7879..58d146d9eab4 100644 --- a/misc/freebsd-doc-pt/pkg-plist.extras +++ b/misc/freebsd-doc-pt/pkg-plist.extras @@ -1,5 +1,5 @@ -%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/diff.txt -%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/init.txt -%%DOCSDIR%%/%%DOCLANG%%/articles/pam/converse.c -%%DOCSDIR%%/%%DOCLANG%%/articles/pam/pam_unix.c -%%DOCSDIR%%/%%DOCLANG%%/articles/pam/su.c +source/articles/freebsd-update-server/diff.txt +source/articles/freebsd-update-server/init.txt +source/articles/pam/converse.c +source/articles/pam/pam_unix.c +source/articles/pam/su.c diff --git a/misc/freebsd-doc-pt/pkg-plist.pdf b/misc/freebsd-doc-pt/pkg-plist.pdf index 40c53e88eb1d..7be01ffc3784 100644 --- a/misc/freebsd-doc-pt/pkg-plist.pdf +++ b/misc/freebsd-doc-pt/pkg-plist.pdf @@ -36,3 +36,8 @@ %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/fdp-primer_%%DOCLANG_PREFIX%%.pdf %%DOCSDIR%%/%%DOCLANG%%/books/handbook/handbook_%%DOCLANG_PREFIX%%.pdf %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/porters-handbook_%%DOCLANG_PREFIX%%.pdf +%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/diff.txt +%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/init.txt +%%DOCSDIR%%/%%DOCLANG%%/articles/pam/converse.c +%%DOCSDIR%%/%%DOCLANG%%/articles/pam/pam_unix.c +%%DOCSDIR%%/%%DOCLANG%%/articles/pam/su.c diff --git a/misc/freebsd-doc-ru/pkg-plist.extras b/misc/freebsd-doc-ru/pkg-plist.extras index 593e3fea745e..7aa3a3c1f48f 100644 --- a/misc/freebsd-doc-ru/pkg-plist.extras +++ b/misc/freebsd-doc-ru/pkg-plist.extras @@ -1,3 +1,3 @@ -%%DOCSDIR%%/%%DOCLANG%%/articles/pam/converse.c -%%DOCSDIR%%/%%DOCLANG%%/articles/pam/pam_unix.c -%%DOCSDIR%%/%%DOCLANG%%/articles/pam/su.c +source/articles/pam/converse.c +source/articles/pam/pam_unix.c +source/articles/pam/su.c diff --git a/misc/freebsd-doc-ru/pkg-plist.pdf b/misc/freebsd-doc-ru/pkg-plist.pdf index c23c81e156f2..0243611ca8af 100644 --- a/misc/freebsd-doc-ru/pkg-plist.pdf +++ b/misc/freebsd-doc-ru/pkg-plist.pdf @@ -21,3 +21,6 @@ %%DOCSDIR%%/%%DOCLANG%%/books/faq/faq_ru.pdf %%DOCSDIR%%/%%DOCLANG%%/books/handbook/handbook_ru.pdf %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/porters-handbook_ru.pdf +%%DOCSDIR%%/%%DOCLANG%%/articles/pam/converse.c +%%DOCSDIR%%/%%DOCLANG%%/articles/pam/pam_unix.c +%%DOCSDIR%%/%%DOCLANG%%/articles/pam/su.c
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202304111924.33BJOhJa008423>