From nobody Sat Apr 23 14:21:34 2022 X-Original-To: dev-commits-ports-all@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 C8E6E199EFDD; Sat, 23 Apr 2022 14:21:34 +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 4KltkQ5K4Xz4s4k; Sat, 23 Apr 2022 14:21:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650723694; 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=0B0/L96Q6WdNUXKmQAQ84KD1OZL3Wtarq1GODE+gG7o=; b=HhaTry74LSCequHLge6N5ZBr4ND58aQHzezsl72dB0PBAwPFb+33qwNn/AzOw722iws822 o83pPodjSuYjs6Z7wkM6JV/43sGEPrOIrvS7s6Y2W453nd+BJWs9dJJyRyJ0/ohmZRQlr0 +fKB9/FUWVsxELehggjmmqVNaB/wgE20/uDV0VPMoa3grJqnemx/AwMsVkkSv7QE+jE8zb rB4bYc1+KDW/h7gliOMfqc5AMSbWEhtPTKXwD02MSAdPZlqjdTeQjNPtzoi9Nabsad1sv+ qGFj/iVWv+DwCQbd0BY+vnqj6rhyUuPdk1sRDg+c9R1Om89x3veo0mrZQceSYA== 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 966CE1373E; Sat, 23 Apr 2022 14:21:34 +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 23NELYND047975; Sat, 23 Apr 2022 14:21:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23NELY2E047974; Sat, 23 Apr 2022 14:21:34 GMT (envelope-from git) Date: Sat, 23 Apr 2022 14:21:34 GMT Message-Id: <202204231421.23NELY2E047974@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Emanuel Haupt Subject: git: 23907ea0f792 - main - converters/yj: Update to 5.1.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ehaupt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 23907ea0f7926c43ffc594ef6a04178464c1bb00 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650723694; 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=0B0/L96Q6WdNUXKmQAQ84KD1OZL3Wtarq1GODE+gG7o=; b=RrANqPL/aD5pSHxKzvXfU46TJzLEwvE1HYOvXl1RAnI5NgrFt/khRiJ98w/iD4TLxiKOH3 tV/LPye+pkEcBZ5BqEazgKUP6tAqKVHJWmudXX/vyhoSIxlF4PO0MCJEwUwn4K6YVajhvs VPD5FmzqPpdFH+HqzyvLJ9dWG8lyQB31y0ku21PHrzIxhmVTATLG2I41v2r2rSqwxqEU/Z 7yhc1DBvdVRONiFzyVJfwTd4inmfLem2B/UCwV11QSpmcFng+oAte8i27ZjREfM7jCF41v SLgXQznnGJRFcZBJBfF0oVU6HIdo7U/JFk/zLavhiTJiqeo5TatwJkGYOaTozw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650723694; a=rsa-sha256; cv=none; b=io2fFZjz8B7MEa1Ou/lOQVuBhVPGxpYXNoB5wxYhdYhIX8GgLNrkEEDxWlcusc9ei5TC4v o7T5XOhMar+vIwhdp4SYF6e0QqizsuLGbMJTG/5c60WwaJHLusVDCUDOM4k2OcuswIzbZc tpd0qVaIFkGAq+Hkd2CdAX7y9DWlsOwB3/ncs8pYWNqTr4jhkyfwnvkXRBjbXHy8zTHdGn U1/zPOFnCUptNwl6EI+g6eEG344XLipMx+6WC/XuPPoCxwuHO1YFhChEgD7DtrioOoowQw YZvYPiHhO9OY679zFfqEMCzlRaw55GlMc5qmmRQLuWUEr88Ox0MGzG82siR+hg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ehaupt: URL: https://cgit.FreeBSD.org/ports/commit/?id=23907ea0f7926c43ffc594ef6a04178464c1bb00 commit 23907ea0f7926c43ffc594ef6a04178464c1bb00 Author: Emanuel Haupt AuthorDate: 2022-04-23 14:21:14 +0000 Commit: Emanuel Haupt CommitDate: 2022-04-23 14:21:25 +0000 converters/yj: Update to 5.1.0 --- converters/yj/Makefile | 11 ++++------- converters/yj/distinfo | 14 +++++++------- converters/yj/files/patch-toml_encoder.go | 11 ----------- 3 files changed, 11 insertions(+), 25 deletions(-) diff --git a/converters/yj/Makefile b/converters/yj/Makefile index 84b9bf98ba64..a522679926fa 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 c0c6ed33bbbf..b79e9cbc7746 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 28814d616efa..000000000000 --- 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