Index: head/devel/qmake5/Makefile
===================================================================
--- head/devel/qmake5/Makefile	(revision 420772)
+++ head/devel/qmake5/Makefile	(revision 420773)
@@ -1,64 +1,65 @@
 # $FreeBSD$
 
 PORTNAME=	qmake
 DISTVERSION=	${QT5_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt5-
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt Makefile generator
 
 USE_QT5=	# empty
 USES=		pkgconfig shebangfix
 SHEBANG_FILES=	mkspecs/macx-ios-clang/rename_main.sh
 QT_DIST=	base
 REINPLACE_ARGS=	-i ""
 HAS_CONFIGURE=	yes
 # Disable everything to install minimal qconfig.pri.
 CONFIGURE_ARGS=	-no-accessibility -no-openssl -no-gui -no-cups \
 		-no-iconv -no-icu -no-dbus -no-xcb -no-opengl \
 		-no-glib -no-audio-backend -no-fontconfig \
 		-no-gtkstyle -no-xinput2 -no-xrender \
 		-no-evdev -no-xkbcommon -no-alsa \
 		-no-freetype -no-gif -no-harfbuzz -no-libjpeg \
 		-no-libpng -no-pulseaudio -no-widgets
 # Features yet to be removed from qconfig.pri.
 TBR_CONFIG=	concurrent|inotify|xlib
 QMAKESPEC=	${WRKSRC}/mkspecs/freebsd-${QMAKE_COMPILER}
 INSTALL_TARGET=	install_qmake install_mkspecs
 
 BUILD_WRKSRC=	${WRKSRC}/${PORTNAME}
 
 post-patch:
 # Prevent qconfig.pri from being module dependent.
 	@${REINPLACE_CMD} -E -e '/"\$$QT_CONFIG +(${TBR_CONFIG})"/ d' \
 		${WRKSRC}/configure
 
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
 		${WRKSRC}/mkspecs/common/freebsd.conf
 	@${REINPLACE_CMD} -e 's|unix.conf|freebsd.conf|' \
 		${WRKSRC}/mkspecs/freebsd-icc/qmake.conf
 
 # Add mkspec for Clang. For now, this means adjusting the existing
 # unsupported/freebsd-clang mkspec while we get it into shape upstream.
 	@${MV} ${WRKSRC}/mkspecs/unsupported/freebsd-clang \
 		${WRKSRC}/mkspecs/freebsd-clang
 	@${REINPLACE_CMD} -e 's|(../|(|g' \
 		${WRKSRC}/mkspecs/freebsd-clang/qmake.conf
 	@${REINPLACE_CMD} -e 's|"../|"|g' \
 		${WRKSRC}/mkspecs/freebsd-clang/qplatformdefs.h
 
 	@${RM} ${WRKSRC}/mkspecs/*/*.orig
 	@${RM} -Rf ${WRKSRC}/mkspecs/freebsd-g++46
 
 post-build:
 # Complete configure stage to generate *.pri files.
 	@cd ${WRKSRC} && \
 		${SETENV} CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" \
 		CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" \
 		${CONFIGURE_ENV} ${CONFIGURE_CMD} ${CONFIGURE_ARGS}
 # Cleanup qmodule.pri to make it module agnostic.
 	@${REINPLACE_CMD} -En -e '/^(CONFIG|QT_BUILD_PARTS|.*_DIR) / p' \
 		${WRKSRC}/mkspecs/qmodule.pri
 
 .include <bsd.port.mk>
Index: head/devel/qmake5/files/patch-configure
===================================================================
--- head/devel/qmake5/files/patch-configure	(revision 420772)
+++ head/devel/qmake5/files/patch-configure	(revision 420773)
@@ -1,25 +1,55 @@
---- ./configure.orig	2013-10-22 01:49:15.000000000 -0700
-+++ ./configure	2013-11-04 07:40:28.945418565 -0800
-@@ -4194,11 +4194,11 @@
+The first two hunks make sure only qmake is build, as the rest of Qt is built
+in other ports.
+
+The last hunk is backported from upstream:
+
+commit a9474d1260a8c8cc9eae14f2984098919d9684e5
+Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
+Date:   Tue Aug 23 20:25:14 2016 +0200
+
+    configure: Correctly detect clang's version on FreeBSD
+
+    "clang -v" on FreeBSD reports something like "FreeBSD clang version
+    x.y.z [...]" instead of just "clang version x.y.z [...]", which fails to
+    match the sed pattern in the configure script, resulting in qconfig.pri
+    having no clang version defined.
+
+    Augment the pattern so that both version strings match.
+
+    Change-Id: I5f38f8480f4b1156ca7147e32c1157a009557035
+    Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
+
+--- configure.orig	2015-10-13 04:35:07 UTC
++++ configure
+@@ -4038,11 +4038,11 @@ if true; then ###[ '!' -f "$outpath/bin/
          fi
          echo "QMAKESPEC = $adjqmakespec" >> "$mkfile"
          echo "QT_VERSION = $QT_VERSION" >> "$mkfile"
 -        echo "EXTRA_CFLAGS = $EXTRA_CFLAGS" >> "$mkfile"
 -        echo "EXTRA_CXXFLAGS = $EXTRA_CXXFLAGS" >> "$mkfile"
 +        echo "EXTRA_CFLAGS = $EXTRA_CFLAGS $CFLAGS" >> "$mkfile"
 +        echo "EXTRA_CXXFLAGS = $EXTRA_CXXFLAGS $CXXFLAGS" >> "$mkfile"
          echo "QTOBJS =" $EXTRA_OBJS >> "$mkfile"
          echo "QTSRCS =" $EXTRA_SRCS >> "$mkfile"
 -        echo "LFLAGS = $EXTRA_LFLAGS" >> "$mkfile"
 +        echo "LFLAGS = $EXTRA_LFLAGS $LDFLAGS" >> "$mkfile"
          echo "EXEEXT = $EXEEXT" >> "$mkfile"
          echo "RM_F = rm -f" >> "$mkfile"
          echo "RM_RF = rm -rf" >> "$mkfile"
-@@ -4214,6 +4214,7 @@
- 	    rm "$mkfile.tmp"
+@@ -4061,6 +4061,7 @@ if true; then ###[ '!' -f "$outpath/bin/
+             fi
          fi
      done
 +    exit 0
  
-     (cd "$outpath/qmake"; "$MAKE") || exit 2
- fi # Build qmake
+     if [ "$OPT_VERBOSE" = yes ]; then
+         # Show the output of make
+@@ -6474,7 +6472,7 @@ case "$QMAKE_CONF_COMPILER" in
+     # Clang
+     COMPILER_VERSION=`${QMAKE_CONF_COMPILER} -v 2>&1 | sed -n -E '
+ /^Apple (clang|LLVM) version /{s///; s/^([0-9]*)\.([0-9]*).*$/QT_APPLE_CLANG_MAJOR_VERSION=\1; QT_APPLE_CLANG_MINOR_VERSION=\2/;p;q;}
+-/^clang version /{s///; s/^([0-9]*)\.([0-9]*).*$/QT_CLANG_MAJOR_VERSION=\1; QT_CLANG_MINOR_VERSION=\2/;p;q;}'`
++/^(FreeBSD )?clang version /{s///; s/^([0-9]*)\.([0-9]*).*$/QT_CLANG_MAJOR_VERSION=\1; QT_CLANG_MINOR_VERSION=\2/;p;q;}'`
+     eval "$COMPILER_VERSION"
+     ;;
+ *icpc)