2 files changed, 27 insertions, 23 deletions

diff --git a/security/acmetool/Makefile b/security/acmetool/Makefile
index 037b3dd6b767..0fe571997b08 100644
--- a/security/acmetool/Makefile
+++ b/security/acmetool/Makefile
@@ -2,8 +2,7 @@
 
 PORTNAME=	acmetool
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.0.67
-PORTREVISION=	1
+DISTVERSION=	0.2.1
 CATEGORIES=	security
 
 MAINTAINER=	samm@FreeBSD.org
@@ -15,16 +14,16 @@ USES=		go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	hlandau
-GH_PROJECT=	acme
-GH_SUBDIR=	src/github.com/hlandau/acme
-GH_TUPLE=	alecthomas:template:a0175ee:template/vendor/github.com/alecthomas/template \
-		alecthomas:units:2efee85:units/vendor/github.com/alecthomas/units \
+GH_SUBDIR=	src/github.com/hlandau/acmetool
+GH_TUPLE=	alecthomas:template:fb15b89:template/vendor/github.com/alecthomas/template \
+		alecthomas:units:f65c72e:units/vendor/github.com/alecthomas/units \
 		coreos:go-systemd:749ef98:go_systemd/vendor/github.com/coreos/go-systemd \
-		hlandau:acme:221ea15:acme/vendor/github.com/hlandau/acme \
+		hlandau:acmetool:f68b275:acme/vendor/github.com/hlandau/acmetool \
 		hlandau:buildinfo:337a29b:buildinfo/vendor/github.com/hlandau/buildinfo \
 		hlandau:dexlogconfig:244f29b:dexlogconfig/vendor/github.com/hlandau/dexlogconfig \
 		hlandau:goutils:0cdb66a:goutils/vendor/github.com/hlandau/goutils \
 		hlandau:xlog:197ef79:xlog/vendor/github.com/hlandau/xlog \
+		hlandau:acmeapi:4c466ab:acmeapi/vendor/gopkg.in/hlandau/acmeapi.v2 \
 		jmhodges:clock:880ee4c:clock/vendor/github.com/jmhodges/clock \
 		mattn:go-isatty:6ca4dbf:go_isatty/vendor/github.com/mattn/go-isatty \
 		mattn:go-runewidth:a9d6d1e:go_runewidth/vendor/github.com/mattn/go-runewidth \
@@ -35,7 +34,7 @@ GH_TUPLE=	alecthomas:template:a0175ee:template/vendor/github.com/alecthomas/temp
 		shiena:ansicolor:a422bbe:ansicolor/vendor/github.com/shiena/ansicolor \
 		golang:crypto:91a49db:crypto/vendor/golang.org/x/crypto \
 		golang:net:22ae77b:net/vendor/golang.org/x/net \
-		golang:sys:33540a1f6037:sys/vendor/golang.org/x/sys \
+		golang:sys:dd2ff4a:sys/vendor/golang.org/x/sys \
 		golang:text:b7ef84a:text/vendor/golang.org/x/text \
 		alecthomas:kingpin:947dcec:kingpin/vendor/gopkg.in/alecthomas/kingpin.v2 \
 		cheggaaa:pb:72b9643:pb/vendor/gopkg.in/cheggaaa/pb.v1 \
@@ -43,14 +42,15 @@ GH_TUPLE=	alecthomas:template:a0175ee:template/vendor/github.com/alecthomas/temp
 		hlandau:easyconfig:7589cb9:easyconfig/vendor/gopkg.in/hlandau/easyconfig.v1 \
 		hlandau:service:b64b346:service/vendor/gopkg.in/hlandau/service.v2 \
 		hlandau:svcutils:c25dac4:svcutils/vendor/gopkg.in/hlandau/svcutils.v1 \
+		square:go-jose:4ef0f1b:go_jose2/vendor/gopkg.in/square/go-jose.v2 \
 		square:go-jose:aa2e30f:go_jose/vendor/gopkg.in/square/go-jose.v1 \
 		tylerb:graceful:4654dfb:graceful/vendor/gopkg.in/tylerb/graceful.v1 \
-		go-yaml:yaml:7f97868:go_yaml/vendor/gopkg.in/yaml.v2
+		go-yaml:yaml:7f97868:go_yaml/vendor/gopkg.in/yaml.v2 \
 
 GO_BUILDFLAGS=	-ldflags "\
-		-X github.com/hlandau/acme/hooks.DefaultPath=${PREFIX}/libexec/acme/hooks \
-		-X github.com/hlandau/acme/storage.RecommendedPath=/var/db/acme \
-		-X github.com/hlandau/buildinfo.BuildInfo=${PORTNAME}-v${PORTVERSION}-freebsd-ports"
+		-X github.com/hlandau/acmetool/vendor/github.com/hlandau/acmetool/hooks.DefaultPath=${PREFIX}/libexec/acme/hooks \
+		-X github.com/hlandau/acmetool/vendor/github.com/hlandau/acmetool/storage.RecommendedPath=/var/db/acme \
+		-X github.com/hlandau/acmetool/vendor/github.com/hlandau/buildinfo.BuildInfo=${PORTNAME}-v${PORTVERSION}-freebsd-ports"
 GO_TARGET=	./cmd/acmetool
 
 post-build:
diff --git a/security/acmetool/distinfo b/security/acmetool/distinfo
index 3e7ad6abc469..0c868ad35b20 100644
--- a/security/acmetool/distinfo
+++ b/security/acmetool/distinfo
@@ -1,14 +1,14 @@
-TIMESTAMP = 1520313517
-SHA256 (hlandau-acme-v0.0.67_GH0.tar.gz) = 01f78340006539c62bb86250433d2f819ab529ccd9a0aa74e140ff0fee839073
-SIZE (hlandau-acme-v0.0.67_GH0.tar.gz) = 133424
-SHA256 (alecthomas-template-a0175ee_GH0.tar.gz) = 18330bd4bf73af704ec42953b6106e256b58314c7931bcd5aedf41b470ee3dc8
-SIZE (alecthomas-template-a0175ee_GH0.tar.gz) = 55261
-SHA256 (alecthomas-units-2efee85_GH0.tar.gz) = 8e84e0468232e23459212cf84e38164a43b1c8b7a2788a44c9446c01b684c39d
-SIZE (alecthomas-units-2efee85_GH0.tar.gz) = 3445
+TIMESTAMP = 1584455065
+SHA256 (hlandau-acmetool-v0.2.1_GH0.tar.gz) = 54acffe7381696ecdc829f65810897075d17c5600c077f431eda5e5244189a74
+SIZE (hlandau-acmetool-v0.2.1_GH0.tar.gz) = 121399
+SHA256 (alecthomas-template-fb15b89_GH0.tar.gz) = edc515063323c61120740ef930ce60e659e9ae82e2b21062ec451ff675b8d6be
+SIZE (alecthomas-template-fb15b89_GH0.tar.gz) = 55333
+SHA256 (alecthomas-units-f65c72e_GH0.tar.gz) = ea7b78bc113b977f2cb2a52cf7bb46dc2e61476b13a8ae7ab6ce79883a69b0a5
+SIZE (alecthomas-units-f65c72e_GH0.tar.gz) = 4920
 SHA256 (coreos-go-systemd-749ef98_GH0.tar.gz) = 02b110e1c89a321a4deb9c9a4d7c7130c868e0881ab68d491f0b818d555f73c6
 SIZE (coreos-go-systemd-749ef98_GH0.tar.gz) = 59316
-SHA256 (hlandau-acme-221ea15_GH0.tar.gz) = 8fbc3f3d274ffa47b5b7020d8d97aa975ef4a67e6b0792e9d682509f58529527
-SIZE (hlandau-acme-221ea15_GH0.tar.gz) = 133430
+SHA256 (hlandau-acmetool-f68b275_GH0.tar.gz) = 1feaa784d37bfdd2fcd096660171ee13ca38c0e95e77289902008dad5b231578
+SIZE (hlandau-acmetool-f68b275_GH0.tar.gz) = 121411
 SHA256 (hlandau-buildinfo-337a29b_GH0.tar.gz) = b2678ee8f07d0dcfb96ddc47fc7d5c3ee6896eb4951dc35a22b56b647ee34789
 SIZE (hlandau-buildinfo-337a29b_GH0.tar.gz) = 2601
 SHA256 (hlandau-dexlogconfig-244f29b_GH0.tar.gz) = 55ce7d2b431a55c3827c5df975b4d8194e61ae5b5a2c273385355ec351cde4c3
@@ -17,6 +17,8 @@ SHA256 (hlandau-goutils-0cdb66a_GH0.tar.gz) = 76efbb51ee4d2d615aa31bc1b2c01f8c65
 SIZE (hlandau-goutils-0cdb66a_GH0.tar.gz) = 6397
 SHA256 (hlandau-xlog-197ef79_GH0.tar.gz) = 0db8bcf21a74fdfd26a0890e4e9a2c2486754eb1cd168c3d798b4f171088ce72
 SIZE (hlandau-xlog-197ef79_GH0.tar.gz) = 6396
+SHA256 (hlandau-acmeapi-4c466ab_GH0.tar.gz) = 56eaf9ebd9434be4cba7b2a1f5cc488f28d06239a69dd047f96d114226640425
+SIZE (hlandau-acmeapi-4c466ab_GH0.tar.gz) = 40966
 SHA256 (jmhodges-clock-880ee4c_GH0.tar.gz) = 1f80d14a42f1f30341a7040460cada7f555b1157f1ee96c826f104f46676aeb0
 SIZE (jmhodges-clock-880ee4c_GH0.tar.gz) = 5759
 SHA256 (mattn-go-isatty-6ca4dbf_GH0.tar.gz) = 4ae0da6d6d3f5bf7b86570e38a057331f7b2830bd5d0c1fc670758672f7521cf
@@ -37,8 +39,8 @@ SHA256 (golang-crypto-91a49db_GH0.tar.gz) = 1039827935c26b4f430405e3da870c324ebc
 SIZE (golang-crypto-91a49db_GH0.tar.gz) = 1451212
 SHA256 (golang-net-22ae77b_GH0.tar.gz) = a5788e4383e8131e0b2ac2397194fc3b2e3f9d26df496ccd615a0dc7ff81c493
 SIZE (golang-net-22ae77b_GH0.tar.gz) = 937441
-SHA256 (golang-sys-33540a1f6037_GH0.tar.gz) = 09ebdf007413c2eaddce123137443d08d1848be410c58896e772f0481ec385d5
-SIZE (golang-sys-33540a1f6037_GH0.tar.gz) = 1497659
+SHA256 (golang-sys-dd2ff4a_GH0.tar.gz) = 74b19ce75abab70e09231c497badbf7d87b2d9941504ec68721dcffa8faa6de4
+SIZE (golang-sys-dd2ff4a_GH0.tar.gz) = 799474
 SHA256 (golang-text-b7ef84a_GH0.tar.gz) = 4245d79bc0b0dfb7815ece3f32a18c288e8f4190f5c72db41520987c7c315f29
 SIZE (golang-text-b7ef84a_GH0.tar.gz) = 6572198
 SHA256 (alecthomas-kingpin-947dcec_GH0.tar.gz) = 3de3402ae26695879bc209abd57a6108e3f1a172a874d26c2578fbb29d4668cb
@@ -53,6 +55,8 @@ SHA256 (hlandau-service-b64b346_GH0.tar.gz) = 04aeae94906a4a7ced428e26b573e483a9
 SIZE (hlandau-service-b64b346_GH0.tar.gz) = 14006
 SHA256 (hlandau-svcutils-c25dac4_GH0.tar.gz) = 09edc8a1ac0c8f63e99cb4a217aa5b864d200829e49d24c413d9a75b5466b818
 SIZE (hlandau-svcutils-c25dac4_GH0.tar.gz) = 10095
+SHA256 (square-go-jose-4ef0f1b_GH0.tar.gz) = d1c88b556ba01b2650743f6edd2a853c352d372325cb1d04e28b12e4620fb91f
+SIZE (square-go-jose-4ef0f1b_GH0.tar.gz) = 304087
 SHA256 (square-go-jose-aa2e30f_GH0.tar.gz) = 9af3ff28889e88ef9daa42e54f37e2cacff42f837e80602116c435cf4f1a48fc
 SIZE (square-go-jose-aa2e30f_GH0.tar.gz) = 260572
 SHA256 (tylerb-graceful-4654dfb_GH0.tar.gz) = 1c3320d71c47adb5ffcc10f0e5c641e0c9ccdb7e03e9d5f2f42498d2b809f217