sysutils/bup: Update to 0.31

Passes bup's test suite on netbsd-8/amd64, with TZ=UTC (needed to work
around what is likely a bug in git around DST changes).

Packaging changes/notes:
  - bup depends directly on readline, GNU version required
  - man pages have not yet been updated

Upstream changes include many minor improvements and bugfixes,
and:

Notable changes in 0.31 (since 0.30.1)
======================================

* Python 3 is now supported, and Python 2 support is deprecated.  It's
  possible that we'll stop new development for Python 2 fairly soon.
  If so, we'll probably continue to fix bugs in the last Python 2
  compatible version for a while, but please make plans to migrate.

* `bup features` has been added.  It reports information about bup
  itself, including the Python version, and the current availability
  of features like readline or support for POSIX ACLs.

Build and install
-----------------

* `bup` itself is now located in now located in the cmd/ directory in
  the install tree and finds sub-commands, etc. relative to its own
  location.

3 files changed, 16 insertions, 11 deletions

diff --git a/sysutils/bup/Makefile b/sysutils/bup/Makefile
index ce25b684b21..3649854b3c0 100644
--- a/sysutils/bup/Makefile
+++ b/sysutils/bup/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.45 2020/08/31 18:11:24 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2020/09/20 16:44:54 gdt Exp $
 
-DISTNAME=	bup-0.30.1
-PKGREVISION=	1
+DISTNAME=	bup-0.31
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_GITHUB:=bup/}
 # bup has two problems that make packaging difficult.  One is that
@@ -31,7 +30,6 @@ COMMENT=	Highly efficient file backup system based on the git packfile format
 LICENSE=	gnu-gpl-v2
 
 DEPENDS+=	par2-[0-9]*:../../archivers/par2
-DEPENDS+=	${PYPKGPREFIX}-readline-[0-9]*:../../devel/py-readline
 DEPENDS+=	${PYPKGPREFIX}-tornado-[0-9]*:../../www/py-tornado
 DEPENDS+=	git-base-[0-9]*:../../devel/git-base
 
@@ -81,5 +79,7 @@ post-install:
 
 .include "options.mk"
 
+READLINE_DEFAULT=	readline
+.include "../../mk/readline.buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/bup/PLIST b/sysutils/bup/PLIST
index a405387c729..6fa7640c4bb 100644
--- a/sysutils/bup/PLIST
+++ b/sysutils/bup/PLIST
@@ -1,8 +1,7 @@
-@comment $NetBSD: PLIST,v 1.9 2019/11/19 15:01:25 gdt Exp $
+@comment $NetBSD: PLIST,v 1.10 2020/09/20 16:44:54 gdt Exp $
 bin/bup
 lib/bup/bup/__init__.py
 lib/bup/bup/_helpers.so
-lib/bup/bup/_release.py
 lib/bup/bup/bloom.py
 lib/bup/bup/client.py
 lib/bup/bup/compat.py
@@ -14,24 +13,30 @@ lib/bup/bup/hashsplit.py
 lib/bup/bup/helpers.py
 lib/bup/bup/hlinkdb.py
 lib/bup/bup/index.py
+lib/bup/bup/io.py
 lib/bup/bup/ls.py
 lib/bup/bup/metadata.py
 lib/bup/bup/midx.py
 lib/bup/bup/options.py
 lib/bup/bup/path.py
+lib/bup/bup/pwdgrp.py
+lib/bup/bup/py2raise.py
 lib/bup/bup/repo.py
 lib/bup/bup/rm.py
 lib/bup/bup/shquote.py
+lib/bup/bup/source_info.py
 lib/bup/bup/ssh.py
 lib/bup/bup/version.py
 lib/bup/bup/vfs.py
 lib/bup/bup/vint.py
 lib/bup/bup/xstat.py
+lib/bup/cmd/bup
 lib/bup/cmd/bup-bloom
 lib/bup/cmd/bup-cat-file
 lib/bup/cmd/bup-daemon
 lib/bup/cmd/bup-damage
 lib/bup/cmd/bup-drecurse
+lib/bup/cmd/bup-features
 lib/bup/cmd/bup-fsck
 lib/bup/cmd/bup-ftp
 lib/bup/cmd/bup-fuse
diff --git a/sysutils/bup/distinfo b/sysutils/bup/distinfo
index ff97eeef1ae..31aed3330c0 100644
--- a/sysutils/bup/distinfo
+++ b/sysutils/bup/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.16 2020/06/16 21:09:36 gdt Exp $
+$NetBSD: distinfo,v 1.17 2020/09/20 16:44:54 gdt Exp $
 
-SHA1 (bup-0.30.1.tar.gz) = 01e1f4de6f2b12a1b0442f8e2750fe744f4c80f7
-RMD160 (bup-0.30.1.tar.gz) = 13ce7dc203fdea7f8dd66981d5bf71233d1f5cc7
-SHA512 (bup-0.30.1.tar.gz) = 467bdcb55a340b3c9c591c0aef6abd7d687879d5f608dce4fc26085ff3f41af204cc2720bc99fdfe61ebb846d61dea63713b69c68e41361e92d5709ede6f12d7
-Size (bup-0.30.1.tar.gz) = 435736 bytes
+SHA1 (bup-0.31.tar.gz) = f20d068dd3296b4b3dfc0ae19f770bc1afe94a94
+RMD160 (bup-0.31.tar.gz) = 3b5a1f73ea66503e8c7b7e92ccdba14ecb66f74e
+SHA512 (bup-0.31.tar.gz) = 9ff38bc945c6617610777bf2c484362503586a9bb486a64924d7f821548e2669905ab173486190706e90eebe5a0ae1c1393901a16499581b229cfde041ebdcee
+Size (bup-0.31.tar.gz) = 454636 bytes
 SHA1 (bup-man-bd52b8fffc37788fc00071a8e46842e60ef30926.tar.gz) = 4c7cfdc7eb0b8448fa2d16d4296de2c270843d1c
 RMD160 (bup-man-bd52b8fffc37788fc00071a8e46842e60ef30926.tar.gz) = 96e51e4d1283fafbab1ca42e81f864d3bea694af
 SHA512 (bup-man-bd52b8fffc37788fc00071a8e46842e60ef30926.tar.gz) = 7c94222ef92fb338ac18ab09373af6203d254916044eab2917869afcb2ae054f91a3de97296a74c0bdbc1fddb172b0c27406701c9c9f03c237c1350d8a16cf75