--- Mk/Uses/qt-dist.mk	(revision 494532)
+++ Mk/Uses/qt-dist.mk	(working copy)
@@ -277,8 +277,8 @@ 
 post-patch: gcc-post-patch
 gcc-post-patch:
 	${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/mkspecs/common/gcc-base.conf
-	${REINPLACE_CMD} 's|%%GCC_DEFAULT%%|${GCC_DEFAULT}|' ${WRKSRC}/mkspecs/common/gcc-base.conf \
-		${WRKSRC}/mkspecs/common/g++-base.conf
+	${REINPLACE_CMD} 's|%%GCC_DEFAULT%%|${GCC_DEFAULT}|g' ${WRKSRC}/mkspecs/common/gcc-base.conf \
+		${WRKSRC}/mkspecs/common/g++-base.conf ${WRKSRC}/mkspecs/common/bsd/bsd.conf
 .endif
 
 pre-configure: qtbase-pre-configure
@@ -348,8 +348,8 @@ 
 # occurrences of ${WRKSRC}/lib from .pc and .prl files when installing them.
 # See QTBUG-40825 and ports bugs 194088, 195105 and 198720.
 	${ECHO_CMD} 'QMAKE_LIBDIR_FLAGS = -L${CONFIGURE_WRKSRC}/lib' >> ${CONFIGURE_WRKSRC}/.qmake.cache
-	${ECHO_CMD} 'QMAKE_DEFAULT_LIBDIRS = ${LOCALBASE}/lib' >> ${CONFIGURE_WRKSRC}/.qmake.cache
-	${ECHO_CMD} 'QMAKE_DEFAULT_INCDIRS = ${LOCALBASE}/include' >> ${CONFIGURE_WRKSRC}/.qmake.cache
+	${ECHO_CMD} 'QMAKE_DEFAULT_LIBDIRS += ${LOCALBASE}/lib /usr/lib /lib' >> ${CONFIGURE_WRKSRC}/.qmake.cache
+	${ECHO_CMD} 'QMAKE_DEFAULT_INCDIRS += ${LOCALBASE}/include /usr/include' >> ${CONFIGURE_WRKSRC}/.qmake.cache
 
 post-install: qt-post-install
 qt-post-install:
--- devel/qt5/files/extrapatch-mkspecs_common_bsd_bsd.conf	(revision 493497)
+++ devel/qt5/files/extrapatch-mkspecs_common_bsd_bsd.conf	(working copy)
@@ -1,6 +1,6 @@ 
 --- mkspecs/common/bsd/bsd.conf.orig    2017-07-23 16:27:40 UTC
 +++ mkspecs/common/bsd/bsd.conf
-@@ -21,6 +21,27 @@ QMAKE_LIBS_X11          = -lXext -lX11 -lm
+@@ -21,6 +21,29 @@ QMAKE_LIBS_X11          = -lXext -lX11 -lm
  QMAKE_LIBS_OPENGL       = -lGL
  QMAKE_LIBS_THREAD       =
 
@@ -28,3 +28,5 @@ 
  QMAKE_AR                = ar cqs
  QMAKE_OBJCOPY           = objcopy
  QMAKE_NM                = nm -P
++
++EXTRA_INCLUDEPATH	+= %%LOCALBASE%%/lib/gcc%%GCC_DEFAULT%%/include %%LOCALBASE%%/lib/gcc%%GCC_DEFAULT%%/include/c++