From nobody Sat Apr 15 09:21:08 2023 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pz7914vVSz44xgc; Sat, 15 Apr 2023 09:21:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pz7911g10z3HvT; Sat, 15 Apr 2023 09:21:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681550469; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NGj4sh7LfGeEANsr9uB0HMwzUnEEMobx4ENeh7rt+HE=; b=Od2XZnHm3KpFAyj2CeuWq7y2S42Mz0l+fQlgQaIWAIhzP5PhhhvqfFKyZmR/wNV/AtKpU0 y3KX2EAjnaqV+GCTAWtP1XyfCMJqXFhuJjbewzh7X6STHUZlLxqSHu3m2iDjDCRBo47pX1 ybU7VR30OmPAKRRIbFmJ0sH30t1Co/00L/Z+N5iLYL4A4/omQWy0TB/acNYiUjh1DH2OOX filGoK3hNcfBK2RgGVxj0TivYktrneLneAHIz0s+5fHerNpgA6U81VgQUf6M0Mc+oOfDq4 t3y6xcKzm2fANV6pVm14LbOzWaFjF8yHZ520CTmllypstASyWHwpELVbCjUAmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681550469; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NGj4sh7LfGeEANsr9uB0HMwzUnEEMobx4ENeh7rt+HE=; b=isnjbasSdxFq3dQBW1Gd5bKUFHykJo9tItDcDq3wgyaOCmzyAqlN6Lz4+vbA/x8sgwt3KC tu8/TtpJQbYP16LXCebSOMGLIf3RBWF6w2p2Wz6/0rJBSl9+IrxUHgHelJ/hSg7qHUPp87 edm+OChHyVRTyU8zGL7Y1qeIdFGElWz6MOMaPwxVJD/s1Tc+Mc+snMmNrK1BQ41AF1V+Tb uT3jDWxgChPP9dXpc+YrlscsdOL8unBz2ZdpL8dcfrJtP+1lC0gTWZDHDq4tKrvYFHRf4F +SB9ShM97NWG5+MSIetAY0YkPPoDm72NsvspGGsY05cujN0saIJXyZt20SeNfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681550469; a=rsa-sha256; cv=none; b=ZxwssjNomhsSkbW71pnAz9u9xt9n47yeRHRk3jmYhzdBBICgVRnE9fRoWFiRHGMIlGzjFT hxCpuJD9eMaIeD1c8nW47euYip1lTdx3xT1qUnWy3GZQLlLyy+tG21GQ4oab+DUijpPJkd X+raNfnNeqDVJFPCa0pvB1Uoq1Sx7bBAmb4nZp7BuGf23Dmpa69oP1/b93aSX6ll1nsEm/ Rth/qh0TQXEVvbODysCp6M4LvTLy6d1UCm9EGeoeOYhf0UBaRM0eNedZb4LcWc8zm6b7Co Z6Uio+LueD9U077LBef0DEeVdLtIbLzTu+zfewDGrS9wsKLQMBaL/x3sj38ZkQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pz79108TFz11Bb; Sat, 15 Apr 2023 09:21:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33F9L8Tk099425; Sat, 15 Apr 2023 09:21:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33F9L8v2099413; Sat, 15 Apr 2023 09:21:08 GMT (envelope-from git) Date: Sat, 15 Apr 2023 09:21:08 GMT Message-Id: <202304150921.33F9L8v2099413@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Marc Fonvieille Subject: git: 52e6ded7651e - 2023Q2 - misc/freebsd-doc-*: Fix some plist generation List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: blackend X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q2 X-Git-Reftype: branch X-Git-Commit: 52e6ded7651e58e60d129cd4b7e04a99c4c5dee5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q2 has been updated by blackend: URL: https://cgit.FreeBSD.org/ports/commit/?id=52e6ded7651e58e60d129cd4b7e04a99c4c5dee5 commit 52e6ded7651e58e60d129cd4b7e04a99c4c5dee5 Author: Marc Fonvieille AuthorDate: 2023-04-11 19:23:32 +0000 Commit: Marc Fonvieille CommitDate: 2023-04-15 09:20:44 +0000 misc/freebsd-doc-*: Fix some plist generation Approved by: doceng (implicit) (cherry picked from commit ec882ed3832f265f80a896288f55fec7debe17bb) --- 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 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