Index: branches/2017Q1/devel/qt4-linguist/Makefile
===================================================================
--- branches/2017Q1/devel/qt4-linguist/Makefile	(revision 431846)
+++ branches/2017Q1/devel/qt4-linguist/Makefile	(revision 431847)
@@ -1,57 +1,58 @@
 # Created by: lofi@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	linguist
 DISTVERSION=	${QT4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt4-
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt 4 localization tools
 
 USE_QT4=	qmake_build designer_build moc_build rcc_build uic_build \
 		assistant_run gui linguisttools_run network xml
 QT_DIST=	yes
 
 HAS_CONFIGURE=	yes
 
 ALL_TARGET=	first
 CONFIGURE_ENV?=	QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
 MAKE_ENV?=	QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib:$$LD_LIBRARY_PATH \
 		PATH=${WRKSRC}/bin:$$PATH
 
 DESKTOP_ENTRIES="Qt 4 Linguist" "" \
 		"${PREFIX}/share/pixmaps/linguist-qt4.png" \
 		"${PREFIX}/${QT_BINDIR_REL}/linguist${_QT_BINSUFX}" \
 		"Development;Qt;" true
 
 DO_NOT_EXTRACT=	demos doc examples mkspecs qmake translations \
 		src/activeqt src/dbus src/multimedia src/network src/opengl \
 		src/openvg src/phonon src/qt3support src/s60installs \
 		src/s60main src/script src/scripttools src/sql src/svg \
 		src/testlib src/tools src/winmain src/xmlpatterns \
 		src/3rdparty/clucene src/3rdparty/freetype \
 		src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \
 		src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit
 .for dne in ${DO_NOT_EXTRACT}
 EXTRACT_AFTER_ARGS+=	--exclude '${DISTNAME}/${dne}'
 .endfor
 
 BUILD_WRKSRC=	${WRKSRC}/tools/${PORTNAME}
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 
 pre-configure:
 	${REINPLACE_CMD} -E -e 's|^TARGET[[:blank:]]*=[[:blank:]]*([a-z]+)|TARGET=\1${_QT_BINSUFX}|g' \
 		${BUILD_WRKSRC}/${PORTNAME}.pro ${BUILD_WRKSRC}/${PORTNAME}/${PORTNAME}.pro \
 		${BUILD_WRKSRC}/lrelease/lrelease.pro ${BUILD_WRKSRC}/lupdate/lupdate.pro
 	${MKDIR} ${WRKSRC}/mkspecs
 	${LN} -sf ${QMAKE} ${WRKSRC}/bin/qmake
 	${LN} -sf ${MOC} ${WRKSRC}/bin/moc
 	${LN} -sf ${UIC} ${WRKSRC}/bin/uic
 	${LN} -sf ${RCC} ${WRKSRC}/bin/rcc
 
 post-install:
 	${INSTALL_DATA} ${INSTALL_WRKSRC}/linguist/images/icons/linguist-128-32.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/linguist-qt4.png
 
 .include <bsd.port.mk>
Index: branches/2017Q1/devel/qt4-linguist/files/patch-tools_linguist_linguist_messagemodel.cpp
===================================================================
--- branches/2017Q1/devel/qt4-linguist/files/patch-tools_linguist_linguist_messagemodel.cpp	(nonexistent)
+++ branches/2017Q1/devel/qt4-linguist/files/patch-tools_linguist_linguist_messagemodel.cpp	(revision 431847)
@@ -0,0 +1,14 @@
+Fix bogus pointer comparison. Backport of upstream commit
+https://github.com/qt/qttools/commit/7138c963f9d1258bc1b49cb4d63c3e2b7d0ccfda
+
+--- tools/linguist/linguist/messagemodel.cpp.orig	2015-05-07 14:14:39 UTC
++++ tools/linguist/linguist/messagemodel.cpp
+@@ -183,7 +183,7 @@ static int calcMergeScore(const DataMode
+         if (ContextItem *c = one->findContext(oc->context())) {
+             for (int j = 0; j < oc->messageCount(); ++j) {
+                 MessageItem *m = oc->messageItem(j);
+-                if (c->findMessage(m->text(), m->comment()) >= 0)
++                if (c->findMessage(m->text(), m->comment()))
+                     ++inBoth;
+             }
+         }

Property changes on: branches/2017Q1/devel/qt4-linguist/files/patch-tools_linguist_linguist_messagemodel.cpp
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ 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 431846)
+++ branches/2017Q1	(revision 431847)

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