diff --git a/converters/yj/Makefile b/converters/yj/Makefile index 84b9bf98ba645..a522679926fad 100644 --- a/converters/yj/Makefile +++ b/converters/yj/Makefile @@ -1,7 +1,6 @@ PORTNAME= yj -PORTVERSION= 5.0.0 +PORTVERSION= 5.1.0 DISTVERSIONPREFIX= v -PORTREVISION= 1 CATEGORIES= converters DIST_SUBDIR= yj @@ -13,15 +12,13 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= go:modules USE_GITHUB= yes - GH_ACCOUNT= sclevine +GH_TUPLE= BurntSushi:toml:v1.1.0:burntsushi_toml/vendor/github.com/BurntSushi/toml \ + hashicorp:hcl:v1.0.0:hashicorp_hcl/vendor/github.com/hashicorp/hcl \ + go-yaml:yaml:496545a:go_yaml_yaml/vendor/gopkg.in/yaml.v3 CONFLICTS_INSTALL= yj-bruceadams PLIST_FILES= bin/yj -GH_TUPLE= go-yaml:yaml:eeeca48fe776:go_yaml_yaml/vendor/gopkg.in/yaml.v3 \ - hashicorp:hcl:v1.0.0:hashicorp_hcl/vendor/github.com/hashicorp/hcl \ - sclevine:go-toml:ed50a274ac56:sclevine_go_toml/vendor/github.com/pelletier/go-toml - .include diff --git a/converters/yj/distinfo b/converters/yj/distinfo index c0c6ed33bbbf3..b79e9cbc77462 100644 --- a/converters/yj/distinfo +++ b/converters/yj/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1601900820 -SHA256 (yj/sclevine-yj-v5.0.0_GH0.tar.gz) = df9a4f5b6d067842ea3da68ff92c374b98560dce1086337d39963a1346120574 -SIZE (yj/sclevine-yj-v5.0.0_GH0.tar.gz) = 17668 -SHA256 (yj/go-yaml-yaml-eeeca48fe776_GH0.tar.gz) = 77e421545f853bf0b0431ed5026f10ebeeadd436334ac156169b78f82e86bdf5 -SIZE (yj/go-yaml-yaml-eeeca48fe776_GH0.tar.gz) = 88787 +TIMESTAMP = 1650723194 +SHA256 (yj/sclevine-yj-v5.1.0_GH0.tar.gz) = 9a3e9895181d1cbd436a1b02ccf47579afacd181c73f341e697a8fe74f74f99d +SIZE (yj/sclevine-yj-v5.1.0_GH0.tar.gz) = 18149 +SHA256 (yj/BurntSushi-toml-v1.1.0_GH0.tar.gz) = 91d03c925082c1282636fe9f2c69fd6d54410ac56f2b6d7492ba56c00ada626d +SIZE (yj/BurntSushi-toml-v1.1.0_GH0.tar.gz) = 91871 SHA256 (yj/hashicorp-hcl-v1.0.0_GH0.tar.gz) = 50632428210503070fd2fde748c88b7414bf84a6a0eadebf9d8e596a033bead2 SIZE (yj/hashicorp-hcl-v1.0.0_GH0.tar.gz) = 70658 -SHA256 (yj/sclevine-go-toml-ed50a274ac56_GH0.tar.gz) = 8318e8c5008e0c65129a77c7a9a108c5400dbdc584404bbecc0395ed06822c5f -SIZE (yj/sclevine-go-toml-ed50a274ac56_GH0.tar.gz) = 98507 +SHA256 (yj/go-yaml-yaml-496545a_GH0.tar.gz) = 98554ce519149ce86d039d56ebb013f0a52b7bca608a1c7e70fcd69d964064d6 +SIZE (yj/go-yaml-yaml-496545a_GH0.tar.gz) = 90131 diff --git a/converters/yj/files/patch-toml_encoder.go b/converters/yj/files/patch-toml_encoder.go deleted file mode 100644 index 28814d616efa7..0000000000000 --- a/converters/yj/files/patch-toml_encoder.go +++ /dev/null @@ -1,11 +0,0 @@ ---- toml/encoder.go.orig 2020-07-25 19:25:50 UTC -+++ toml/encoder.go -@@ -15,7 +15,7 @@ type Encoder struct { - NaN, PosInf, NegInf interface{} - } - --func (e *Encoder) Encode(normal interface{}) (yaml interface{}, err error) { -+func (e *Encoder) Encode(normal interface{}) (toml interface{}, err error) { - defer catchFailure(&err) - et := encodeTracker{Encoder: e} - return et.denormalize(normal), nil