From e7e36108a46e1e485e2e7ba271ec8fe4b85bc335 Mon Sep 17 00:00:00 2001
From: kn <kn@openbsd.org>
Date: Sat, 14 Mar 2020 15:59:46 +0000
Subject: [PATCH] Update to 1.16, use Python 3

Upstream moved to GitHub, sadly without tags or release tarballs.
Sort RDEPs while here.

Feedback OK sthen
---
 misc/ietf-cli/Makefile                  | 15 ++++++++-------
 misc/ietf-cli/distinfo                  |  4 ++--
 misc/ietf-cli/patches/patch-ietf        | 14 +++++++++-----
 misc/ietf-cli/patches/patch-ietf_config |  5 ++++-
 misc/ietf-cli/pkg/PLIST                 |  4 ++--
 5 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/misc/ietf-cli/Makefile b/misc/ietf-cli/Makefile
index 996dd7bf28d..ff005c1975f 100644
--- a/misc/ietf-cli/Makefile
+++ b/misc/ietf-cli/Makefile
@@ -1,8 +1,11 @@
-# $OpenBSD: Makefile,v 1.3 2019/07/12 20:47:51 sthen Exp $
+# $OpenBSD: Makefile,v 1.4 2020/03/14 15:59:46 kn Exp $
 
 COMMENT=	command-line tools to work with RFCs and Internet Drafts
 
-DISTNAME=	ietf-cli-1.14
+GH_ACCOUNT=	paulehoffman
+GH_PROJECT=	ietf-cli
+GH_TAGNAME=	4b2b52dc333b6b59403b102349572f8af1b20a52
+DISTNAME=	${GH_PROJECT}-1.16
 
 CATEGORIES=	misc net books
 
@@ -11,17 +14,15 @@ HOMEPAGE=	https://trac.tools.ietf.org/tools/ietf-cli/
 # WTFPL
 PERMIT_PACKAGE=	Yes
 
-# packaged from http://svn.tools.ietf.org/svn/tools/ietf-cli/ r32
-MASTER_SITES=	https://spacehopper.org/mirrors/
-
 MODULES=	lang/python
+MODPY_VERSION=	${MODPY_DEFAULT_VERSION_3}
 MODPY_BUILDDEP=	No
 
 NO_BUILD=	Yes
 NO_TEST=	Yes
 
-RUN_DEPENDS=	net/rsync \
-		devel/xdg-utils
+RUN_DEPENDS=	devel/xdg-utils \
+		net/rsync
 
 PKG_ARCH=	*
 
diff --git a/misc/ietf-cli/distinfo b/misc/ietf-cli/distinfo
index 01aa5180621..c5b2b2292ec 100644
--- a/misc/ietf-cli/distinfo
+++ b/misc/ietf-cli/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ietf-cli-1.14.tar.gz) = IISinevmIKGaaM1jq7HdB7o5BZCUGUXvG3mYh5KW/iQ=
-SIZE (ietf-cli-1.14.tar.gz) = 14447
+SHA256 (ietf-cli-1.16.tar.gz) = p5e+Qob6zYGItFBjykFuAx93lAH3y3mNW+W6Jtot/AM=
+SIZE (ietf-cli-1.16.tar.gz) = 16619
diff --git a/misc/ietf-cli/patches/patch-ietf b/misc/ietf-cli/patches/patch-ietf
index ffe41c838e5..24d6c8251e6 100644
--- a/misc/ietf-cli/patches/patch-ietf
+++ b/misc/ietf-cli/patches/patch-ietf
@@ -1,12 +1,16 @@
-$OpenBSD: patch-ietf,v 1.1.1.1 2015/11/21 20:13:04 sthen Exp $
---- ietf.orig	Fri Nov 20 20:46:35 2015
-+++ ietf	Fri Nov 20 20:57:03 2015
+$OpenBSD: patch-ietf,v 1.2 2020/03/14 15:59:46 kn Exp $
+
+Adjust ConfigPlaces.
+
+Index: ietf
+--- ietf.orig
++++ ietf
 @@ -78,7 +78,7 @@ __license__ = "https://en.wikipedia.org/wiki/WTFPL"
  
  KnownCmds = ("auth48", "author", "bcp", "charter", "conflict", "diff", "draft", "draftstatus", "iesg", "mirror", \
- 	"rfc", "rfcextra", "rfcinfo", "rfcstatus", "tools", "tracker", "foo")
+ 	"rfc", "rfcextra", "rfcinfo", "rfcstatus", "rg", "std", "tools", "tracker", "foo")
 -ConfigPlaces = ("~/bin/ietf.config", "/usr/local/bin/ietf.config", "~/.ietf/ietf.config")
 +ConfigPlaces = ("~/.ietf/ietf.config", "${SYSCONFDIR}/ietf.config")
- RFCZerosPat = compile(r'^0+(.*)')
  
  # Make a block of text that can be executed in the CLI
+ CLICmdCode = ""
diff --git a/misc/ietf-cli/patches/patch-ietf_config b/misc/ietf-cli/patches/patch-ietf_config
index 8fb7454bd4b..0af27d1e437 100644
--- a/misc/ietf-cli/patches/patch-ietf_config
+++ b/misc/ietf-cli/patches/patch-ietf_config
@@ -1,4 +1,7 @@
-$OpenBSD: patch-ietf_config,v 1.1.1.1 2015/11/21 20:13:04 sthen Exp $
+$OpenBSD: patch-ietf_config,v 1.2 2020/03/14 15:59:46 kn Exp $
+
+Adjust MirrorDir and DisplayTextCommand.
+
 --- ietf.config.orig	Fri Nov 20 20:46:35 2015
 +++ ietf.config	Fri Nov 20 21:09:49 2015
 @@ -30,7 +30,7 @@ __license__ = "http://en.wikipedia.org/wiki/WTFPL"
diff --git a/misc/ietf-cli/pkg/PLIST b/misc/ietf-cli/pkg/PLIST
index de64793a35d..206e690e053 100644
--- a/misc/ietf-cli/pkg/PLIST
+++ b/misc/ietf-cli/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2015/11/21 20:13:04 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.2 2020/03/14 15:59:46 kn Exp $
 @extraunexec rm -rf ${LOCALSTATEDIR}/db/ietf-mirrors/*
 bin/ietf
 share/doc/ietf/
@@ -6,6 +6,6 @@ share/doc/ietf/README
 share/examples/ietf/
 share/examples/ietf/ietf.config
 @sample ${SYSCONFDIR}/ietf.config
-@group wheel
 @mode 775
+@group wheel
 @sample ${LOCALSTATEDIR}/db/ietf-mirrors/