Index: head/devel/qgit/Makefile
===================================================================
--- head/devel/qgit/Makefile
+++ head/devel/qgit/Makefile
@@ -2,24 +2,20 @@
 # $FreeBSD$
 
 PORTNAME=	qgit
-PORTVERSION=	2.3
-PORTREVISION=	2
+DISTVERSIONPREFIX=	${PORTNAME}-
+DISTVERSION=	2.7
 CATEGORIES=	devel
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}4/${PORTVERSION}
-PKGNAMESUFFIX=	-qt4
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	adridg@FreeBSD.org
 COMMENT=	Graphical interface to git repositories
 
-USES=		qmake tar:bzip2
-USE_QT4=	corelib gui moc_build rcc_build uic_build
-MAKE_JOBS_UNSAFE=	yes
+LICENSE=	GPLv2
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
+USES=		cmake:outsource
+USE_QT5=	core gui widgets \
+		buildtools_build qmake_build
 
-PLIST_FILES=	bin/${PORTNAME}
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+USE_GITHUB=	yes
+GH_ACCOUNT=	tibirna
 
 .include <bsd.port.mk>
Index: head/devel/qgit/distinfo
===================================================================
--- head/devel/qgit/distinfo
+++ head/devel/qgit/distinfo
@@ -1,2 +1,3 @@
-SHA256 (qgit-2.3.tar.bz2) = a5fdd7e27fea376790eed787e22f4863eb9d2fe0217fd98b9fdbcf47a45bdc64
-SIZE (qgit-2.3.tar.bz2) = 206812
+TIMESTAMP = 1505308761
+SHA256 (tibirna-qgit-qgit-2.7_GH0.tar.gz) = 183d116b2fb38c6a76c99577f6cc86f0241f8b6bdc74042be4cb8631567f5e9e
+SIZE (tibirna-qgit-qgit-2.7_GH0.tar.gz) = 259624
Index: head/devel/qgit/files/patch-src_git.cpp
===================================================================
--- head/devel/qgit/files/patch-src_git.cpp
+++ head/devel/qgit/files/patch-src_git.cpp
@@ -1,24 +0,0 @@
-repo-config was aliased to config as of git 1.7 (2010)
-and was removed, it seems, in 1.8.5 (2012). None of those
-git versions are still supported upstream; switch to git config.
-
---- src/git.cpp.orig	2009-03-12 17:14:31 UTC
-+++ src/git.cpp
-@@ -425,7 +425,7 @@ void Git::setTextCodec(QTextCodec* tc) {
- 	if (name == "Big5-HKSCS")
- 		name = "Big5";
- 
--	run("git repo-config i18n.commitencoding " + name);
-+	run("git config i18n.commitencoding " + name);
- }
- 
- QTextCodec* Git::getTextCodec(bool* isGitArchive) {
-@@ -435,7 +435,7 @@ QTextCodec* Git::getTextCodec(bool* isGi
- 		return NULL;
- 
- 	QString runOutput;
--	if (!run("git repo-config --get i18n.commitencoding", &runOutput))
-+	if (!run("git config --get i18n.commitencoding", &runOutput))
- 		return NULL;
- 
- 	if (runOutput.isEmpty()) // git docs says default is utf-8
Index: head/devel/qgit/pkg-descr
===================================================================
--- head/devel/qgit/pkg-descr
+++ head/devel/qgit/pkg-descr
@@ -1,4 +1,5 @@
-QGit is a git GUI viewer built on Qt/C++.
+QGit is a git GUI viewer.
+
 With qgit you will be able to browse revisions history, view patch content and
 changed files, graphically following different development branches.
 
@@ -8,10 +9,11 @@
 - Apply or format patch series from selected commits, drag and drop commits
 between two instances of qgit.
 - Associate commands sequences, scripts and anything else executable to a
-custom action. Actions can be run from menu and corresponding output is grabbed
-by a terminal window. qgit implements a GUI for the most common StGIT commands
-like push/pop and apply/format patches. You can also create new patches or
-refresh current top one using the same semantics of git commit,
-i.e. cherry picking single modified files.
+  custom action. Actions can be run from menu and corresponding output is
+  grabbed by a terminal window.
+- qgit implements a GUI for the most common StGIT commands
+  like push/pop and apply/format patches. You can also create new patches or
+  refresh current top one using the same semantics of git commit,
+  i.e. cherry picking single modified files.
 
-WWW: https://sourceforge.net/projects/qgit/
+WWW: https://github.com/tibirna/qgit
Index: head/devel/qgit/pkg-plist
===================================================================
--- head/devel/qgit/pkg-plist
+++ head/devel/qgit/pkg-plist
@@ -0,0 +1,4 @@
+bin/qgit
+share/applications/qgit.desktop
+share/icons/hicolor/48x48/apps/qgit.png
+share/metainfo/qgit.appdata.xml