Index: branches/2017Q1/devel/qgit/Makefile
===================================================================
--- branches/2017Q1/devel/qgit/Makefile	(revision 435563)
+++ branches/2017Q1/devel/qgit/Makefile	(revision 435564)
@@ -1,25 +1,25 @@
 # Created by: Ion-Mihai "IOnut" Tetcu <itetcu@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	qgit
 PORTVERSION=	2.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}4/${PORTVERSION}
 PKGNAMESUFFIX=	-qt4
 
 MAINTAINER=	itetcu@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
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 PLIST_FILES=	bin/${PORTNAME}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
Index: branches/2017Q1/devel/qgit/files/patch-src_git.cpp
===================================================================
--- branches/2017Q1/devel/qgit/files/patch-src_git.cpp	(nonexistent)
+++ branches/2017Q1/devel/qgit/files/patch-src_git.cpp	(revision 435564)
@@ -0,0 +1,24 @@
+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

Property changes on: branches/2017Q1/devel/qgit/files/patch-src_git.cpp
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1,2 ##
+yes
+\ No newline at end of property
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2017Q1
===================================================================
--- branches/2017Q1	(revision 435563)
+++ branches/2017Q1	(revision 435564)

Property changes on: branches/2017Q1
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r435291