From owner-svn-ports-head@FreeBSD.ORG  Fri Nov  1 23:16:27 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id B6340180;
 Fri,  1 Nov 2013 23:16:27 +0000 (UTC) (envelope-from flo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id A24D82F01;
 Fri,  1 Nov 2013 23:16:27 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA1NGReo098252;
 Fri, 1 Nov 2013 23:16:27 GMT (envelope-from flo@svn.freebsd.org)
Received: (from flo@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA1NGRRH098251;
 Fri, 1 Nov 2013 23:16:27 GMT (envelope-from flo@svn.freebsd.org)
Message-Id: <201311012316.rA1NGRRH098251@svn.freebsd.org>
From: Florian Smeets <flo@FreeBSD.org>
Date: Fri, 1 Nov 2013 23:16:27 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r332422 - head/www/firefox
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 01 Nov 2013 23:16:27 -0000

Author: flo
Date: Fri Nov  1 23:16:27 2013
New Revision: 332422
URL: http://svnweb.freebsd.org/changeset/ports/332422

Log:
  The previous commit fixed one mismerge and introduced another. Put a needed
  check for i386 on 9.x back in.
  
  Pointhat to:	flo

Modified:
  head/www/firefox/Makefile

Modified: head/www/firefox/Makefile
==============================================================================
--- head/www/firefox/Makefile	Fri Nov  1 23:12:00 2013	(r332421)
+++ head/www/firefox/Makefile	Fri Nov  1 23:16:27 2013	(r332422)
@@ -53,6 +53,10 @@ MOZ_OPTIONS=	--program-transform-name='s
 
 WRKSRC:=	${WRKDIR}/mozilla-release
 
+.if ${ARCH} == i386 && ${OSVERSION} < 1000000
+USE_GCC?=	yes
+.endif
+
 post-extract:
 	@${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' -e 's|@MOZILLA@|${MOZILLA}|' \
 		-e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|' \