[SVN-Commit] r1548 - in trunk: Mk www/firefox-nightly

[svn-freebsd-gecko at chruetertee.ch]

Author: jbeich
Date: Wed Mar 12 06:40:53 2014
New Revision: 1548

Log:
nightly doesn't support qt4 since bug 974335

Modified:
   trunk/Mk/bsd.gecko.mk
   trunk/www/firefox-nightly/Makefile

Modified: trunk/Mk/bsd.gecko.mk
==============================================================================
--- trunk/Mk/bsd.gecko.mk	Wed Mar 12 06:32:01 2014	(r1547)
+++ trunk/Mk/bsd.gecko.mk	Wed Mar 12 06:40:53 2014	(r1548)
@@ -668,7 +668,11 @@
 USE_MOZILLA+=	-cairo # ports/169343
 USE_DISPLAY=yes # install
 USE_GNOME+=	pango
+. if ${MOZILLA_VER:R:R} >= 30
+USE_QT5+=	qmake_build buildtools_build gui network quick printsupport
+. else
 USE_QT4+=	qmake_build moc_build rcc_build gui network opengl
+. endif
 MOZ_EXPORT+=	HOST_QMAKE="${QMAKE}" HOST_MOC="${MOC}" HOST_RCC="${RCC}"
 .elif ${MOZ_TOOLKIT:Mcairo-gtk3}
 USE_GNOME+=	gtk30

Modified: trunk/www/firefox-nightly/Makefile
==============================================================================
--- trunk/www/firefox-nightly/Makefile	Wed Mar 12 06:32:01 2014	(r1547)
+++ trunk/www/firefox-nightly/Makefile	Wed Mar 12 06:40:53 2014	(r1548)
@@ -43,7 +43,7 @@
 UNIQUENAME=	${MOZILLA}
 
 WANT_GNOME=	yes
-USE_QT4=	# empty
+USE_QT5=	# empty
 QT_NONSTANDARD=	yes
 ALL_TARGET=	default
 USE_BZIP2=	yes