[SVN-Commit] r520 - branches/experimental/Mk

[svn-freebsd-gecko at chruetertee.ch]

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