git: 9095e4c91db9 - main - sysutils/chezmoi: update to 2.14.0 and re-enable documentation

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Tobias C. Berner <tcberner_at_FreeBSD.org>
Date: Fri, 01 Apr 2022 18:10:36 UTC
The branch main has been updated by tcberner:

URL: https://cgit.FreeBSD.org/ports/commit/?id=9095e4c91db98135beb6ec140a2d5d7ade461ed2

commit 9095e4c91db98135beb6ec140a2d5d7ade461ed2
Author:     Samir Noir <samir@noir.im>
AuthorDate: 2022-04-01 18:07:41 +0000
Commit:     Tobias C. Berner <tcberner@FreeBSD.org>
CommitDate: 2022-04-01 18:08:10 +0000

    sysutils/chezmoi: update to 2.14.0 and re-enable documentation
    
    PR:             262834
---
 sysutils/chezmoi/Makefile                          | 44 +++++++++++++++-------
 sysutils/chezmoi/distinfo                          | 40 ++++++++++----------
 .../files/patch-assets_chezmoi.io_mkdocs.yml       |  9 +++++
 3 files changed, 61 insertions(+), 32 deletions(-)

diff --git a/sysutils/chezmoi/Makefile b/sysutils/chezmoi/Makefile
index 87a72cab345c..367e1d5501ea 100644
--- a/sysutils/chezmoi/Makefile
+++ b/sysutils/chezmoi/Makefile
@@ -2,9 +2,9 @@
 
 PORTNAME=	chezmoi
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.13.0
-PORTREVISION=	1
+DISTVERSION=	2.14.0
 CATEGORIES=	sysutils
+EXTRACT_ONLY=	${_DISTFILES:N*.js}
 
 MAINTAINER=	samir@noir.im
 COMMENT=	Manage your dotfiles across multiple diverse machines, securely
@@ -12,7 +12,7 @@ COMMENT=	Manage your dotfiles across multiple diverse machines, securely
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		go:modules
+USES=		go:modules python
 USE_GITHUB=	yes
 GH_ACCOUNT=	twpayne
 
@@ -45,18 +45,18 @@ GH_TUPLE=	FiloSottile:age:v1.0.0:filosottile_age/vendor/filippo.io/age \
 		go-warnings:warnings:v0.1.2:go_warnings_warnings/vendor/gopkg.in/warnings.v0 \
 		go-yaml:yaml:496545a6307b:go_yaml_yaml_1/vendor/gopkg.in/yaml.v3 \
 		go-yaml:yaml:v2.4.0:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
-		godbus:dbus:v5.0.6:godbus_dbus_v5/vendor/github.com/godbus/dbus/v5 \
+		godbus:dbus:v5.1.0:godbus_dbus_v5/vendor/github.com/godbus/dbus/v5 \
 		golang:appengine:v1.6.7:golang_appengine/vendor/google.golang.org/appengine \
 		golang:crypto:86341886e292:golang_crypto/vendor/golang.org/x/crypto \
-		golang:net:cd36cc0744dd:golang_net/vendor/golang.org/x/net \
-		golang:oauth2:d3ed0bb246c8:golang_oauth2/vendor/golang.org/x/oauth2 \
+		golang:net:27dd8689420f:golang_net/vendor/golang.org/x/net \
+		golang:oauth2:ee480838109b:golang_oauth2/vendor/golang.org/x/oauth2 \
 		golang:protobuf:v1.5.2:golang_protobuf/vendor/github.com/golang/protobuf \
 		golang:sync:036812b2e83c:golang_sync/vendor/golang.org/x/sync \
-		golang:sys:3681064d5158:golang_sys/vendor/golang.org/x/sys \
+		golang:sys:4e6760a101f9:golang_sys/vendor/golang.org/x/sys \
 		golang:term:03fcf44c2211:golang_term/vendor/golang.org/x/term \
 		golang:text:v0.3.7:golang_text/vendor/golang.org/x/text \
 		google:btree:v1.0.1:google_btree/vendor/github.com/google/btree \
-		google:go-github:v42.0.0:google_go_github_v42/vendor/github.com/google/go-github/v42 \
+		google:go-github:v43.0.0:google_go_github_v43/vendor/github.com/google/go-github/v43 \
 		google:go-querystring:v1.1.0:google_go_querystring/vendor/github.com/google/go-querystring \
 		google:gops:v0.3.22:google_gops/vendor/github.com/google/gops \
 		google:renameio:v2.0.0:google_renameio_v2/vendor/github.com/google/renameio/v2 \
@@ -70,7 +70,7 @@ GH_TUPLE=	FiloSottile:age:v1.0.0:filosottile_age/vendor/filippo.io/age \
 		jbenet:go-context:d14ea06fba99:jbenet_go_context/vendor/github.com/jbenet/go-context \
 		kevinburke:ssh_config:v1.1.0:kevinburke_ssh_config/vendor/github.com/kevinburke/ssh_config \
 		lucasb-eyer:go-colorful:v1.2.0:lucasb_eyer_go_colorful/vendor/github.com/lucasb-eyer/go-colorful \
-		magiconair:properties:v1.8.5:magiconair_properties/vendor/github.com/magiconair/properties \
+		magiconair:properties:v1.8.6:magiconair_properties/vendor/github.com/magiconair/properties \
 		mattn:go-isatty:v0.0.14:mattn_go_isatty/vendor/github.com/mattn/go-isatty \
 		mattn:go-runewidth:v0.0.13:mattn_go_runewidth/vendor/github.com/mattn/go-runewidth \
 		microcosm-cc:bluemonday:v1.0.18:microcosm_cc_bluemonday/vendor/github.com/microcosm-cc/bluemonday \
@@ -107,11 +107,11 @@ GH_TUPLE=	FiloSottile:age:v1.0.0:filosottile_age/vendor/filippo.io/age \
 		twpayne:go-vfs:v4.1.0:twpayne_go_vfs_v4/vendor/github.com/twpayne/go-vfs/v4 \
 		twpayne:go-xdg:v6.0.0:twpayne_go_xdg_v6/vendor/github.com/twpayne/go-xdg/v6 \
 		uber-go:atomic:v1.9.0:uber_go_atomic/vendor/go.uber.org/atomic \
-		uber-go:multierr:v1.7.0:uber_go_multierr/vendor/go.uber.org/multierr \
+		uber-go:multierr:v1.8.0:uber_go_multierr/vendor/go.uber.org/multierr \
 		ulikunitz:xz:v0.5.10:ulikunitz_xz/vendor/github.com/ulikunitz/xz \
 		xanzy:ssh-agent:v0.3.1:xanzy_ssh_agent/vendor/github.com/xanzy/ssh-agent \
 		yuin:goldmark-emoji:v1.0.1:yuin_goldmark_emoji/vendor/github.com/yuin/goldmark-emoji \
-		yuin:goldmark:v1.4.7:yuin_goldmark/vendor/github.com/yuin/goldmark \
+		yuin:goldmark:v1.4.8:yuin_goldmark/vendor/github.com/yuin/goldmark \
 		zalando:go-keyring:v0.2.0:zalando_go_keyring/vendor/github.com/zalando/go-keyring \
 		DHowett:go-plist:v1.0.0:go_plist/vendor/howett.net/plist
 
@@ -122,10 +122,20 @@ GO_BUILDFLAGS=	-tags noupgrade \
 
 PLIST_FILES=	bin/chezmoi
 
-OPTIONS_DEFINE=		BASH FISH ZSH
-OPTIONS_DEFAULT=	BASH FISH ZSH
+OPTIONS_DEFINE=		BASH DOCS FISH ZSH
+OPTIONS_DEFAULT=	BASH DOCS FISH ZSH
+
+DOCS_MASTER_SITES=	https://unpkg.com/:mermaid_js
+DOCS_DISTFILES=		mermaid@8.8.0/dist/mermaid.min.js:mermaid_js
+
+DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mkdocs>0:textproc/py-mkdocs@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}mkdocs-material>0:textproc/py-mkdocs-material@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}mkdocs-mermaid2-plugin>0:textproc/py-mkdocs-mermaid2-plugin@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}mkdocs-simple-hooks>0:textproc/py-mkdocs-simple-hooks@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}mkdocs-redirects>0:textproc/py-mkdocs-redirects@${PY_FLAVOR}
 
 BASH_PLIST_FILES=	etc/bash_completion.d/chezmoi
+DOCS_PORTDOCS=		*
 FISH_PLIST_FILES=	share/fish/vendor_functions.d/chezmoi.fish
 ZSH_PLIST_FILES=	share/zsh/site-functions/_chezmoi
 
@@ -134,6 +144,10 @@ ZSH_PLIST_FILES=	share/zsh/site-functions/_chezmoi
 
 SOURCE_DATE_EPOCH_CMD=	date -ur $$(grep TIMESTAMP ${DISTINFO_FILE} | ${SED} -e 's/[^0-9]//g') '+%FT%TZ'
 
+do-build-DOCS-on:
+	@${CP} ${_DISTDIR}/mermaid@8.8.0/dist/mermaid.min.js ${WRKSRC}/assets/chezmoi.io
+	(cd ${WRKSRC}/assets/chezmoi.io && mkdocs build)
+
 post-extract:
 	@${MKDIR} ${WRKSRC}/vendor/github.com/chris-ramon
 	@${RLN} ${WRKSRC_aymerick_douceur} ${WRKSRC}/vendor/github.com/chris-ramon/douceur
@@ -142,6 +156,10 @@ post-install-BASH-on:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
 	${INSTALL_DATA} ${WRKSRC}/completions/chezmoi-completion.bash ${STAGEDIR}${PREFIX}/etc/bash_completion.d/chezmoi
 
+post-install-DOCS-on:
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC}/assets/chezmoi.io/site && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
+
 post-install-FISH-on:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/fish/vendor_functions.d
 	${INSTALL_DATA} ${WRKSRC}/completions/chezmoi.fish ${STAGEDIR}${PREFIX}/share/fish/vendor_functions.d/chezmoi.fish
diff --git a/sysutils/chezmoi/distinfo b/sysutils/chezmoi/distinfo
index 4dad60b04045..ade57f4bf9c0 100644
--- a/sysutils/chezmoi/distinfo
+++ b/sysutils/chezmoi/distinfo
@@ -1,6 +1,8 @@
-TIMESTAMP = 1645873740
-SHA256 (twpayne-chezmoi-v2.13.0_GH0.tar.gz) = 9b996645a0b90a7098b5005b6d83328997697bdda928622927894b037726d93e
-SIZE (twpayne-chezmoi-v2.13.0_GH0.tar.gz) = 2377539
+TIMESTAMP = 1648291225
+SHA256 (mermaid@8.8.0/dist/mermaid.min.js) = d373ecc0e80fed423a6ee72fe30f4307aad5a04d872fa14e98ff3f2e8be4aae0
+SIZE (mermaid@8.8.0/dist/mermaid.min.js) = 832982
+SHA256 (twpayne-chezmoi-v2.14.0_GH0.tar.gz) = 4d7a1baf7e3caa8f6976b1ea5e6ba81c75273b1dd1f0fc946134a82454720397
+SIZE (twpayne-chezmoi-v2.14.0_GH0.tar.gz) = 2383228
 SHA256 (FiloSottile-age-v1.0.0_GH0.tar.gz) = 8d27684f62f9dc74014035e31619e2e07f8b56257b1075560456cbf05ddbcfce
 SIZE (FiloSottile-age-v1.0.0_GH0.tar.gz) = 59682
 SHA256 (Masterminds-goutils-v1.1.1_GH0.tar.gz) = 6eed023c54f386a71f360e19d34f7a43e640ac44dfc39c22ad4afd7ae04aaa3d
@@ -59,30 +61,30 @@ SHA256 (go-yaml-yaml-496545a6307b_GH0.tar.gz) = ed0e11dc14bbbd4127031d7e8b9e58da
 SIZE (go-yaml-yaml-496545a6307b_GH0.tar.gz) = 90156
 SHA256 (go-yaml-yaml-v2.4.0_GH0.tar.gz) = d8e94679e5fff6bd1a35e10241543929a5f3da44f701755babf99b3daf0faac0
 SIZE (go-yaml-yaml-v2.4.0_GH0.tar.gz) = 73209
-SHA256 (godbus-dbus-v5.0.6_GH0.tar.gz) = b8c481c97917c4dbcb7585074b06b1e1cc10338dc267ebc84af272763ce04663
-SIZE (godbus-dbus-v5.0.6_GH0.tar.gz) = 71369
+SHA256 (godbus-dbus-v5.1.0_GH0.tar.gz) = 2f4939ab13a20178584ef534293abc5b6744bb5b6232432050c5a3ab2ab85fd7
+SIZE (godbus-dbus-v5.1.0_GH0.tar.gz) = 74080
 SHA256 (golang-appengine-v1.6.7_GH0.tar.gz) = c623d81235f7c9699e299b328191d813337dd57dcc800d7afdb5130e8c321a8f
 SIZE (golang-appengine-v1.6.7_GH0.tar.gz) = 333007
 SHA256 (golang-crypto-86341886e292_GH0.tar.gz) = 92b4ef34c44645bf9e6fccc20ca0a4307ef1e4e526f583141c05832182124b6b
 SIZE (golang-crypto-86341886e292_GH0.tar.gz) = 1628070
-SHA256 (golang-net-cd36cc0744dd_GH0.tar.gz) = ec4567caa40e6a703e0881443623d13a812136dc2fc13935e129835fb5336076
-SIZE (golang-net-cd36cc0744dd_GH0.tar.gz) = 1228759
-SHA256 (golang-oauth2-d3ed0bb246c8_GH0.tar.gz) = 17989d348e2fd423992005229d92c9fc5e25ad5358f72d31361dbf1cdd7c505c
-SIZE (golang-oauth2-d3ed0bb246c8_GH0.tar.gz) = 87604
+SHA256 (golang-net-27dd8689420f_GH0.tar.gz) = e72ae02627807460cd899f85e9043f3b5047f2842b82457f5c7b18466f791eaf
+SIZE (golang-net-27dd8689420f_GH0.tar.gz) = 1229548
+SHA256 (golang-oauth2-ee480838109b_GH0.tar.gz) = a377b09fb21dffe1f4098eaf5e613dcb6eccf2a9bf4cd077975b1e84938adced
+SIZE (golang-oauth2-ee480838109b_GH0.tar.gz) = 87820
 SHA256 (golang-protobuf-v1.5.2_GH0.tar.gz) = 088cc0f3ba18fb8f9d00319568ff0af5a06d8925a6e6cb983bb837b4efb703b3
 SIZE (golang-protobuf-v1.5.2_GH0.tar.gz) = 171702
 SHA256 (golang-sync-036812b2e83c_GH0.tar.gz) = 75ac8fc16bdceb2496c4a9cc98584b70c29032d91a9e57a624acb073e3232fda
 SIZE (golang-sync-036812b2e83c_GH0.tar.gz) = 18752
-SHA256 (golang-sys-3681064d5158_GH0.tar.gz) = c084b1b6a081b78986c7364ec483397d6c128aa447ab672aa132fda309bd4db7
-SIZE (golang-sys-3681064d5158_GH0.tar.gz) = 1258557
+SHA256 (golang-sys-4e6760a101f9_GH0.tar.gz) = 03a0fe05c767ee371318e94f05d0fb59ce1d00d0716e522cd4e31e6424a394a1
+SIZE (golang-sys-4e6760a101f9_GH0.tar.gz) = 1259262
 SHA256 (golang-term-03fcf44c2211_GH0.tar.gz) = 1919967c8fbf15de9261a2315d90072357524ee557d7df106b426def02a8e5f3
 SIZE (golang-term-03fcf44c2211_GH0.tar.gz) = 14972
 SHA256 (golang-text-v0.3.7_GH0.tar.gz) = 7cab2f6c3133ac1d422edd952b0dd2082fa55a73c2663fb2defd9bf83d649b26
 SIZE (golang-text-v0.3.7_GH0.tar.gz) = 8354718
 SHA256 (google-btree-v1.0.1_GH0.tar.gz) = 240723cff7c3c28e8444d45e500e65b2c25df519273260f248786e1a7367a654
 SIZE (google-btree-v1.0.1_GH0.tar.gz) = 15381
-SHA256 (google-go-github-v42.0.0_GH0.tar.gz) = f44b6650fff1159c66ace5f6f228dd1adc15f58feed6c0556335bda4446c444b
-SIZE (google-go-github-v42.0.0_GH0.tar.gz) = 592486
+SHA256 (google-go-github-v43.0.0_GH0.tar.gz) = 78baf73614ebefd56f822c7c9a0d60793c561acca9402e8d2a2d18190b905cba
+SIZE (google-go-github-v43.0.0_GH0.tar.gz) = 599372
 SHA256 (google-go-querystring-v1.1.0_GH0.tar.gz) = a5641dee688eb2c733608ce5a88d8181c93ad9f5083fd97fadbccb91afad9a56
 SIZE (google-go-querystring-v1.1.0_GH0.tar.gz) = 10423
 SHA256 (google-gops-v0.3.22_GH0.tar.gz) = a8092305465b28b0db83eb7087edca958de6522bc3ebb14656ecb8aef521e07b
@@ -109,8 +111,8 @@ SHA256 (kevinburke-ssh_config-v1.1.0_GH0.tar.gz) = a88b03ef5077abe2ad25e7c2cd348
 SIZE (kevinburke-ssh_config-v1.1.0_GH0.tar.gz) = 19004
 SHA256 (lucasb-eyer-go-colorful-v1.2.0_GH0.tar.gz) = b3ee835cc398287452377266313edcc231043bae4168f8d2706e5d34ce1ce755
 SIZE (lucasb-eyer-go-colorful-v1.2.0_GH0.tar.gz) = 970830
-SHA256 (magiconair-properties-v1.8.5_GH0.tar.gz) = f85ea629d145006f4df18fd8251fa005d95c311b068848043232f52d247ba45c
-SIZE (magiconair-properties-v1.8.5_GH0.tar.gz) = 30514
+SHA256 (magiconair-properties-v1.8.6_GH0.tar.gz) = 59b7e9184d83405c09af4ec23ebd20737cce34fa79244ff1f6314085244b9907
+SIZE (magiconair-properties-v1.8.6_GH0.tar.gz) = 30241
 SHA256 (mattn-go-isatty-v0.0.14_GH0.tar.gz) = e6460325edf600297cf2ef68834938fb1c5b8d5f234b3b24ec7c0a29a2d70b39
 SIZE (mattn-go-isatty-v0.0.14_GH0.tar.gz) = 4710
 SHA256 (mattn-go-runewidth-v0.0.13_GH0.tar.gz) = 9b2aeafa5d95a40b32067ba22accdf42cc83414ec5b433ea7de330791beaa196
@@ -183,16 +185,16 @@ SHA256 (twpayne-go-xdg-v6.0.0_GH0.tar.gz) = 17b18ce31c59b4f216c19b1cc775e3cd698a
 SIZE (twpayne-go-xdg-v6.0.0_GH0.tar.gz) = 5943
 SHA256 (uber-go-atomic-v1.9.0_GH0.tar.gz) = a6b11bb77c479298cdfdfdf2132975dbd975322b619451378cbdf731facd874a
 SIZE (uber-go-atomic-v1.9.0_GH0.tar.gz) = 21331
-SHA256 (uber-go-multierr-v1.7.0_GH0.tar.gz) = 7b9b6b812f64ad756ada9dd72db1a8be51cdbfa831defe9111cb4e0877138242
-SIZE (uber-go-multierr-v1.7.0_GH0.tar.gz) = 15054
+SHA256 (uber-go-multierr-v1.8.0_GH0.tar.gz) = 25d7db31320bc4c4408664e0492b59e509ec83ec3164e11610dcfd2fa828ea57
+SIZE (uber-go-multierr-v1.8.0_GH0.tar.gz) = 15579
 SHA256 (ulikunitz-xz-v0.5.10_GH0.tar.gz) = 515f83921cf3e80b9196156cb4a0c1328243d5e09eca7c5ac7ce7e31b218c35b
 SIZE (ulikunitz-xz-v0.5.10_GH0.tar.gz) = 479622
 SHA256 (xanzy-ssh-agent-v0.3.1_GH0.tar.gz) = 6c2fb46ae13198250d56d4b26cc8fedd46834bfb2a2e653116b012fdbb1c0227
 SIZE (xanzy-ssh-agent-v0.3.1_GH0.tar.gz) = 8622
 SHA256 (yuin-goldmark-emoji-v1.0.1_GH0.tar.gz) = 9188fe9ed18f4560fdae3577a4bb63e3cbd20e0ae4ed68ae1058788b6aa0cec0
 SIZE (yuin-goldmark-emoji-v1.0.1_GH0.tar.gz) = 31694
-SHA256 (yuin-goldmark-v1.4.7_GH0.tar.gz) = 1c95cd67e944c68ec4181ff19a7495fe174be3d8f3b866171d96075a7cbba3d6
-SIZE (yuin-goldmark-v1.4.7_GH0.tar.gz) = 256633
+SHA256 (yuin-goldmark-v1.4.8_GH0.tar.gz) = becc9befdc0dceecb8345b4e5111b3ea96fed8b350fa84e400a02fc5070b2b89
+SIZE (yuin-goldmark-v1.4.8_GH0.tar.gz) = 257379
 SHA256 (zalando-go-keyring-v0.2.0_GH0.tar.gz) = 4807926677f14d715ae31a74868f8c1f925bea0174c643d9f16b4945fd1f6983
 SIZE (zalando-go-keyring-v0.2.0_GH0.tar.gz) = 10461
 SHA256 (DHowett-go-plist-v1.0.0_GH0.tar.gz) = 213b3f1d54c3bff8ce3e2b2782ca95a13faf26d4bc6475234d3f614732fedd4a
diff --git a/sysutils/chezmoi/files/patch-assets_chezmoi.io_mkdocs.yml b/sysutils/chezmoi/files/patch-assets_chezmoi.io_mkdocs.yml
new file mode 100644
index 000000000000..10d93fb5f44f
--- /dev/null
+++ b/sysutils/chezmoi/files/patch-assets_chezmoi.io_mkdocs.yml
@@ -0,0 +1,9 @@
+--- assets/chezmoi.io/mkdocs.yml.orig	2022-03-26 14:40:26 UTC
++++ assets/chezmoi.io/mkdocs.yml
+@@ -236,3 +236,6 @@ plugins:
+       docs/security.md: developer/security.md
+       docs/templating.md: user-guide/templating.md
+ - search
++
++extra_javascript:
++- mermaid.min.js