Index: head/devel/qt5-core/Makefile
===================================================================
--- head/devel/qt5-core/Makefile	(revision 378134)
+++ head/devel/qt5-core/Makefile	(revision 378135)
@@ -1,49 +1,49 @@
 # $FreeBSD$
 
 PORTNAME=	core
 DISTVERSION=	${QT5_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt5-
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt core non-graphical module
 
 LIB_DEPENDS=	libicui18n.so:${PORTSDIR}/devel/icu \
 		libpcre.so:${PORTSDIR}/devel/pcre
 
 USE_GNOME=	glib20
 USE_QT5=	qmake_build buildtools_build
 QT_DIST=	base
 HAS_CONFIGURE=	yes
 # Disable (almost) everything to install minimal qconfig.h.
 # -no-feature-* adds QT_NO_* (for features which have no switch or
 # that need to be detected).
 CONFIGURE_ARGS=	-no-accessibility -no-gif -no-libpng -no-libjpeg \
 		-no-openssl -no-gui -no-widgets -no-cups \
 		-no-iconv -no-dbus -no-xcb -no-opengl \
 		-no-feature-glib -no-feature-alsa \
 		-no-feature-concurrent -no-feature-evdev \
 		-no-fontconfig -no-freetype \
 		-no-gtkstyle -no-feature-inotify -no-feature-libudev \
 		-no-feature-pulseaudio -no-feature-xcb -no-xinput \
 		-no-xkb -no-xrender -no-xshape -no-xsync -no-xvideo \
 		-no-xkbcommon -no-harfbuzz
 USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
 
 BUILD_WRKSRC=	${WRKSRC}/src/corelib
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 
 QT_DEFINES=	GLIB
 QT_CONFIG=	glib icu
 
 .include <bsd.port.pre.mk>
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/src/3rdparty/harfbuzz/src/harfbuzz*.h \
 		${STAGEDIR}${PREFIX}/${QT_INCDIR_REL}/QtCore/${QT5_VERSION:C/-.*//}/QtCore/private
 # Allow qconfig.h to be customized by single ports.
 	${REINPLACE_CMD} -i "" '1 s|.*|#include <QtCore/qconfig-modules.h>|' \
 		${STAGEDIR}${PREFIX}/${QT_INCDIR_REL}/QtCore/qconfig.h
 
 .include <bsd.port.post.mk>
Index: head/devel/qt5-core/files/patch-git_7ca54ce5
===================================================================
--- head/devel/qt5-core/files/patch-git_7ca54ce5	(nonexistent)
+++ head/devel/qt5-core/files/patch-git_7ca54ce5	(revision 378135)
@@ -0,0 +1,43 @@
+commit 7ca54ce5d964646a141acac82f468476f2d66c35
+Author: Kai Koehne <kai.koehne@digia.com>
+Date:   Wed Oct 1 13:22:02 2014 +0200
+
+    Avoid naming clashes with QStringLiteral local variable
+    
+    MSVC 2013 complains about the use of 's' if a variable 's' is already
+    defined in the context:
+    
+    error C2373: 's' : redefinition; different type modifiers
+    error C3493: 's' cannot be implicitly captured because no default capture
+    mode has been specified
+    
+    This looks like a compiler bug. Anyhow, it's easy to avoid the clash in
+    most cases by using a more distinctive name ...
+    
+    Task-number: QTBUG-41706
+    Change-Id: Iaff1b6d37897fa8cf9e4913effa0498f9fd7bb07
+    Reviewed-by: hjk <hjk121@nokiamail.com>
+    Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
+    Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
+
+--- src/corelib/tools/qstring.h
++++ src/corelib/tools/qstring.h
+@@ -1,6 +1,6 @@
+ /****************************************************************************
+ **
+-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
++** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+ ** Contact: http://www.qt-project.org/legal
+ **
+ ** This file is part of the QtCore module of the Qt Toolkit.
+@@ -167,8 +167,8 @@ Q_STATIC_ASSERT_X(sizeof(qunicodechar) == 2,
+             Q_STATIC_STRING_DATA_HEADER_INITIALIZER(Size), \
+             QT_UNICODE_LITERAL(str) }; \
+         QStringDataPtr holder = { qstring_literal.data_ptr() }; \
+-        const QString s(holder); \
+-        return s; \
++        const QString qstring_literal_temp(holder); \
++        return qstring_literal_temp; \
+     }()) \
+     /**/
+ 

Property changes on: head/devel/qt5-core/files/patch-git_7ca54ce5
___________________________________________________________________
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