[SVN-Commit] r1687 - branches/firefox32/www/firefox-nightly trunk/www/firefox-nightly

[svn-freebsd-gecko at chruetertee.ch]

Author: jbeich
Date: Fri Sep  5 13:42:47 2014
New Revision: 1687

Log:
unbreak build on 8.4R amd64

Modified:
   branches/firefox32/www/firefox-nightly/Makefile
   trunk/www/firefox-nightly/Makefile

Modified: branches/firefox32/www/firefox-nightly/Makefile
==============================================================================
--- branches/firefox32/www/firefox-nightly/Makefile	Fri Sep  5 13:18:15 2014	(r1686)
+++ branches/firefox32/www/firefox-nightly/Makefile	Fri Sep  5 13:42:47 2014	(r1687)
@@ -48,7 +48,8 @@
 WANT_GNOME=	yes
 USE_QT5=	# empty
 QT_NONSTANDARD=	yes
-ALL_TARGET=	default
+ALL_TARGET=	build
+MAKEFILE=	${WRKSRC}/client.mk
 USE_GL=		gl
 USES=		dos2unix tar:bzip2
 DOS2UNIX_FILES=	media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp
@@ -97,10 +98,6 @@
 RUN_DEPENDS+=	gstreamer1-libav>=1.2.4_1:${PORTSDIR}/multimedia/gstreamer1-libav
 .endif
 
-.if ! ${PORT_OPTIONS:MMACH}
-GNU_CONFIGURE=	yes
-.endif
-
 .if ${PORT_OPTIONS:MMACH} && ${PORT_OPTIONS:MPGO}
 IGNORE=		MACH currently does not support PGO build
 .endif

Modified: trunk/www/firefox-nightly/Makefile
==============================================================================
--- trunk/www/firefox-nightly/Makefile	Fri Sep  5 13:18:15 2014	(r1686)
+++ trunk/www/firefox-nightly/Makefile	Fri Sep  5 13:42:47 2014	(r1687)
@@ -48,7 +48,8 @@
 WANT_GNOME=	yes
 USE_QT5=	# empty
 QT_NONSTANDARD=	yes
-ALL_TARGET=	default
+ALL_TARGET=	build
+MAKEFILE=	${WRKSRC}/client.mk
 USE_GL=		gl
 USES=		dos2unix tar:bzip2
 DOS2UNIX_FILES=	media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp
@@ -97,10 +98,6 @@
 RUN_DEPENDS+=	gstreamer1-libav>=1.2.4_1:${PORTSDIR}/multimedia/gstreamer1-libav
 .endif
 
-.if ! ${PORT_OPTIONS:MMACH}
-GNU_CONFIGURE=	yes
-.endif
-
 .if ${PORT_OPTIONS:MMACH} && ${PORT_OPTIONS:MPGO}
 IGNORE=		MACH currently does not support PGO build
 .endif