git: 66c210139a8a - main - www/gohugo: Update to 0.82.0

Fernando Apesteguía fernape at FreeBSD.org
Wed Apr 7 05:34:41 UTC 2021


The branch main has been updated by fernape:

URL: https://cgit.FreeBSD.org/ports/commit/?id=66c210139a8a5d34c36c80201714402f0fb980f7

commit 66c210139a8a5d34c36c80201714402f0fb980f7
Author:     Fernando Apesteguía <fernape at FreeBSD.org>
AuthorDate: 2021-04-06 13:45:41 +0000
Commit:     Fernando Apesteguía <fernape at FreeBSD.org>
CommitDate: 2021-04-07 05:31:06 +0000

    www/gohugo: Update to 0.82.0
    
    ChangeLog: https://github.com/gohugoio/hugo/releases/tag/v0.82.0
    
    Remove obsolete patches. We can use vanilla gohugo to build our documentation.
    
    PR:     254524
    Submitted by: ben.lavery at hashbang0.com (maintainer)
---
 www/gohugo/Makefile                                | 15 ++++++----
 www/gohugo/distinfo                                | 28 +++++++++++-------
 .../files/patch-markup_asciidocext_convert.go      | 11 -------
 .../patch-markup_asciidocext_convert__test.go      | 34 ----------------------
 4 files changed, 26 insertions(+), 62 deletions(-)

diff --git a/www/gohugo/Makefile b/www/gohugo/Makefile
index 8c3f70adc6ae..4bcb16af7a20 100644
--- a/www/gohugo/Makefile
+++ b/www/gohugo/Makefile
@@ -1,7 +1,7 @@
 
 PORTNAME=	hugo
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.81.0
+DISTVERSION=	0.82.0
 CATEGORIES=	www
 PKGNAMEPREFIX=	go
 DIST_SUBDIR=	${PKGNAMEPREFIX}${PORTNAME}
@@ -23,6 +23,7 @@ GH_TUPLE=	\
 		PuerkitoBio:purell:v1.1.1:puerkitobio_purell/vendor/github.com/PuerkitoBio/purell \
 		PuerkitoBio:urlesc:de5bf2ad4578:puerkitobio_urlesc/vendor/github.com/PuerkitoBio/urlesc \
 		alecthomas:chroma:v0.8.2:alecthomas_chroma/vendor/github.com/alecthomas/chroma \
+		alecthomas:repr:d37bc2a10ba1:alecthomas_repr/vendor/github.com/alecthomas/repr \
 		armon:go-radix:v1.0.0:armon_go_radix/vendor/github.com/armon/go-radix \
 		aws:aws-sdk-go:v1.37.11:aws_aws_sdk_go/vendor/github.com/aws/aws-sdk-go \
 		bep:debounce:v1.2.0:bep_debounce/vendor/github.com/bep/debounce \
@@ -37,12 +38,13 @@ GH_TUPLE=	\
 		disintegration:gift:v1.2.1:disintegration_gift/vendor/github.com/disintegration/gift \
 		dlclark:regexp2:v1.4.0:dlclark_regexp2/vendor/github.com/dlclark/regexp2 \
 		dustin:go-humanize:v1.0.0:dustin_go_humanize/vendor/github.com/dustin/go-humanize \
-		evanw:esbuild:v0.8.46:evanw_esbuild/vendor/github.com/evanw/esbuild \
+		evanw:esbuild:v0.9.6:evanw_esbuild/vendor/github.com/evanw/esbuild \
 		fortytw2:leaktest:v1.3.0:fortytw2_leaktest/vendor/github.com/fortytw2/leaktest \
 		frankban:quicktest:v1.11.3:frankban_quicktest/vendor/github.com/frankban/quicktest \
 		fsnotify:fsnotify:v1.4.9:fsnotify_fsnotify/vendor/github.com/fsnotify/fsnotify \
 		getkin:kin-openapi:v0.39.0:getkin_kin_openapi/vendor/github.com/getkin/kin-openapi \
 		ghodss:yaml:v1.0.0:ghodss_yaml/vendor/github.com/ghodss/yaml \
+		go-check:check:41f04d3bba15:go_check_check/vendor/gopkg.in/check.v1 \
 		go-ini:ini:v1.51.1:go_ini_ini/vendor/gopkg.in/ini.v1 \
 		go-openapi:jsonpointer:v0.19.5:go_openapi_jsonpointer/vendor/github.com/go-openapi/jsonpointer \
 		go-openapi:swag:v0.19.5:go_openapi_swag/vendor/github.com/go-openapi/swag \
@@ -83,7 +85,7 @@ GH_TUPLE=	\
 		kr:pretty:v0.2.1:kr_pretty/vendor/github.com/kr/pretty \
 		kr:text:v0.1.0:kr_text/vendor/github.com/kr/text \
 		kylelemons:godebug:v1.1.0:kylelemons_godebug/vendor/github.com/kylelemons/godebug \
-		kyokomi:emoji:v2.2.7:kyokomi_emoji_v2/vendor/github.com/kyokomi/emoji/v2 \
+		kyokomi:emoji:v2.2.8:kyokomi_emoji_v2/vendor/github.com/kyokomi/emoji/v2 \
 		magefile:mage:v1.10.0:magefile_mage/vendor/github.com/magefile/mage \
 		magiconair:properties:v1.8.1:magiconair_properties/vendor/github.com/magiconair/properties \
 		mailru:easyjson:b2ccc519800e:mailru_easyjson/vendor/github.com/mailru/easyjson \
@@ -94,6 +96,7 @@ GH_TUPLE=	\
 		mitchellh:hashstructure:v1.0.0:mitchellh_hashstructure/vendor/github.com/mitchellh/hashstructure \
 		mitchellh:mapstructure:v1.3.3:mitchellh_mapstructure/vendor/github.com/mitchellh/mapstructure \
 		muesli:smartcrop:v0.3.0:muesli_smartcrop/vendor/github.com/muesli/smartcrop \
+		nfnt:resize:83c6a9932646:nfnt_resize/vendor/github.com/nfnt/resize \
 		nicksnyder:go-i18n:v2.1.1:nicksnyder_go_i18n_v2/vendor/github.com/nicksnyder/go-i18n \
 		niklasfasching:go-org:v1.4.0:niklasfasching_go_org/vendor/github.com/niklasfasching/go-org \
 		olekukonko:tablewriter:v0.0.5:olekukonko_tablewriter/vendor/github.com/olekukonko/tablewriter \
@@ -114,8 +117,8 @@ GH_TUPLE=	\
 		spf13:pflag:v1.0.5:spf13_pflag/vendor/github.com/spf13/pflag \
 		spf13:viper:v1.7.1:spf13_viper/vendor/github.com/spf13/viper \
 		subosito:gotenv:v1.2.0:subosito_gotenv/vendor/github.com/subosito/gotenv \
-		tdewolff:minify:v2.9.13:tdewolff_minify_v2/vendor/github.com/tdewolff/minify/v2 \
-		tdewolff:parse:v2.5.10:tdewolff_parse_v2/vendor/github.com/tdewolff/parse/v2 \
+		tdewolff:minify:v2.9.15:tdewolff_minify_v2/vendor/github.com/tdewolff/minify/v2 \
+		tdewolff:parse:v2.5.14:tdewolff_parse_v2/vendor/github.com/tdewolff/parse/v2 \
 		yuin:goldmark-highlighting:60d527fdb691:yuin_goldmark_highlighting/vendor/github.com/yuin/goldmark-highlighting \
 		yuin:goldmark:v1.3.2:yuin_goldmark/vendor/github.com/yuin/goldmark
 
@@ -153,7 +156,7 @@ PORTMANS=	hugo-config.1 hugo-convert-toJSON.1 hugo-convert-toTOML.1 \
 .include <bsd.port.pre.mk>
 
 SOURCE_DATE_EPOCH_CMD=	date -r $$(grep TIMESTAMP ${DISTINFO_FILE} | ${SED} -e 's/[^0-9]//g') '+%FT%TZ%z'
-COMMIT_ID=		59d15c97
+COMMIT_ID=		9d960784
 
 do-build-MANPAGES-on:
 	@cd ${GO_WRKSRC} && ${GO_WRKDIR_BIN}/${PORTNAME} gen man --dir man/man1/
diff --git a/www/gohugo/distinfo b/www/gohugo/distinfo
index 1aa98f8667ca..8df84e346eff 100644
--- a/www/gohugo/distinfo
+++ b/www/gohugo/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1613898953
-SHA256 (gohugo/gohugoio-hugo-v0.81.0_GH0.tar.gz) = 5091d57220e2325ba1a24fe50c608ee3ea2317911f00d4f3e97c242c492cfb43
-SIZE (gohugo/gohugoio-hugo-v0.81.0_GH0.tar.gz) = 37351436
+TIMESTAMP = 1616355968
+SHA256 (gohugo/gohugoio-hugo-v0.82.0_GH0.tar.gz) = f156c31034f013b11ff19aec09ab4d47fd8689befaa6f58222b48ed970722b4b
+SIZE (gohugo/gohugoio-hugo-v0.82.0_GH0.tar.gz) = 38470364
 SHA256 (gohugo/Azure-azure-pipeline-go-v0.2.2_GH0.tar.gz) = dc0d15949088e17e74da35c3ae2730f52240ad73e25cf795f532b7282de68e2f
 SIZE (gohugo/Azure-azure-pipeline-go-v0.2.2_GH0.tar.gz) = 16443
 SHA256 (gohugo/Azure-azure-storage-blob-go-v0.9.0_GH0.tar.gz) = f206c84fe3689aaa8e0cd180facf3455dc9c7e374a5dee1e2e9e6b9e39ab99c7
@@ -15,6 +15,8 @@ SHA256 (gohugo/PuerkitoBio-urlesc-de5bf2ad4578_GH0.tar.gz) = e1d470b13efcab6d4de
 SIZE (gohugo/PuerkitoBio-urlesc-de5bf2ad4578_GH0.tar.gz) = 6796
 SHA256 (gohugo/alecthomas-chroma-v0.8.2_GH0.tar.gz) = b7b9bd2ff49a18127dd00cee0d8e1d262b861b0641f711cbf9c615431f2b9499
 SIZE (gohugo/alecthomas-chroma-v0.8.2_GH0.tar.gz) = 637306
+SHA256 (gohugo/alecthomas-repr-d37bc2a10ba1_GH0.tar.gz) = 935e4ade182b6cf97ad598f956c15e1c172af37b45c5fabe38b08b99fc02642e
+SIZE (gohugo/alecthomas-repr-d37bc2a10ba1_GH0.tar.gz) = 4958
 SHA256 (gohugo/armon-go-radix-v1.0.0_GH0.tar.gz) = 9e5238a553708bccf930d1f9d0ce62ce30d92602b64ea248585ce06ec7bfee17
 SIZE (gohugo/armon-go-radix-v1.0.0_GH0.tar.gz) = 5975
 SHA256 (gohugo/aws-aws-sdk-go-v1.37.11_GH0.tar.gz) = 87c882ae88d05556c2cafc27e5d5db0552449198a84d10cef70612288d9202d8
@@ -43,8 +45,8 @@ SHA256 (gohugo/dlclark-regexp2-v1.4.0_GH0.tar.gz) = 774718cb87c5cc7b954e4f17056f
 SIZE (gohugo/dlclark-regexp2-v1.4.0_GH0.tar.gz) = 205882
 SHA256 (gohugo/dustin-go-humanize-v1.0.0_GH0.tar.gz) = e4540bd50ac855143b4f2e509313079c50cf5d8774f09cc10dbca5ae9803d8ba
 SIZE (gohugo/dustin-go-humanize-v1.0.0_GH0.tar.gz) = 17260
-SHA256 (gohugo/evanw-esbuild-v0.8.46_GH0.tar.gz) = 552e13795ca8c23f05615106fcb486bc9e054780811a43a654a866923f2cb313
-SIZE (gohugo/evanw-esbuild-v0.8.46_GH0.tar.gz) = 1208819
+SHA256 (gohugo/evanw-esbuild-v0.9.6_GH0.tar.gz) = 886f66e87e5acab481e171283c00d88605a69640f3d6b320c79fcb8b9b979cfb
+SIZE (gohugo/evanw-esbuild-v0.9.6_GH0.tar.gz) = 1284933
 SHA256 (gohugo/fortytw2-leaktest-v1.3.0_GH0.tar.gz) = 897726ed584a7c442eb660406e3438d4585b00c5f3769360eb19b18cace35292
 SIZE (gohugo/fortytw2-leaktest-v1.3.0_GH0.tar.gz) = 5281
 SHA256 (gohugo/frankban-quicktest-v1.11.3_GH0.tar.gz) = d0725fed8f58d19aa9ec589e3f37f398071e615dd40b191825377dd9c85faa31
@@ -55,6 +57,8 @@ SHA256 (gohugo/getkin-kin-openapi-v0.39.0_GH0.tar.gz) = e388159b999043df2d07ed2e
 SIZE (gohugo/getkin-kin-openapi-v0.39.0_GH0.tar.gz) = 112215
 SHA256 (gohugo/ghodss-yaml-v1.0.0_GH0.tar.gz) = 8a76b47cd171944612aae1cfa08bbb971b63fec16794c839252808392097de44
 SIZE (gohugo/ghodss-yaml-v1.0.0_GH0.tar.gz) = 11772
+SHA256 (gohugo/go-check-check-41f04d3bba15_GH0.tar.gz) = 2d5b1036909b241e44f0d6a7cfa936cf9f875efb4f0af077cd61585c6d0c0432
+SIZE (gohugo/go-check-check-41f04d3bba15_GH0.tar.gz) = 31614
 SHA256 (gohugo/go-ini-ini-v1.51.1_GH0.tar.gz) = 1a42156fe93f0360155e90a5869638c7ae0d56b16acc88c8941b66d4211c24a7
 SIZE (gohugo/go-ini-ini-v1.51.1_GH0.tar.gz) = 43935
 SHA256 (gohugo/go-openapi-jsonpointer-v0.19.5_GH0.tar.gz) = 587217a2edeedbe6de0f0ba62d7c347f31be2f7016da4fafdeda3aba5dd6b1a9
@@ -135,8 +139,8 @@ SHA256 (gohugo/kr-text-v0.1.0_GH0.tar.gz) = b67f2744020b25f9298153af0992db252d19
 SIZE (gohugo/kr-text-v0.1.0_GH0.tar.gz) = 8686
 SHA256 (gohugo/kylelemons-godebug-v1.1.0_GH0.tar.gz) = 72cc6f274fbd165b7674280f836a6b400e80dbae055919e101920dedf50e79db
 SIZE (gohugo/kylelemons-godebug-v1.1.0_GH0.tar.gz) = 17637
-SHA256 (gohugo/kyokomi-emoji-v2.2.7_GH0.tar.gz) = 2f733cb9e5e6d1f92c24dc356f996b975378ec2f2e873f9ff51c17952e03be39
-SIZE (gohugo/kyokomi-emoji-v2.2.7_GH0.tar.gz) = 102280
+SHA256 (gohugo/kyokomi-emoji-v2.2.8_GH0.tar.gz) = 412bcec93e56fd7309914e259b1d240d9bbaf834595b4aea8d8b493fa3178103
+SIZE (gohugo/kyokomi-emoji-v2.2.8_GH0.tar.gz) = 102287
 SHA256 (gohugo/magefile-mage-v1.10.0_GH0.tar.gz) = 7d7f46f62df9dfb1a3a03173a1c14d77fdc53b3c99821da02d32a4ba730838fe
 SIZE (gohugo/magefile-mage-v1.10.0_GH0.tar.gz) = 8792150
 SHA256 (gohugo/magiconair-properties-v1.8.1_GH0.tar.gz) = 4449df3d2be86608bfc997228f66f1cff57bf620cc5bf9ba44339c7e4c5612dd
@@ -157,6 +161,8 @@ SHA256 (gohugo/mitchellh-mapstructure-v1.3.3_GH0.tar.gz) = 660c2e8fd3c855022b2b5
 SIZE (gohugo/mitchellh-mapstructure-v1.3.3_GH0.tar.gz) = 26054
 SHA256 (gohugo/muesli-smartcrop-v0.3.0_GH0.tar.gz) = 3b984205075076b682b837172b792d5d7f9685071b9c0331b9fb4c0f0a3b914d
 SIZE (gohugo/muesli-smartcrop-v0.3.0_GH0.tar.gz) = 448018
+SHA256 (gohugo/nfnt-resize-83c6a9932646_GH0.tar.gz) = d5c440f3d4d431d64f6a4edabbc267d4b6e21d9a5649c35965f954a067dbc81c
+SIZE (gohugo/nfnt-resize-83c6a9932646_GH0.tar.gz) = 12461
 SHA256 (gohugo/nicksnyder-go-i18n-v2.1.1_GH0.tar.gz) = aaf654b09308c928c40a7e8739dd58ad559918a4c686dee5e8992fa74bf1b22b
 SIZE (gohugo/nicksnyder-go-i18n-v2.1.1_GH0.tar.gz) = 40526
 SHA256 (gohugo/niklasfasching-go-org-v1.4.0_GH0.tar.gz) = 98f8bd82aed28be995f19c7dc9da825d3cbee3a1877abfd9541adfd98e335f2e
@@ -197,10 +203,10 @@ SHA256 (gohugo/spf13-viper-v1.7.1_GH0.tar.gz) = de85215b50e9fbb2cdf63b0aa9df826a
 SIZE (gohugo/spf13-viper-v1.7.1_GH0.tar.gz) = 82641
 SHA256 (gohugo/subosito-gotenv-v1.2.0_GH0.tar.gz) = 5f6826992c11981018c77377f33dbc56d0be932e0d38a2f51e795c99725e7ba5
 SIZE (gohugo/subosito-gotenv-v1.2.0_GH0.tar.gz) = 7359
-SHA256 (gohugo/tdewolff-minify-v2.9.13_GH0.tar.gz) = b9d4553d888e1717c320dcf829741ff929e432dd59451927d474bd2efcc251cf
-SIZE (gohugo/tdewolff-minify-v2.9.13_GH0.tar.gz) = 4043973
-SHA256 (gohugo/tdewolff-parse-v2.5.10_GH0.tar.gz) = ad7cba964c6f956982b0b37a6917be5f3d69f6e78e573e6f23a41b45f6ab1d25
-SIZE (gohugo/tdewolff-parse-v2.5.10_GH0.tar.gz) = 94380
+SHA256 (gohugo/tdewolff-minify-v2.9.15_GH0.tar.gz) = c05839ae2aa0aa13c2321bcea2df9aaed4dd52d85e7a3564b0313409e8bba074
+SIZE (gohugo/tdewolff-minify-v2.9.15_GH0.tar.gz) = 4047624
+SHA256 (gohugo/tdewolff-parse-v2.5.14_GH0.tar.gz) = 79ae83f88833f3d5036ca47dc43d665099ac0158f9c58942699e50d0afce0c48
+SIZE (gohugo/tdewolff-parse-v2.5.14_GH0.tar.gz) = 95376
 SHA256 (gohugo/yuin-goldmark-highlighting-60d527fdb691_GH0.tar.gz) = 151eceff70451c95cb2e6737f8593d58b6d218509726f1f58150b7157496813e
 SIZE (gohugo/yuin-goldmark-highlighting-60d527fdb691_GH0.tar.gz) = 10767
 SHA256 (gohugo/yuin-goldmark-v1.3.2_GH0.tar.gz) = d3375736499e119fe65817cd2d04602ea7edbf1f7012b0fdfbc81773745886c6
diff --git a/www/gohugo/files/patch-markup_asciidocext_convert.go b/www/gohugo/files/patch-markup_asciidocext_convert.go
deleted file mode 100644
index e5e12c4bbc46..000000000000
--- a/www/gohugo/files/patch-markup_asciidocext_convert.go
+++ /dev/null
@@ -1,11 +0,0 @@
---- markup/asciidocext/convert.go.orig	2021-01-23 16:42:36 UTC
-+++ markup/asciidocext/convert.go
-@@ -105,7 +105,7 @@ func (a *asciidocConverter) parseArgs(ctx converter.Do
- 	args = a.appendArg(args, "-b", cfg.Backend, asciidocext_config.CliDefault.Backend, asciidocext_config.AllowedBackend)
- 
- 	for _, extension := range cfg.Extensions {
--		if !asciidocext_config.AllowedExtensions[extension] {
-+		if cfg.SafeMode != "unsafe" && !asciidocext_config.AllowedExtensions[extension] {
- 			a.cfg.Logger.Errorln("Unsupported asciidoctor extension was passed in. Extension `" + extension + "` ignored.")
- 			continue
- 		}
diff --git a/www/gohugo/files/patch-markup_asciidocext_convert__test.go b/www/gohugo/files/patch-markup_asciidocext_convert__test.go
deleted file mode 100644
index db77f20cb609..000000000000
--- a/www/gohugo/files/patch-markup_asciidocext_convert__test.go
+++ /dev/null
@@ -1,34 +0,0 @@
---- markup/asciidocext/convert_test.go.orig	2021-01-23 16:44:14 UTC
-+++ markup/asciidocext/convert_test.go
-@@ -115,6 +115,31 @@ func TestAsciidoctorDisallowedArgs(t *testing.T) {
- 	c.Assert(args, qt.DeepEquals, expected)
- }
- 
-+func TestAsciidoctorArbitraryExtension(t *testing.T) {
-+	c := qt.New(t)
-+	cfg := viper.New()
-+	mconf := markup_config.Default
-+	mconf.AsciidocExt.Extensions = []string{"arbitrary-extension"}
-+	p, err := Provider.New(
-+		converter.ProviderConfig{
-+			Cfg:          cfg,
-+			MarkupConfig: mconf,
-+			Logger:       loggers.NewErrorLogger(),
-+		},
-+	)
-+	c.Assert(err, qt.IsNil)
-+
-+	conv, err := p.New(converter.DocumentContext{})
-+	c.Assert(err, qt.IsNil)
-+
-+	ac := conv.(*asciidocConverter)
-+	c.Assert(ac, qt.Not(qt.IsNil))
-+
-+	args := ac.parseArgs(converter.DocumentContext{})
-+	expected := []string{"-r", "arbitrary-extension", "--no-header-footer"}
-+	c.Assert(args, qt.DeepEquals, expected)
-+}
-+
- func TestAsciidoctorDiagramArgs(t *testing.T) {
- 	c := qt.New(t)
- 	cfg := viper.New()


More information about the dev-commits-ports-all mailing list