Index: head/devel/hub/Makefile
===================================================================
--- head/devel/hub/Makefile	(revision 474443)
+++ head/devel/hub/Makefile	(revision 474444)
@@ -1,39 +1,55 @@
 # Created by: Simon Olofsson <simon@olofsson.de>
 # $FreeBSD$
 
 PORTNAME=	hub
-PORTVERSION=	2.4.0
-DISTVERSIONPREFIX=v
-CATEGORIES=	devel
+PORTVERSION=	2.5.0
+CATEGORIES=	devel sysutils
 
 MAINTAINER=	egypcio@googlemail.com
 COMMENT=	Introduces git to GitHub
 
 LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	go:lang/go \
-		bash:shells/bash \
-		ronn:textproc/rubygem-ronn
-
+BUILD_DEPENDS=	ronn:textproc/rubygem-ronn
 RUN_DEPENDS=	git:devel/git
 
+USES=		go
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	github
+GH_TAGNAME=	v${PORTVERSION}
 
-PLIST_FILES=	bin/hub \
-		etc/bash_completion.d/hub \
-		share/zsh/site-functions/_hub \
+GO_PKGNAME=	github.com/github/hub
+
+PLIST_FILES=	bin/hub	\
 		man/man1/hub.1.gz
-do-build:
-	@cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${LOCALBASE}/bin/bash script/build
-	@cd ${WRKSRC}/share/man/man1 ; ronn -r hub.1.ronn
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/hub ${STAGEDIR}${PREFIX}/bin
+OPTIONS_DEFINE=		BASH FISH ZSH
+
+BASH_PLIST_FILES=	etc/bash_completion.d/hub
+BASH_RUN_REPENDS=	bash:shells/bash
+FISH_PLIST_FILES=	share/fish/completions/hub.fish
+FISH_RUN_REPENDS=	fish:shells/fish
+ZSH_PLIST_FILES=	share/zsh/site-functions/_hub
+ZSH_RUN_REPENDS=	zsh:shells/zsh
+
+post-build:
+	${MKDIR} ${STAGEDIR}${MAN1PREFIX}/man/man1
+	cd ${WRKSRC}/share/man/man1 && \
+		${LOCALBASE}/bin/ronn -r hub.1.ronn
 	${INSTALL_MAN} ${WRKSRC}/share/man/man1/hub.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
-	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
+
+post-install-BASH-on:
+	${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
 	${INSTALL_DATA} ${WRKSRC}/etc/hub.bash_completion.sh ${STAGEDIR}${PREFIX}/etc/bash_completion.d/hub
-	@${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions
+
+post-install-FISH-on:
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/fish/completions
+	${INSTALL_DATA} ${WRKSRC}/etc/hub.fish_completion ${STAGEDIR}${PREFIX}/share/fish/completions/hub.fish
+
+post-install-ZSH-on:
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions
 	${INSTALL_DATA} ${WRKSRC}/etc/hub.zsh_completion ${STAGEDIR}${PREFIX}/share/zsh/site-functions/_hub
 
 .include <bsd.port.mk>
Index: head/devel/hub/distinfo
===================================================================
--- head/devel/hub/distinfo	(revision 474443)
+++ head/devel/hub/distinfo	(revision 474444)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1529589019
-SHA256 (github-hub-v2.4.0_GH0.tar.gz) = 894eb112be9aa0464fa2c63f48ae8e573ef9e32a00bad700e27fd09a0cb3be4b
-SIZE (github-hub-v2.4.0_GH0.tar.gz) = 984312
+TIMESTAMP = 1531125957
+SHA256 (github-hub-2.5.0-v2.5.0_GH0.tar.gz) = 8e3bda092ddc81eaf208c5fd2b87f66e030012129d55fa631635c6adf8437941
+SIZE (github-hub-2.5.0-v2.5.0_GH0.tar.gz) = 990029