Attachment #182581 for bug #216943

Lines 296-304 Link Here

(-)Mk/bsd.qt.mk (-1 / +4 lines)
296	_USE_QT_ALL= assistant clucene dbus declarative designer doc gui help \	296	_USE_QT_ALL= assistant clucene dbus declarative designer doc gui help \
297	imageformats l10n linguist linguisttools multimedia \	297	imageformats l10n linguist linguisttools multimedia \
298	network opengl pixeltool qdbusviewer qmake script \	298	network opengl pixeltool qdbusviewer qmake script \
299	scripttools sql sql-ibase sql-mysql sql-odbc sql-pgsql \	299	scripttools sql sql-mysql sql-odbc sql-pgsql \
300	sql-sqlite2 sql-sqlite3 svg testlib webkit \	300	sql-sqlite2 sql-sqlite3 svg testlib webkit \
301	xml xmlpatterns	301	xml xmlpatterns
		302	.if ${ARCH} == amd64 \|\| ${ARCH} == i386
		303	_USE_QT_ALL+= sql-ibase
		304	.endif
302		305
303	_USE_QT4_ONLY= accessible assistant-adp assistantclient codecs-cn codecs-jp \	306	_USE_QT4_ONLY= accessible assistant-adp assistantclient codecs-cn codecs-jp \
304	codecs-kr codecs-tw corelib demo graphicssystems-opengl \	307	codecs-kr codecs-tw corelib demo graphicssystems-opengl \

Lines 31-37 Link Here

(-)devel/qt4/Makefile (-1 / +7 lines)
31	NLS_USE= l10n	31	NLS_USE= l10n
32		32
33	SQL_PLUGINS_DESC= Install database plugins for QtSql	33	SQL_PLUGINS_DESC= Install database plugins for QtSql
34	SQL_PLUGINS_USE=sql-ibase sql-mysql sql-odbc sql-pgsql sql-sqlite2 \	34	SQL_PLUGINS_USE=sql-mysql sql-odbc sql-pgsql sql-sqlite2 \
35	sql-sqlite3	35	sql-sqlite3
36		36
37	TOOLS_DESC= Install Qt tools (qmake, moc, etc.)	37	TOOLS_DESC= Install Qt tools (qmake, moc, etc.)
Lines 44-47 Link Here
44	${opt}_USE:= ${${opt}_USE:S/^/QT4=/:S/$/_run/}	44	${opt}_USE:= ${${opt}_USE:S/^/QT4=/:S/$/_run/}
45	.endfor	45	.endfor
46		46
		47	.include <bsd.port.options.mk>
		48
		49	.if ${ARCH} == amd64 \|\| ${ARCH} == i386
		50	SQL_PLUGINS_USE+=sql-ibase
		51	.endif
		52
47	.include <bsd.port.mk>	53	.include <bsd.port.mk>

Lines 95-101 Link Here

(-)editors/libreoffice/Makefile (-1 / +7 lines)
95	USE_PERL5= build	95	USE_PERL5= build
96	USE_QT4= # empty but required	96	USE_QT4= # empty but required
97	USE_XORG= xaw xrandr	97	USE_XORG= xaw xrandr
98	USES= autoreconf:build bison compiler:c++11-lib cpe firebird gmake jpeg perl5 pkgconfig \	98	USES= autoreconf:build bison compiler:c++11-lib cpe gmake jpeg perl5 pkgconfig \
99	python shared-mime-info tar:xz	99	python shared-mime-info tar:xz
100	WANT_GNOME= yes	100	WANT_GNOME= yes
101		101
Lines 264-269 Link Here
264		264
265	_MAKE_JOBS= #	265	_MAKE_JOBS= #
266		266
		267	.include <bsd.port.options.mk>
		268
		269	.if ${ARCH} == amd64 \|\| ${ARCH} == i386
		270	USES+= firebird
		271	.endif
		272
267	.include <bsd.port.pre.mk>	273	.include <bsd.port.pre.mk>
268		274
269	.if ${OPSYS} == FreeBSD	275	.if ${OPSYS} == FreeBSD

Return to bug 216943