From owner-freebsd-gecko@FreeBSD.ORG  Wed Mar 16 23:37:04 2011
Return-Path: <owner-freebsd-gecko@FreeBSD.ORG>
Delivered-To: freebsd-gecko@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C1C25106566B
	for <freebsd-gecko@freebsd.org>; Wed, 16 Mar 2011 23:37:04 +0000 (UTC)
	(envelope-from svn-freebsd-gecko@chruetertee.ch)
Received: from trillian.chruetertee.ch (trillian.chruetertee.ch
	[217.150.245.56])
	by mx1.freebsd.org (Postfix) with ESMTP id 4443C8FC13
	for <freebsd-gecko@freebsd.org>; Wed, 16 Mar 2011 23:37:04 +0000 (UTC)
Received: from trillian.chruetertee.ch (trillian [217.150.245.56])
	by trillian.chruetertee.ch (8.14.3/8.14.3) with ESMTP id p2GNb3db082467
	for <freebsd-gecko@freebsd.org>; Wed, 16 Mar 2011 23:37:03 GMT
	(envelope-from svn-freebsd-gecko@chruetertee.ch)
Received: (from www@localhost)
	by trillian.chruetertee.ch (8.14.3/8.14.3/Submit) id p2GNawte082303
	for freebsd-gecko@freebsd.org; Wed, 16 Mar 2011 23:36:58 GMT
	(envelope-from svn-freebsd-gecko@chruetertee.ch)
Date: Wed, 16 Mar 2011 23:36:58 GMT
Message-Id: <201103162336.p2GNawte082303@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
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Subject: [SVN-Commit] r520 - branches/experimental/Mk
X-BeenThere: freebsd-gecko@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Wed, 16 Mar 2011 23:37:04 -0000

Author: beat
Date: Wed Mar 16 23:36:57 2011
New Revision: 520

Log:
- Add Firefox 4.0 and make Firefox 4.0 the default version.

Modified:
   branches/experimental/Mk/bsd.gecko.mk

Modified: branches/experimental/Mk/bsd.gecko.mk
==============================================================================
--- branches/experimental/Mk/bsd.gecko.mk	Wed Mar 16 23:35:43 2011	(r519)
+++ branches/experimental/Mk/bsd.gecko.mk	Wed Mar 16 23:36:57 2011	(r520)
@@ -177,9 +177,9 @@
 #                         is given by the maintainer via the port or by the
 #                         user via defined variable try to find the highest
 #                         stable installed version.
-#                         Available values: yes 36+ 35+ 36 35
+#                         Available values: yes 40+ 36+ 35+ 40 36 35
 #                         NOTE:
-#                         default value 36 is used in case of USE_FIREFOX=yes
+#                         default value 40 is used in case of USE_FIREFOX=yes
 #
 # USE_FIREFOX_BUILD       Add buildtime dependency on Firefox.
 #                         Available values: see USE_FIREFOX
@@ -218,13 +218,14 @@
 _FIREFOX_BUILD_DEPENDS=		yes
 .endif
 
-_FIREFOX_DEFAULT_VERSION=	36
-_FIREFOX_VERSIONS=			36 35
-_FIREFOX_RANGE_VERSIONS=	36+ 35+
+_FIREFOX_DEFAULT_VERSION=	40
+_FIREFOX_VERSIONS=			40 36 35
+_FIREFOX_RANGE_VERSIONS=	40+ 36+ 35+
 
 # For specifying [36, 35, ..]+
 _FIREFOX_35P=	35 ${_FIREFOX_36P}
-_FIREFOX_36P=	36
+_FIREFOX_36P=	36 ${_FIREFOX_40P}
+_FIREFOX_40P=	40
 
 # Set the default Firefox version and check if USE_FIREFOX=yes was given
 .if ${USE_FIREFOX} == "yes"
@@ -268,7 +269,8 @@
 .endif
 
 # Dependence lines for different Firefox versions
-36_DEPENDS=		${LOCALBASE}/lib/firefox3/firefox:${PORTSDIR}/www/firefox
+40_DEPENDS=		${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox
+36_DEPENDS=		${LOCALBASE}/lib/firefox3/firefox:${PORTSDIR}/www/firefox36
 35_DEPENDS=		${LOCALBASE}/lib/firefox3/firefox:${PORTSDIR}/www/firefox35
 
 # Add dependencies