Attachment #197906 for bug #231963

Lines 196-201 Link Here

(-)Mk/Uses/qt-dist.mk (+13 lines)
196	_EXTRA_PATCHES_QT5= ${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_features_create__cmake.prf \	196	_EXTRA_PATCHES_QT5= ${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_features_create__cmake.prf \
197	${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_features_qt__module.prf \	197	${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_features_qt__module.prf \
198	${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_common_bsd_bsd.conf	198	${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_common_bsd_bsd.conf
		199	. if ${ARCH:Mmips} \|\| ${ARCH:Mpowerpc} \|\| ${ARCH} == sparc64
		200	_EXTRA_PATCHES_QT5+= ${PORTSDIR}/devel/${_QT_RELNAME}/files/extra-patch-mkspecs_common_g++-base.conf \
		201	${PORTSDIR}/devel/${_QT_RELNAME}/files/extra-patch-mkspecs_common_gcc-base.conf
		202	USE_GCC= yes
		203	. endif
199	. endif	204	. endif
200	EXTRA_PATCHES?= ${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-configure \	205	EXTRA_PATCHES?= ${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-configure \
201	${_EXTRA_PATCHES_QT4} ${_EXTRA_PATCHES_QT5}	206	${_EXTRA_PATCHES_QT4} ${_EXTRA_PATCHES_QT5}
Lines 268-273 Link Here
268	# other QtBase ports. See below.	273	# other QtBase ports. See below.
269	_QT5_BASE= core dbus gui network sql widgets	274	_QT5_BASE= core dbus gui network sql widgets
270		275
		276	.if ${_QT_VER:M5}
		277	post-patch: gcc-post-patch
		278	gcc-post-patch:
		279	${REINPLACE_CMD} 's\|%%LOCALBASE%%\|${LOCALBASE}\|' ${WRKSRC}/mkspecs/common/gcc-base.conf
		280	${REINPLACE_CMD} 's\|%%GCC_DEFAULT%%\|${GCC_DEFAULT}\|' ${WRKSRC}/mkspecs/common/gcc-base.conf \
		281	${WRKSRC}/mkspecs/common/g++-base.conf
		282	.endif
		283
271	pre-configure: qtbase-pre-configure	284	pre-configure: qtbase-pre-configure
272	qtbase-pre-configure:	285	qtbase-pre-configure:
273	. for tool in ${_QT_TOOLS}	286	. for tool in ${_QT_TOOLS}

Lines 10-16 Link Here

(-)accessibility/qt5-speech/Makefile (-1 / +1 lines)
10		10
11	LIB_DEPENDS= libspeechd.so:accessibility/speech-dispatcher	11	LIB_DEPENDS= libspeechd.so:accessibility/speech-dispatcher
12		12
13	USES= pkgconfig qmake:outsource qt-dist:5,speech	13	USES= compiler:c++11-lang pkgconfig qmake:outsource qt-dist:5,speech
14	USE_QT= core gui buildtools_build qmake_build	14	USE_QT= core gui buildtools_build qmake_build
15		15
16	.include <bsd.port.mk>	16	.include <bsd.port.mk>

Lines 24-30 Link Here

(-)archivers/quazip/Makefile (-1 / +1 lines)
24	USE_QT= corelib moc_build network_build qmake_build rcc_build uic_build	24	USE_QT= corelib moc_build network_build qmake_build rcc_build uic_build
25	CMAKE_ARGS= -DBUILD_WITH_QT4:BOOL=TRUE	25	CMAKE_ARGS= -DBUILD_WITH_QT4:BOOL=TRUE
26	. else	26	. else
27	USES+= qt:5	27	USES+= compiler:c++11-lang qt:5
28	USE_QT= core buildtools_build qmake_build	28	USE_QT= core buildtools_build qmake_build
29	CMAKE_ARGS= -DBUILD_WITH_QT4:BOOL=FALSE	29	CMAKE_ARGS= -DBUILD_WITH_QT4:BOOL=FALSE
30	QTVER_SUFFIX= 5	30	QTVER_SUFFIX= 5

Lines 9-15 Link Here

(-)comms/qt5-sensors/Makefile (-1 / +1 lines)
9	COMMENT= Qt sensors module	9	COMMENT= Qt sensors module
10		10
11	USE_QT= core qml quick buildtools_build	11	USE_QT= core qml quick buildtools_build
12	USES= qmake:norecursive qt-dist:5,sensors	12	USES= compiler:c++11-lang qmake:norecursive qt-dist:5,sensors
13		13
14	USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}	14	USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
15		15

Lines 9-15 Link Here

(-)comms/qt5-serialport/Makefile (-1 / +1 lines)
9	COMMENT= Qt functions to access serial ports	9	COMMENT= Qt functions to access serial ports
10		10
11	USE_QT= core buildtools_build	11	USE_QT= core buildtools_build
12	USES= qmake qt-dist:5,serialport	12	USES= compiler:c++11-lang libtool qmake qt-dist:5,serialport
13	USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}	13	USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
14		14
15	.include <bsd.port.mk>	15	.include <bsd.port.mk>

Lines 8-14 Link Here

(-)databases/qt5-sql/Makefile (-1 / +1 lines)
8	MAINTAINER= kde@FreeBSD.org	8	MAINTAINER= kde@FreeBSD.org
9	COMMENT= Qt SQL database integration module	9	COMMENT= Qt SQL database integration module
10		10
11	USES= qmake:no_env qt-dist:5,base	11	USES= compiler:c++11-lang qmake:no_env qt-dist:5,base
12	USE_QT= core qmake_build buildtools_build	12	USE_QT= core qmake_build buildtools_build
13	HAS_CONFIGURE= yes	13	HAS_CONFIGURE= yes
14	CONFIGURE_ARGS= -no-gui -no-xcb	14	CONFIGURE_ARGS= -no-gui -no-xcb

Lines 9-15 Link Here

(-)devel/qscintilla2-qt5/Makefile (-1 / +1 lines)
9	MAINTAINER= kde@FreeBSD.org	9	MAINTAINER= kde@FreeBSD.org
10	COMMENT= Qt 5 port of the Scintilla C++ editor class	10	COMMENT= Qt 5 port of the Scintilla C++ editor class
11		11
12	USES= qmake pyqt:5 qt:5	12	USES= compiler:c++11-lang gl qmake pyqt:5 qt:5
13	USE_GL= gl	13	USE_GL= gl
14	USE_PYQT= #	14	USE_PYQT= #
15	USE_QT= buildtools_build core gui printsupport widgets	15	USE_QT= buildtools_build core gui printsupport widgets

Lines 8-14 Link Here

(-)devel/qt5/Makefile.sqldrivers (-1 / +1 lines)
8	MAINTAINER?= kde@FreeBSD.org	8	MAINTAINER?= kde@FreeBSD.org
9	COMMENT?= Qt ${DB_DESC} database plugin	9	COMMENT?= Qt ${DB_DESC} database plugin
10		10
11	USES+= qmake:no_env qt-dist:5,base	11	USES+= compiler:c++11-lang qmake:no_env qt-dist:5,base
12	USE_QT+= core sql qmake_build buildtools_build	12	USE_QT+= core sql qmake_build buildtools_build
13	HAS_CONFIGURE= yes	13	HAS_CONFIGURE= yes
14	CONFIGURE_ARGS+=-no-gui -no-xcb	14	CONFIGURE_ARGS+=-no-gui -no-xcb




--- mkspecs/common/g++-base.conf.orig	2018-09-21 12:02:35 UTC
+++ mkspecs/common/g++-base.conf
@@ -8,14 +8,14 @@
 # you can use the manual test in tests/manual/mkspecs.
 #
 
-QMAKE_COMPILER          = gcc
+QMAKE_COMPILER          = gcc%%GCC_DEFAULT%%
 
-QMAKE_CC                = gcc
+QMAKE_CC                = gcc%%GCC_DEFAULT%%
 
 QMAKE_LINK_C            = $$QMAKE_CC
 QMAKE_LINK_C_SHLIB      = $$QMAKE_CC
 
-QMAKE_CXX               = g++
+QMAKE_CXX               = g++%%GCC_DEFAULT%%
 
 QMAKE_LINK              = $$QMAKE_CXX
 QMAKE_LINK_SHLIB        = $$QMAKE_CXX

Line 0 Link Here

(-)devel/qt5/files/extra-patch-mkspecs_common_gcc-base.conf (+11 lines)
	1	--- mkspecs/common/gcc-base.conf.orig 2018-09-21 12:20:28 UTC
	2	+++ mkspecs/common/gcc-base.conf
	3	@@ -73,7 +73,7 @@ QMAKE_CXXFLAGS_LTCG = $$QMAKE_CFLAGS_LTCG
	4	QMAKE_CXXFLAGS_LTCG_FATOBJECTS = $$QMAKE_CFLAGS_LTCG_FATOBJECTS
	5	QMAKE_CXXFLAGS_DISABLE_LTCG = $$QMAKE_CFLAGS_DISABLE_LTCG
	6
	7	-QMAKE_LFLAGS +=
	8	+QMAKE_LFLAGS += -Wl,-rpath=%%LOCALBASE%%/lib/gcc%%GCC_DEFAULT%%
	9	QMAKE_LFLAGS_DEBUG +=
	10	QMAKE_LFLAGS_APP +=
	11	QMAKE_LFLAGS_RELEASE +=

Lines 10-16 Link Here

(-)devel/qt5-assistant/Makefile (-1 / +1 lines)
10		10
11	USE_QT= core gui help network printsupport sql widgets \	11	USE_QT= core gui help network printsupport sql widgets \
12	buildtools_build sql-sqlite3_run	12	buildtools_build sql-sqlite3_run
13	USES= qmake qt-dist:5,tools	13	USES= compiler:c++11-lang qmake qt-dist:5,tools
14		14
15	DESKTOP_ENTRIES="Qt 5 Assistant" "" \	15	DESKTOP_ENTRIES="Qt 5 Assistant" "" \
16	"${PREFIX}/share/pixmaps/assistant-qt5.png" \	16	"${PREFIX}/share/pixmaps/assistant-qt5.png" \

Lines 8-14 Link Here

(-)devel/qt5-buildtools/Makefile (-1 / +1 lines)
8	MAINTAINER= kde@FreeBSD.org	8	MAINTAINER= kde@FreeBSD.org
9	COMMENT= Qt build tools	9	COMMENT= Qt build tools
10		10
11	USES= perl5 qmake:no_env qt-dist:5,base	11	USES= compiler:c++11-lang libtool perl5 qmake:no_env qt-dist:5,base
12	HAS_CONFIGURE= yes	12	HAS_CONFIGURE= yes
13	CONFIGURE_ARGS= -no-gui -no-xcb	13	CONFIGURE_ARGS= -no-gui -no-xcb
14	USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}	14	USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}

Lines 8-14 Link Here

(-)devel/qt5-concurrent/Makefile (-1 / +1 lines)
8	MAINTAINER= kde@FreeBSD.org	8	MAINTAINER= kde@FreeBSD.org
9	COMMENT= Qt multi-threading module	9	COMMENT= Qt multi-threading module
10		10
11	USES= qmake:no_env qt-dist:5,base	11	USES= compiler:c++11-lang qmake:no_env qt-dist:5,base
12	USE_QT= core qmake_build buildtools_build	12	USE_QT= core qmake_build buildtools_build
13	HAS_CONFIGURE= yes	13	HAS_CONFIGURE= yes
14	CONFIGURE_ARGS= -no-gui -no-xcb	14	CONFIGURE_ARGS= -no-gui -no-xcb

Lines 11-17 Link Here

(-)devel/qt5-core/Makefile (-1 / +1 lines)
11	LIB_DEPENDS= libicui18n.so:devel/icu \	11	LIB_DEPENDS= libicui18n.so:devel/icu \
12	libpcre2-posix.so:devel/pcre2	12	libpcre2-posix.so:devel/pcre2
13		13
14	USES= qmake:no_env qt-dist:5,base	14	USES= compiler:c++11-lang gnome qmake:no_env qt-dist:5,base
15	USE_GNOME= glib20	15	USE_GNOME= glib20
16	USE_QT= qmake_build buildtools_build	16	USE_QT= qmake_build buildtools_build
17	HAS_CONFIGURE= yes	17	HAS_CONFIGURE= yes

Lines 10-16 Link Here

(-)devel/qt5-dbus/Makefile (-1 / +1 lines)
10		10
11	LIB_DEPENDS= libdbus-1.so:devel/dbus	11	LIB_DEPENDS= libdbus-1.so:devel/dbus
12		12
13	USES= qmake:no_env qt-dist:5,base	13	USES= compiler:c++11-lang qmake:no_env qt-dist:5,base
14	USE_QT= core qmake_build buildtools_build	14	USE_QT= core qmake_build buildtools_build
15	HAS_CONFIGURE= yes	15	HAS_CONFIGURE= yes
16	CONFIGURE_ARGS= -no-gui -no-xcb	16	CONFIGURE_ARGS= -no-gui -no-xcb

Lines 10-16 Link Here

(-)devel/qt5-designer/Makefile (-1 / +1 lines)
10		10
11	USE_QT= assistant_run core gui network printsupport quick uiplugin \	11	USE_QT= assistant_run core gui network printsupport quick uiplugin \
12	widgets xml buildtools_build	12	widgets xml buildtools_build
13	USES= qmake qt-dist:5,tools	13	USES= compiler:c++11-lang qmake qt-dist:5,tools
14	USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}	14	USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
15		15
16	DESKTOP_ENTRIES="Qt 5 Designer" "" \	16	DESKTOP_ENTRIES="Qt 5 Designer" "" \

Lines 10-16 Link Here

(-)devel/qt5-help/Makefile (-1 / +1 lines)
10		10
11	USE_QT= core gui network sql widgets \	11	USE_QT= core gui network sql widgets \
12	buildtools_build sql-sqlite3_run	12	buildtools_build sql-sqlite3_run
13	USES= qmake qt-dist:5,tools	13	USES= compiler:c++11-lang qmake qt-dist:5,tools
14	USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}	14	USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
15		15
16	BUILD_WRKSRC= ${WRKSRC}/src/assistant	16	BUILD_WRKSRC= ${WRKSRC}/src/assistant

Lines 9-15 Link Here

(-)devel/qt5-linguisttools/Makefile (-1 / +1 lines)
9	COMMENT= Qt localization tools	9	COMMENT= Qt localization tools
10		10
11	USE_QT= core xml buildtools_build qml_build	11	USE_QT= core xml buildtools_build qml_build
12	USES= qmake qt-dist:5,tools	12	USES= compiler:c++11-lang qmake qt-dist:5,tools
13		13
14	BUILD_WRKSRC= ${WRKSRC}/src/linguist	14	BUILD_WRKSRC= ${WRKSRC}/src/linguist
15	INSTALL_WRKSRC= ${WRKSRC}/src/linguist	15	INSTALL_WRKSRC= ${WRKSRC}/src/linguist

Lines 9-15 Link Here

(-)devel/qt5-location/Makefile (-1 / +1 lines)
9	COMMENT= Qt location module	9	COMMENT= Qt location module
10		10
11	USE_QT= concurrent core dbus gui network qml quick buildtools_build	11	USE_QT= concurrent core dbus gui network qml quick buildtools_build
12	USES= qmake:norecursive qt-dist:5,location	12	USES= compiler:c++11-lang qmake:norecursive qt-dist:5,location
13		13
14	USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}	14	USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
15		15

Lines 8-14 Link Here

(-)devel/qt5-qdbus/Makefile (-1 / +1 lines)
8	MAINTAINER= kde@FreeBSD.org	8	MAINTAINER= kde@FreeBSD.org
9	COMMENT= Qt command-line interface to D-Bus	9	COMMENT= Qt command-line interface to D-Bus
10		10
11	USES= qmake qt-dist:5,tools	11	USES= compiler:c++11-lang qmake qt-dist:5,tools
12	USE_QT= core dbus xml buildtools_build	12	USE_QT= core dbus xml buildtools_build
13		13
14	BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME}/${PORTNAME}	14	BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME}/${PORTNAME}

Lines 30-37 Link Here

(-)devel/qt5-qmake/Makefile (-2 lines)
30	QMAKESPEC= freebsd-${QMAKE_COMPILER}	30	QMAKESPEC= freebsd-${QMAKE_COMPILER}
31	INSTALL_TARGET= sub-qmake-qmake-aux-pro-install_subtargets install_mkspecs	31	INSTALL_TARGET= sub-qmake-qmake-aux-pro-install_subtargets install_mkspecs
32		32
33	BROKEN_powerpc64= fails to compile: error: unrecognized command line option -std=c++11
34
35	BUILD_WRKSRC= ${WRKSRC}/${PORTNAME}	33	BUILD_WRKSRC= ${WRKSRC}/${PORTNAME}
36		34
37	post-patch:	35	post-patch:

Lines 8-17 Link Here

(-)devel/qt5-script/Makefile (-3 / +1 lines)
8	MAINTAINER= kde@FreeBSD.org	8	MAINTAINER= kde@FreeBSD.org
9	COMMENT= Qt 4-compatible scripting module	9	COMMENT= Qt 4-compatible scripting module
10		10
11	BROKEN_powerpc64= Does not build
12
13	USE_QT= core buildtools_build	11	USE_QT= core buildtools_build
14	USES= qmake qt-dist:5,script	12	USES= compiler:c++11-lang qmake qt-dist:5,script
15	# Keep make(1) from descending into src/script/obj/ (qmake:outsource	13	# Keep make(1) from descending into src/script/obj/ (qmake:outsource
16	# doesn't work).	14	# doesn't work).
17	MAKE_ENV= MAKEOBJDIR=.	15	MAKE_ENV= MAKEOBJDIR=.

Lines 9-15 Link Here

(-)devel/qt5-scripttools/Makefile (-1 / +1 lines)
9	COMMENT= Qt Script additional components	9	COMMENT= Qt Script additional components
10		10
11	USE_QT= core gui script widgets buildtools_build	11	USE_QT= core gui script widgets buildtools_build
12	USES= qmake qt-dist:5,script	12	USES= compiler:c++11-lang qmake qt-dist:5,script
13	USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}	13	USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
14		14
15	BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME}	15	BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME}

Lines 8-14 Link Here

(-)devel/qt5-testlib/Makefile (-1 / +1 lines)
8	MAINTAINER= kde@FreeBSD.org	8	MAINTAINER= kde@FreeBSD.org
9	COMMENT= Qt unit testing module	9	COMMENT= Qt unit testing module
10		10
11	USES= qmake:no_env qt-dist:5,base	11	USES= compiler:c++11-lang qmake:no_env qt-dist:5,base
12	USE_QT= core qmake_build buildtools_build	12	USE_QT= core qmake_build buildtools_build
13	HAS_CONFIGURE= yes	13	HAS_CONFIGURE= yes
14	CONFIGURE_ARGS= -no-gui -no-xcb	14	CONFIGURE_ARGS= -no-gui -no-xcb

Lines 9-15 Link Here

(-)devel/qt5-uitools/Makefile (-1 / +1 lines)
9	COMMENT= Qt Designer UI forms support module	9	COMMENT= Qt Designer UI forms support module
10		10
11	USE_QT= core gui uiplugin widgets buildtools_build	11	USE_QT= core gui uiplugin widgets buildtools_build
12	USES= qmake qt-dist:5,tools	12	USES= compiler:c++11-lang qmake qt-dist:5,tools
13	USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}	13	USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
14		14
15	BUILD_WRKSRC= ${WRKSRC}/src/designer/src/${PORTNAME}	15	BUILD_WRKSRC= ${WRKSRC}/src/designer/src/${PORTNAME}

Lines 14-19 Link Here

(-)graphics/qt5-imageformats/Makefile (-1 / +1 lines)
14	libwebp.so:graphics/webp	14	libwebp.so:graphics/webp
15		15
16	USE_QT= core gui buildtools_build	16	USE_QT= core gui buildtools_build
17	USES= localbase qmake qt-dist:5,imageformats	17	USES= compiler:c++11-lang localbase qmake qt-dist:5,imageformats
18		18
19	.include <bsd.port.mk>	19	.include <bsd.port.mk>

Lines 8-14 Link Here

(-)graphics/qt5-opengl/Makefile (-1 / +1 lines)
8	MAINTAINER= kde@FreeBSD.org	8	MAINTAINER= kde@FreeBSD.org
9	COMMENT= Qt 5-compatible OpenGL support module	9	COMMENT= Qt 5-compatible OpenGL support module
10		10
11	USES= qmake:no_env qt-dist:5,base	11	USES= compiler:c++11-lang gl qmake:no_env qt-dist:5,base
12	USE_GL= gl	12	USE_GL= gl
13	USE_QT= core gui widgets qmake_build buildtools_build	13	USE_QT= core gui widgets qmake_build buildtools_build
14	HAS_CONFIGURE= yes	14	HAS_CONFIGURE= yes

Lines 9-15 Link Here

(-)graphics/qt5-svg/Makefile (-1 / +1 lines)
9	COMMENT= Qt SVG support module	9	COMMENT= Qt SVG support module
10		10
11	USE_QT= core gui widgets buildtools_build	11	USE_QT= core gui widgets buildtools_build
12	USES= qmake qt-dist:5,svg	12	USES= compiler:c++11-lang qmake qt-dist:5,svg
13	USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}	13	USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
14		14
15	.include <bsd.port.mk>	15	.include <bsd.port.mk>

Lines 8-17 Link Here

(-)lang/qt5-qml/Makefile (-3 / +1 lines)
8	MAINTAINER= kde@FreeBSD.org	8	MAINTAINER= kde@FreeBSD.org
9	COMMENT= Qt QML and JavaScript language module	9	COMMENT= Qt QML and JavaScript language module
10		10
11	BROKEN_powerpc64= Does not build
12
13	USE_QT= core network buildtools_build	11	USE_QT= core network buildtools_build
14	USES= python:build qmake qt-dist:5,declarative	12	USES= compiler:c++11-lang python:build qmake qt-dist:5,declarative
15	USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}	13	USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
16		14
17	BUILD_WRKSRC= ${WRKSRC}/src	15	BUILD_WRKSRC= ${WRKSRC}/src

Lines 22-28 Link Here

(-)multimedia/phonon/Makefile (-1 / +1 lines)
22	qt4_PLIST= ${.CURDIR}/pkg-plist.qt4	22	qt4_PLIST= ${.CURDIR}/pkg-plist.qt4
23	qt5_PLIST= ${.CURDIR}/pkg-plist.qt5	23	qt5_PLIST= ${.CURDIR}/pkg-plist.qt5
24		24
25	USES= cmake pathfix tar:xz	25	USES= cmake compiler:c++11-lang pathfix tar:xz
26	CMAKE_ON= PHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT \	26	CMAKE_ON= PHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT \
27	PHONON_NO_PLATFORMPLUGIN	27	PHONON_NO_PLATFORMPLUGIN
28	CMAKE_OFF= PHONON_BUILD_DESIGNER_PLUGIN:BOOL=OFF	28	CMAKE_OFF= PHONON_BUILD_DESIGNER_PLUGIN:BOOL=OFF

Lines 11-17 Link Here

(-)multimedia/qt5-multimedia/Makefile (-1 / +2 lines)
11		11
12	# LICENSE set via USES_QT5 (bsd.qt.mk)	12	# LICENSE set via USES_QT5 (bsd.qt.mk)
13		13
14	USES= pkgconfig qmake:norecursive qt-dist:5,multimedia	14	USES= compiler:c++11-lang gl gnome pkgconfig qmake:norecursive \
		15	qt-dist:5,multimedia
15	USE_GL= gl	16	USE_GL= gl
16	USE_GNOME= glib20	17	USE_GNOME= glib20
17	USE_QT= core gui network opengl qml quick widgets \	18	USE_QT= core gui network opengl qml quick widgets \

Lines 16-22 Link Here

(-)net/qoauth-qt5/Makefile (-1 / +1 lines)
16		16
17	LIB_DEPENDS= libqca-qt5.so:devel/qca@qt5	17	LIB_DEPENDS= libqca-qt5.so:devel/qca@qt5
18		18
19	USES= qmake:outsource qt:5	19	USES= compiler:c++11-lang qmake:outsource qt:5
20	USE_LDCONFIG= yes	20	USE_LDCONFIG= yes
21	USE_QT= core network testlib buildtools_build qmake_build	21	USE_QT= core network testlib buildtools_build qmake_build
22		22

Lines 13-19 Link Here

(-)net/qt5-network/Makefile (-1 / +1 lines)
13		13
14	RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss	14	RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
15		15
16	USES= qmake:no_env qt-dist:5,base ssl	16	USES= compiler:c++11-lang qmake:no_env qt-dist:5,base ssl
17	USE_QT= core buildtools_build	17	USE_QT= core buildtools_build
18	HAS_CONFIGURE= yes	18	HAS_CONFIGURE= yes
19	CONFIGURE_ARGS= -no-gui -no-xcb	19	CONFIGURE_ARGS= -no-gui -no-xcb

Lines 22-28 Link Here

(-)net-im/telepathy-qt4/Makefile (-2 / +2 lines)
22		22
23	USE_GNOME= glib20 libxslt:build	23	USE_GNOME= glib20 libxslt:build
24	USE_GSTREAMER= yes	24	USE_GSTREAMER= yes
25	USES= cmake:outsource gettext pathfix pkgconfig python:2.7,build	25	USES= cmake:outsource gettext gnome pathfix pkgconfig python:2.7,build
26	CMAKE_ARGS= -DENABLE_EXAMPLES:BOOL=False \	26	CMAKE_ARGS= -DENABLE_EXAMPLES:BOOL=False \
27	-DENABLE_FARSIGHT:BOOL=False \	27	-DENABLE_FARSIGHT:BOOL=False \
28	-DENABLE_FARSTREAM:BOOL=True \	28	-DENABLE_FARSTREAM:BOOL=True \
Lines 35-41 Link Here
35	moc_build qmake_build rcc_build uic_build	35	moc_build qmake_build rcc_build uic_build
36	SHLIB_SUFFIX= 2	36	SHLIB_SUFFIX= 2
37	. else	37	. else
38	USES+= qt:5	38	USES+= compiler:c++11-lang qt:5
39	USE_QT= core dbus gui network xml \	39	USE_QT= core dbus gui network xml \
40	buildtools_build qmake_build testlib_build widgets_build	40	buildtools_build qmake_build testlib_build widgets_build
41	SHLIB_SUFFIX= 0	41	SHLIB_SUFFIX= 0

Lines 8-14 Link Here

(-)print/qt5-printsupport/Makefile (-1 / +1 lines)
8	MAINTAINER= kde@FreeBSD.org	8	MAINTAINER= kde@FreeBSD.org
9	COMMENT= Qt print support module	9	COMMENT= Qt print support module
10		10
11	USES= qmake:no_env qt-dist:5,base	11	USES= compiler:c++11-lang qmake:no_env qt-dist:5,base
12	USE_QT= core gui widgets qmake_build buildtools_build	12	USE_QT= core gui widgets qmake_build buildtools_build
13	HAS_CONFIGURE= yes	13	HAS_CONFIGURE= yes
14	USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}	14	USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}

Lines 8-14 Link Here

(-)sysutils/qt5-qtpaths/Makefile (-1 / +1 lines)
8	MAINTAINER= kde@FreeBSD.org	8	MAINTAINER= kde@FreeBSD.org
9	COMMENT= Command line client to QStandardPaths	9	COMMENT= Command line client to QStandardPaths
10		10
11	USES= qmake:outsource qt-dist:5,tools	11	USES= compiler:c++11-lang qmake:outsource qt-dist:5,tools
12	USE_QT= core	12	USE_QT= core
13		13
14	PLIST_FILES= ${QT_BINDIR}/qtpaths	14	PLIST_FILES= ${QT_BINDIR}/qtpaths

Lines 11-17 Link Here

(-)sysutils/signon-plugin-oauth2/Makefile (-1 / +1 lines)
11		11
12	LIB_DEPENDS= libsignon-qt5.so:sysutils/signon-qt5	12	LIB_DEPENDS= libsignon-qt5.so:sysutils/signon-qt5
13		13
14	USES= pkgconfig python qmake qt:5	14	USES= compiler:c++11-lang pkgconfig python qmake qt:5
15	USE_QT= core network testlib \	15	USE_QT= core network testlib \
16	buildtools_build qmake_build	16	buildtools_build qmake_build
17	USE_LDCONFIG= ${PREFIX}/lib/signon	17	USE_LDCONFIG= ${PREFIX}/lib/signon

Lines 12-18 Link Here

(-)sysutils/signon-qt5/Makefile (-1 / +2 lines)
12	LICENSE= LGPL20	12	LICENSE= LGPL20
13	LICENSE_FILE= ${WRKSRC}/COPYING	13	LICENSE_FILE= ${WRKSRC}/COPYING
14		14
15	USES= gettext pathfix pkgconfig python qmake qt:5 tar:bz2	15	USES= compiler:c++11-lang gettext pathfix pkgconfig python qmake \
		16	qt:5 tar:bz2
16	USE_QT= core dbus gui network sql testlib xml \	17	USE_QT= core dbus gui network sql testlib xml \
17	buildtools_build qmake_build	18	buildtools_build qmake_build
18		19

Lines 8-14 Link Here

(-)textproc/qt5-xml/Makefile (-1 / +1 lines)
8	MAINTAINER= kde@FreeBSD.org	8	MAINTAINER= kde@FreeBSD.org
9	COMMENT= Qt SAX and DOM implementations	9	COMMENT= Qt SAX and DOM implementations
10		10
11	USES= qmake:no_env qt-dist:5,base	11	USES= compiler:c++11-lang qmake:no_env qt-dist:5,base
12	USE_QT= core qmake_build buildtools_build	12	USE_QT= core qmake_build buildtools_build
13	HAS_CONFIGURE= yes	13	HAS_CONFIGURE= yes
14	CONFIGURE_ARGS= -no-gui -no-xcb	14	CONFIGURE_ARGS= -no-gui -no-xcb

Lines 8-17 Link Here

(-)textproc/qt5-xmlpatterns/Makefile (-3 / +1 lines)
8	MAINTAINER= kde@FreeBSD.org	8	MAINTAINER= kde@FreeBSD.org
9	COMMENT= Qt support for XPath, XQuery, XSLT and XML Schema	9	COMMENT= Qt support for XPath, XQuery, XSLT and XML Schema
10		10
11	BROKEN_powerpc64= Does not build
12
13	USE_QT= core network buildtools_build	11	USE_QT= core network buildtools_build
14	USES= qmake:norecursive qt-dist:5,xmlpatterns	12	USES= compiler:c++11-lang qmake:norecursive qt-dist:5,xmlpatterns
15	USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}	13	USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
16		14
17	.include <bsd.port.mk>	15	.include <bsd.port.mk>

Lines 9-15 Link Here

(-)www/qt5-webchannel/Makefile (-1 / +1 lines)
9	COMMENT= Qt 5 library for integration of C++/QML with HTML/js clients	9	COMMENT= Qt 5 library for integration of C++/QML with HTML/js clients
10		10
11	USE_QT= buildtools_build core qml quick	11	USE_QT= buildtools_build core qml quick
12	USES= qmake:norecursive qt-dist:5,webchannel	12	USES= compiler:c++11-lang qmake:norecursive qt-dist:5,webchannel
13	USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}	13	USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
14		14
15	# The default EXTRACT_AFTER_ARGS value excludes examples/ from the extracted	15	# The default EXTRACT_AFTER_ARGS value excludes examples/ from the extracted

Lines 9-15 Link Here

(-)x11/qt5-x11extras/Makefile (-1 / +1 lines)
9	COMMENT= Qt platform-specific features for X11-based systems	9	COMMENT= Qt platform-specific features for X11-based systems
10		10
11	USE_QT= core gui	11	USE_QT= core gui
12	USES= qmake qt-dist:5,x11extras	12	USES= compiler:c++11-lang qmake qt-dist:5,x11extras
13	USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}	13	USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
14		14
15	.include <bsd.port.mk>	15	.include <bsd.port.mk>

Lines 10-16 Link Here

(-)x11-themes/kf5-breeze-icons/Makefile (-1 / +1 lines)
10	LICENSE= LGPL3+	10	LICENSE= LGPL3+
11	LICENSE_FILE= ${WRKSRC}/COPYING-ICONS	11	LICENSE_FILE= ${WRKSRC}/COPYING-ICONS
12		12
13	USES= cmake:outsource kde:5 qt:5 tar:xz	13	USES= cmake:outsource compiler:c++11-lang kde:5 qt:5 tar:xz
14	USE_KDE= ecm	14	USE_KDE= ecm
15	USE_QT= buildtools_build core qmake_build testlib	15	USE_QT= buildtools_build core qmake_build testlib
16		16

Lines 22-28 Link Here

(-)x11-toolkits/qt5-gui/Makefile (-1 / +1 lines)
22	libxkbcommon.so:x11/libxkbcommon	22	libxkbcommon.so:x11/libxkbcommon
23	RUN_DEPENDS= xdg-open:devel/xdg-utils	23	RUN_DEPENDS= xdg-open:devel/xdg-utils
24		24
25	USES= jpeg localbase qmake:no_env qt-dist:5,base	25	USES= compiler:c++11-lang jpeg localbase qmake:no_env qt-dist:5,base
26	USE_GL= gl egl	26	USE_GL= gl egl
27	USE_GNOME= glib20	27	USE_GNOME= glib20
28	USE_QT= core dbus network qmake_build buildtools_build	28	USE_QT= core dbus network qmake_build buildtools_build

Lines 11-17 Link Here

(-)x11-toolkits/qt5-quick/Makefile (-1 / +2 lines)
11	USE_GL= gl	11	USE_GL= gl
12	USE_QT= core gui network qml sql testlib \	12	USE_QT= core gui network qml sql testlib \
13	widgets xmlpatterns buildtools_build	13	widgets xmlpatterns buildtools_build
14	USES= python:build qmake:norecursive qt-dist:5,declarative	14	USES= compiler:c++11-lang gl python:build qmake:norecursive \
		15	qt-dist:5,declarative
15	USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}	16	USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
16		17
17	CONFLICTS= qt5-declarative-render2d-*	18	CONFLICTS= qt5-declarative-render2d-*

Lines 10-16 Link Here

(-)x11-toolkits/qt5-quickcontrols/Makefile (-1 / +1 lines)
10		10
11	BROKEN_armv6= fails to install: pkg-static: Unable to access file ApplicationWindow.qmlc: No such file or directory	11	BROKEN_armv6= fails to install: pkg-static: Unable to access file ApplicationWindow.qmlc: No such file or directory
12		12
13	USES= qmake qt-dist:5,quickcontrols	13	USES= compiler:c++11-lang qmake qt-dist:5,quickcontrols
14	USE_QT= core gui qml quick widgets \	14	USE_QT= core gui qml quick widgets \
15	buildtools_build	15	buildtools_build
16	USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}	16	USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}

Lines 10-16 Link Here

(-)x11-toolkits/qt5-quickcontrols2/Makefile (-1 / +1 lines)
10		10
11	BROKEN_armv6= fails to install: pkg-static: Unable to access file DayOfWeekRow.qmlc: No such file or directory	11	BROKEN_armv6= fails to install: pkg-static: Unable to access file DayOfWeekRow.qmlc: No such file or directory
12		12
13	USES= qmake:norecursive qt-dist:5	13	USES= compiler:c++11-lang qmake:norecursive qt-dist:5
14	USE_QT= core gui qml quick widgets \	14	USE_QT= core gui qml quick widgets \
15	buildtools_build	15	buildtools_build
16	QT_DIST= ${PORTNAME}	16	QT_DIST= ${PORTNAME}

Lines 10-16 Link Here

(-)x11-toolkits/qt5-virtualkeyboard/Makefile (-1 / +1 lines)
10		10
11	LIB_DEPENDS= libhunspell-1.6.so:textproc/hunspell	11	LIB_DEPENDS= libhunspell-1.6.so:textproc/hunspell
12		12
13	USES= qmake qt-dist:5,virtualkeyboard	13	USES= compiler:c++11-lang qmake qt-dist:5,virtualkeyboard
14	USE_QT= core network gui widgets svg qml quick buildtools_build	14	USE_QT= core network gui widgets svg qml quick buildtools_build
15		15
16	USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}	16	USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}

Lines 8-14 Link Here

(-)x11-toolkits/qt5-widgets/Makefile (-1 / +1 lines)
8	MAINTAINER= kde@FreeBSD.org	8	MAINTAINER= kde@FreeBSD.org
9	COMMENT= Qt C++ widgets module	9	COMMENT= Qt C++ widgets module
10		10
11	USES= qmake:no_env qt-dist:5,base	11	USES= compiler:c++11-lang qmake:no_env qt-dist:5,base
12	USE_QT= core gui qmake_build buildtools_build	12	USE_QT= core gui qmake_build buildtools_build
13	USE_XORG= x11	13	USE_XORG= x11
14	HAS_CONFIGURE= yes	14	HAS_CONFIGURE= yes

Return to bug 231963

Line 0 Link Here

(-)devel/qt5/files/extra-patch-mkspecs_common_g++-base.conf (+20 lines)
	1	--- mkspecs/common/g++-base.conf.orig 2018-09-21 12:02:35 UTC
	2	+++ mkspecs/common/g++-base.conf
	3	@@ -8,14 +8,14 @@
	4	# you can use the manual test in tests/manual/mkspecs.
	5	#
	6
	7	-QMAKE_COMPILER = gcc
	8	+QMAKE_COMPILER = gcc%%GCC_DEFAULT%%
	9
	10	-QMAKE_CC = gcc
	11	+QMAKE_CC = gcc%%GCC_DEFAULT%%
	12
	13	QMAKE_LINK_C = $$QMAKE_CC
	14	QMAKE_LINK_C_SHLIB = $$QMAKE_CC
	15
	16	-QMAKE_CXX = g++
	17	+QMAKE_CXX = g++%%GCC_DEFAULT%%
	18
	19	QMAKE_LINK = $$QMAKE_CXX
	20	QMAKE_LINK_SHLIB = $$QMAKE_CXX