Index: Mk/Uses/qt-dist.mk
===================================================================
--- Mk/Uses/qt-dist.mk	(revision 500779)
+++ Mk/Uses/qt-dist.mk	(working copy)
@@ -169,13 +169,14 @@
 .  if ${_QT_DIST} == "base"
 _EXTRA_PATCHES_QT5=	${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_features_create__cmake.prf \
 			${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_features_qt__module.prf \
-			${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_common_bsd_bsd.conf \
 			${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_freebsd-clang_qmake.conf
 .        if ${ARCH:Mmips*} || ${ARCH:Mpowerpc*} || ${ARCH} == sparc64
 _EXTRA_PATCHES_QT5+=	${PORTSDIR}/devel/${_QT_RELNAME}/files/extra-patch-mkspecs_common_g++-base.conf \
 			${PORTSDIR}/devel/${_QT_RELNAME}/files/extra-patch-mkspecs_common_gcc-base.conf \
-			${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_freebsd-g++_qmake.conf
+			${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_common_bsd_bsd.conf-gcc
 USE_GCC=		yes
+.else
+_EXTRA_PATCHE_QT5+=	${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_common_bsd_bsd.conf-clang
 .    endif
 EXTRA_PATCHES?=		${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-configure \
 			${_EXTRA_PATCHES_QT5}
Index: devel/qt5/files/extrapatch-mkspecs_common_bsd_bsd.conf
===================================================================
--- devel/qt5/files/extrapatch-mkspecs_common_bsd_bsd.conf	(revision 500779)
+++ devel/qt5/files/extrapatch-mkspecs_common_bsd_bsd.conf	(nonexistent)
@@ -1,30 +0,0 @@
---- 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
- QMAKE_LIBS_OPENGL       = -lGL
- QMAKE_LIBS_THREAD       =
-
-+QMAKE_INCDIR_X11        = %%LOCALBASE%%/include
-+QMAKE_LIBDIR_X11        = %%LOCALBASE%%/lib
-+QMAKE_INCDIR_OPENGL     = %%LOCALBASE%%/include
-+QMAKE_LIBDIR_OPENGL     = %%LOCALBASE%%/lib
-+QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL
-+QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL
-+QMAKE_INCDIR_EGL        = %%LOCALBASE%%/include
-+QMAKE_LIBDIR_EGL        = %%LOCALBASE%%/lib
-+
-+QMAKE_LIBS_EGL          = -lEGL
-+QMAKE_LIBS_OPENGL_ES2   = -lGLESv2
-+QMAKE_LIBS_LIBUDEV      = -ludev
-+
-+QMAKE_CFLAGS_WAYLAND    =
-+QMAKE_INCDIR_WAYLAND    = %%LOCALBASE%%/include
-+QMAKE_LIBS_WAYLAND_CLIENT = -lwayland-client
-+QMAKE_LIBS_WAYLAND_SERVER = -lwayland-server
-+QMAKE_LIBDIR_WAYLAND    = %%LOCALBASE%%/lib
-+QMAKE_DEFINES_WAYLAND   =
-+QMAKE_WAYLAND_SCANNER   = wayland-scanner
-+
- QMAKE_AR                = ar cqs
- QMAKE_OBJCOPY           = objcopy
- QMAKE_NM                = nm -P

Property changes on: devel/qt5/files/extrapatch-mkspecs_common_bsd_bsd.conf
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: devel/qt5/files/extrapatch-mkspecs_common_bsd_bsd.conf-clang
===================================================================
Index: devel/qt5/files/extrapatch-mkspecs_common_bsd_bsd.conf-gcc
===================================================================
--- devel/qt5/files/extrapatch-mkspecs_common_bsd_bsd.conf-gcc	(revision 500779)
+++ devel/qt5/files/extrapatch-mkspecs_common_bsd_bsd.conf-gcc	(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++
Index: devel/qt5/files/extrapatch-mkspecs_freebsd-g++_qmake.conf
===================================================================
--- devel/qt5/files/extrapatch-mkspecs_freebsd-g++_qmake.conf	(revision 500779)
+++ devel/qt5/files/extrapatch-mkspecs_freebsd-g++_qmake.conf	(nonexistent)
@@ -1,11 +0,0 @@
---- mkspecs/freebsd-g++/qmake.conf.orig	2019-04-16 18:13:12 UTC
-+++ mkspecs/freebsd-g++/qmake.conf
-@@ -11,6 +11,8 @@ include(../common/bsd/bsd.conf)
- QMAKE_INCDIR_POST       = /usr/local/include
- QMAKE_LIBDIR_POST       = /usr/local/lib
-
-+EXTRA_INCLUDEPATH	+= %%LOCALBASE%%/lib/gcc%%GCC_DEFAULT%%/include %%LOCALBASE%%/lib/gcc%%GCC_DEFAULT%%/include/c++
-+
- include(../common/gcc-base-unix.conf)
- include(../common/g++-unix.conf)
- load(qt_config)

Property changes on: devel/qt5/files/extrapatch-mkspecs_freebsd-g++_qmake.conf
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property