Index: head/converters/yj/Makefile =================================================================== --- head/converters/yj/Makefile (revision 551488) +++ head/converters/yj/Makefile (revision 551489) @@ -1,26 +1,26 @@ # $FreeBSD$ PORTNAME= yj -PORTVERSION= 4.0.0 +PORTVERSION= 5.0.0 DISTVERSIONPREFIX= v CATEGORIES= converters DIST_SUBDIR= yj MAINTAINER= ohauer@FreeBSD.org COMMENT= Convert between YAML, TOML, JSON, and HCL LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE USES= go:modules USE_GITHUB= yes GH_ACCOUNT= sclevine PLIST_FILES= bin/yj -GH_TUPLE= BurntSushi:toml:v0.3.1:burntsushi_toml/vendor/github.com/BurntSushi/toml \ - go-yaml:yaml:v2.2.7:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \ - hashicorp:hcl:v1.0.0:hashicorp_hcl/vendor/github.com/hashicorp/hcl +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 Index: head/converters/yj/distinfo =================================================================== --- head/converters/yj/distinfo (revision 551488) +++ head/converters/yj/distinfo (revision 551489) @@ -1,9 +1,9 @@ -TIMESTAMP = 1578243427 -SHA256 (yj/sclevine-yj-v4.0.0_GH0.tar.gz) = 8423486cdc0f6bd912bdcb9f61ef89427a70b094352c45e62b1343c9b2ea92f4 -SIZE (yj/sclevine-yj-v4.0.0_GH0.tar.gz) = 12885 -SHA256 (yj/BurntSushi-toml-v0.3.1_GH0.tar.gz) = 6593da894578ba510a470735ffbdc88ce88033094dc5a8f4d3957ab87e18803f -SIZE (yj/BurntSushi-toml-v0.3.1_GH0.tar.gz) = 42077 -SHA256 (yj/go-yaml-yaml-v2.2.7_GH0.tar.gz) = 74afe4be0fa4482de73cfaf952dc6c8d41088b687c3f9de4a7ced86d2bbe0cb4 -SIZE (yj/go-yaml-yaml-v2.2.7_GH0.tar.gz) = 72651 +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 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 Index: head/converters/yj/files/patch-go.mod =================================================================== --- head/converters/yj/files/patch-go.mod (revision 551488) +++ head/converters/yj/files/patch-go.mod (nonexistent) @@ -1,14 +0,0 @@ ---- go.mod.orig 2019-05-06 05:03:58 UTC -+++ go.mod -@@ -1,9 +1,9 @@ - module github.com/sclevine/yj - --go 1.12 -+go 1.13 - - require ( - github.com/BurntSushi/toml v0.3.1 - github.com/hashicorp/hcl v1.0.0 -- gopkg.in/yaml.v2 v2.2.2 -+ gopkg.in/yaml.v2 v2.2.7 - ) Property changes on: head/converters/yj/files/patch-go.mod ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/converters/yj/files/patch-go.sum =================================================================== --- head/converters/yj/files/patch-go.sum (revision 551488) +++ head/converters/yj/files/patch-go.sum (nonexistent) @@ -1,10 +0,0 @@ ---- go.sum.orig 2019-05-06 05:03:58 UTC -+++ go.sum -@@ -4,5 +4,5 @@ github.com/davecgh/go-spew v1.1.1/go.mod - github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= - github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= - gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= --gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= --gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -+gopkg.in/yaml.v2 v2.2.7 h1:VUgggvou5XRW9mHwD/yXxIYSMtY0zoKQf/v226p2nyo= -+gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= Property changes on: head/converters/yj/files/patch-go.sum ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/converters/yj/files/patch-toml_encoder.go =================================================================== --- head/converters/yj/files/patch-toml_encoder.go (nonexistent) +++ head/converters/yj/files/patch-toml_encoder.go (revision 551489) @@ -0,0 +1,11 @@ +--- 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 Property changes on: head/converters/yj/files/patch-toml_encoder.go ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property