From owner-freebsd-gecko@FreeBSD.ORG  Fri Feb 28 02:02:43 2014
Return-Path: <owner-freebsd-gecko@FreeBSD.ORG>
Delivered-To: freebsd-gecko@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id B1034D84
 for <freebsd-gecko@freebsd.org>; Fri, 28 Feb 2014 02:02:43 +0000 (UTC)
Received: from trillian.chruetertee.ch (trillian.chruetertee.ch
 [217.150.244.247])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 00A94109C
 for <freebsd-gecko@freebsd.org>; Fri, 28 Feb 2014 02:02:42 +0000 (UTC)
Received: from trillian.chruetertee.ch (trillian [217.150.244.247])
 by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id s1S22fI3047478
 for <freebsd-gecko@freebsd.org>; Fri, 28 Feb 2014 02:02:41 GMT
 (envelope-from svn-freebsd-gecko@chruetertee.ch)
Received: (from www@localhost)
 by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id s1S22ak3047047
 for freebsd-gecko@freebsd.org; Fri, 28 Feb 2014 02:02:36 GMT
 (envelope-from svn-freebsd-gecko@chruetertee.ch)
Date: Fri, 28 Feb 2014 02:02:36 GMT
Message-Id: <201402280202.s1S22ak3047047@trillian.chruetertee.ch>
X-Authentication-Warning: trillian.chruetertee.ch: www set sender to
 svn-freebsd-gecko@chruetertee.ch using -f
From: svn-freebsd-gecko@chruetertee.ch
To: freebsd-gecko@freebsd.org
Subject: [SVN-Commit] r1519 - trunk/www/firefox-nightly
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: freebsd-gecko@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
Reply-To: freebsd-gecko@freebsd.org
List-Id: Gecko Rendering Engine issues <freebsd-gecko.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-gecko>,
 <mailto:freebsd-gecko-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-gecko/>
List-Post: <mailto:freebsd-gecko@freebsd.org>
List-Help: <mailto:freebsd-gecko-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-gecko>,
 <mailto:freebsd-gecko-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Feb 2014 02:02:43 -0000

Author: jbeich
Date: Fri Feb 28 02:02:36 2014
New Revision: 1519

Log:
add an experimental option to use mach

After build you can try some other commands:

  $ cd $(make -V WRKSRC)
  $ ./mach warnings-summary
  $ ./mach run
  $ ./mach xpcshell-test (needs TESTS build)

cf. https://developer.mozilla.org/en-US/docs/Developer_Guide/mach

Modified:
   trunk/www/firefox-nightly/Makefile

Modified: trunk/www/firefox-nightly/Makefile
==============================================================================
--- trunk/www/firefox-nightly/Makefile	Fri Feb 28 02:02:29 2014	(r1518)
+++ trunk/www/firefox-nightly/Makefile	Fri Feb 28 02:02:36 2014	(r1519)
@@ -45,7 +45,6 @@
 USE_QT4=	# empty
 QT_NONSTANDARD=	yes
 ALL_TARGET=	default
-GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GL=		gl
 USES=		dos2unix
@@ -57,11 +56,14 @@
 MOZ_OPTIONS=	--program-transform-name='s/firefox/${MOZILLA}/' \
 		--enable-application=browser
 
+OPTIONS_DEFINE=		MACH
 OPTIONS_DEFAULT=	GTK2
 
 OPTIONS_SINGLE+=	TOOLKIT
 OPTIONS_SINGLE_TOOLKIT=	GTK2 GTK3
 
+MACH_DESC=		Use mach command to build
+
 .include "${.CURDIR}/../../www/firefox/Makefile.options"
 .include <bsd.port.pre.mk>
 
@@ -71,6 +73,14 @@
 BUILD_DEPENDS+=	alsa-lib>=1.0.27.2_1:${PORTSDIR}/audio/alsa-lib
 .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
+
 post-extract:
 	@${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' -e 's|@MOZILLA@|${MOZILLA}|' \
 		-e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|' \
@@ -82,9 +92,15 @@
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/browser/app/nsBrowserApp.cpp
 
+.if ! ${PORT_OPTIONS:MMACH}
 pre-configure:
 	(cd ${WRKSRC} && ${AUTOCONF})
 	(cd ${WRKSRC}/js/src/ && ${AUTOCONF})
+.else
+do-build:
+	cd ${WRKSRC} && MOZBUILD_STATE_PATH=${WRKDIR} \
+		${MAKE_ENV} ${PYTHON_CMD} ${MOZSRC}/mach build
+.endif
 
 port-pre-install:
 	${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLISTF}