hub: Update net/hub to 2.5.0

pkgsrc changes:
 - Delete patch-github_editor.go, imported upstream
 - Adjust SUBST_SEDs commands for the current man page
 - Manually regen files/hub.1 man page

Changes:
2.5.0
-----
Features
 - Have ci-status also query Checks API

Fixes
 - Do not pass `--cmd' to vi editor to ensure compatibility with older vi
 - Simplify cherry-picking commits from pull request URLs
 - Allow single-character branches/tag names in hub compare
 - Fix hub compare for Enterprise when <USER> is specified
 - Support remote add -t BRANCH argument
 - Bash shell completion fixes for git 2.18
 - Documentation fixes

4 files changed, 17 insertions, 31 deletions

diff --git a/net/hub/Makefile b/net/hub/Makefile
index 0f06c06b8d0..8e7e13c8076 100644
--- a/net/hub/Makefile
+++ b/net/hub/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2018/06/12 17:50:26 bsiegert Exp $
+# $NetBSD: Makefile,v 1.9 2018/07/14 11:06:17 leot Exp $
 
-DISTNAME=	hub-2.4.0
-PKGREVISION=	1
+DISTNAME=	hub-2.5.0
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GITHUB:=github/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
@@ -20,10 +19,8 @@ SUBST_CLASSES+=		man
 SUBST_STAGE.man=	pre-configure
 SUBST_MESSAGE.man=	Fix hub name in hub(1) man page
 SUBST_FILES.man=	share/man/man1/hub.1
-SUBST_SED.man+=		-e 's/\\fBgit/\\fBhub/g'
 SUBST_SED.man+=		-e 's/\$$ git/$$ hub/'
 SUBST_SED.man+=		-e '/\$$ GITHUB_HOST=/ s/ git clone / hub clone /'
-SUBST_SED.man+=		-e 's/\.SS "git/.SS "hub/'
 
 INSTALLATION_DIRS+=	bin ${PKGMANDIR}/man1
 
diff --git a/net/hub/distinfo b/net/hub/distinfo
index 62cca9a0fb8..35f4a0bed87 100644
--- a/net/hub/distinfo
+++ b/net/hub/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.4 2018/06/10 12:14:30 leot Exp $
+$NetBSD: distinfo,v 1.5 2018/07/14 11:06:17 leot Exp $
 
-SHA1 (hub-2.4.0.tar.gz) = 4b04365f84169eede7e1414838fde2017a869102
-RMD160 (hub-2.4.0.tar.gz) = 2bec11625461b6ca68632c9486bf9ded383c514f
-SHA512 (hub-2.4.0.tar.gz) = 302a508b7353ed96f969d399d87cd395b5561490c41f46043969a49eaa997a63d2649b3f6f23a565f1b8c821f93c4db1b8c7104c85d0b08fc6d96f03e765f2f7
-Size (hub-2.4.0.tar.gz) = 984312 bytes
-SHA1 (patch-github_editor.go) = fa21efb055ea91c689eceb676548cf528a6aaefe
+SHA1 (hub-2.5.0.tar.gz) = df0031d0c97886a18fe33bfa55dc31a1bd80c253
+RMD160 (hub-2.5.0.tar.gz) = 515475bf4a714e99bd69014da4e5e161d5def6cc
+SHA512 (hub-2.5.0.tar.gz) = 100e9695ef0bc0f9ea0decdc22d01696f520d741529c1591bbd10d49e9ba14455a12c60343aefb3af619b5dded7a53574c0b2b111005fb045637bc95fb52a4cb
+Size (hub-2.5.0.tar.gz) = 990029 bytes
diff --git a/net/hub/files/hub.1 b/net/hub/files/hub.1
index 3b1f6c39331..40bc159df62 100644
--- a/net/hub/files/hub.1
+++ b/net/hub/files/hub.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "HUB" "1" "May 2018" "" ""
+.TH "HUB" "1" "July 2018" "" ""
 .
 .SH "NAME"
 \fBhub\fR \- make git easier with GitHub
@@ -90,6 +90,10 @@ hub\-create(1)
 Create a new repository on GitHub and add a git remote for it\.
 .
 .TP
+hub\-delete(1)
+Delete a repository on Github\.
+.
+.TP
 hub\-fork(1)
 Fork the current project on GitHub and add a git remote for it\.
 .
@@ -98,6 +102,10 @@ hub\-pull\-request(1)
 Create a GitHub pull request\.
 .
 .TP
+hub\-pr(1)
+List and checkout GitHub pull requests\.
+.
+.TP
 hub\-issue(1)
 List and create GitHub issues\.
 .
@@ -170,7 +178,7 @@ Enable verbose output from hub commands\.
 .
 .TP
 \fBHUB_CONFIG\fR
-Set the location of a custom config file (default: \fB~/\.config/hub\fR)\.
+The file path where hub configuration is read from and stored\. If \fBXDG_CONFIG_HOME\fR is present, the default is \fB$XDG_CONFIG_HOME/hub\fR; otherwise it\'s \fB$HOME/\.config/hub\fR\. The configuration file is also searched for in \fBXDG_CONFIG_DIRS\fR per XDG Base Directory Specification\.
 .
 .TP
 \fBHUB_PROTOCOL\fR
diff --git a/net/hub/patches/patch-github_editor.go b/net/hub/patches/patch-github_editor.go
deleted file mode 100644
index ebe2fe72caa..00000000000
--- a/net/hub/patches/patch-github_editor.go
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-github_editor.go,v 1.1 2018/06/10 10:42:56 leot Exp $
-
-Avoid vim-isms.
-
-vi(1) is not always vim, avoid to treat it as such and to pass to
-it possible not supported arguments.
-
---- github/editor.go.orig	2018-05-29 13:34:37.000000000 +0000
-+++ github/editor.go
-@@ -129,7 +129,7 @@ func (e *Editor) readContent() (content 
- 
- func openTextEditor(program, file string) error {
- 	editCmd := cmd.New(program)
--	r := regexp.MustCompile(`\b(?:[gm]?vim|vi)(?:\.exe)?$`)
-+	r := regexp.MustCompile(`\b(?:[gm]?vim)(?:\.exe)?$`)
- 	if r.MatchString(editCmd.Name) {
- 		editCmd.WithArg("--cmd")
- 		editCmd.WithArg("set ft=gitcommit tw=0 wrap lbr")