Date: Mon, 25 Jun 2012 13:06:02 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r799 - branches/experimental/Mk Message-ID: <201206251306.q5PD62F3063378@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: beat
Date: Mon Jun 25 13:06:02 2012
New Revision: 799
Log:
- Sync FF and TB versions with ports
- Re-add a check if Thunderbird binary exist which was accidentally
removed in rev 1.57.
- Remove obsolte FF version conditionals
Modified:
branches/experimental/Mk/bsd.gecko.mk
Modified: branches/experimental/Mk/bsd.gecko.mk
==============================================================================
--- branches/experimental/Mk/bsd.gecko.mk Mon Jun 25 13:01:37 2012 (r798)
+++ branches/experimental/Mk/bsd.gecko.mk Mon Jun 25 13:06:02 2012 (r799)
@@ -182,7 +182,7 @@
# 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 10+ 12+ 10 12+
+# Available values: yes 10+ 13+ 10 13+
# NOTE:
# default value 10 is used in case of USE_FIREFOX=yes
#
@@ -204,7 +204,7 @@
# version 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 10+ 12+ 10 12
+# Available values: yes 10+ 13+ 10 13
# NOTE:
# default value 10 is used in case of USE_THUNDERBIRD=yes
#
@@ -224,11 +224,11 @@
.endif
_FIREFOX_DEFAULT_VERSION= 10
-_FIREFOX_VERSIONS= 10 12
-_FIREFOX_RANGE_VERSIONS= 10+ 12+
+_FIREFOX_VERSIONS= 10 13
+_FIREFOX_RANGE_VERSIONS= 10+ 13+
# For specifying [10, ..]+
-_FIREFOX_12P= 12 ${_FIREFOX_10P}
+_FIREFOX_13P= 13 ${_FIREFOX_10P}
_FIREFOX_10P= 10
# Set the default Firefox version and check if USE_FIREFOX=yes was given
@@ -239,13 +239,7 @@
# Setting/finding Firefox version we want.
.if exists(${LOCALBASE}/bin/firefox)
_TMP_VER!= ${LOCALBASE}/bin/firefox --version 2>/dev/null | ${HEAD} -1 | ${SED} -e 's/Mozilla Firefox \([0-9]\{1,2\}\)\.\([0-9]*\).*/\1\2/'
-.if ${_TMP_VER} >= 100
_FIREFOX_VER:= ${_TMP_VER:C/([0-9][0-9]).*/\1/}
-.else
-_FIREFOX_VER= ${_TMP_VER}
-.endif
-.elif exists(${LOCALBASE}/bin/firefox3)
-_FIREFOX_VER!= ${LOCALBASE}/bin/firefox3 --version 2>/dev/null | ${HEAD} -1 | ${SED} -e 's/Mozilla Firefox \([0-9]\)\.\([0-9]*\).*/\1\2/'
.endif
# Check if installed Firefox version matches the wanted one
@@ -282,7 +276,7 @@
# Dependence lines for different Firefox versions
10_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox-esr
-12_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox
+13_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox
# Add dependencies
.if defined(USE_FIREFOX)
@@ -374,11 +368,11 @@
.endif
_THUNDERBIRD_DEFAULT_VERSION= 10
-_THUNDERBIRD_VERSIONS= 10 12
-_THUNDERBIRD_RANGE_VERSIONS= 10+ 12+
+_THUNDERBIRD_VERSIONS= 10 13
+_THUNDERBIRD_RANGE_VERSIONS= 10+ 13+
# For specifying [10, ..]+
-_THUNDERBIRD_12P= 12 ${_THUNDERBIRD_10P}
+_THUNDERBIRD_13P= 13 ${_THUNDERBIRD_10P}
_THUNDERBIRD_10P= 10
# Set the default Thunderbird version and check if USE_THUNDERBIRD=yes was given
@@ -387,8 +381,10 @@
.endif
# Setting/finding Thunderbird version we want.
+.if exists(${LOCALBASE}/bin/thunderbird)
_TMP_VER!= ${LOCALBASE}/bin/thunderbird --version 2>/dev/null | ${HEAD} -1 | ${SED} -e 's/ Thunderbird \([0-9]\{1,2\}\)\.\([0-9]*\).*/\1\2/'
_THUNDERBIRD_VER:= ${_TMP_VER:C/([0-9][0-9]).*/\1/}
+.endif
# Check if installed Thunderbird version matches the wanted one
.if defined(_THUNDERBIRD_VER)
@@ -423,7 +419,7 @@
# Dependence lines for different Thunderbird versions
10_DEPENDS= ${LOCALBASE}/lib/thunderbird/thunderbird:${PORTSDIR}/mail/thunderbird-esr
-12_DEPENDS= ${LOCALBASE}/lib/thunderbird/thunderbird:${PORTSDIR}/mail/thunderbird
+13_DEPENDS= ${LOCALBASE}/lib/thunderbird/thunderbird:${PORTSDIR}/mail/thunderbird
# Add dependencies
.if defined(USE_THUNDERBIRD)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201206251306.q5PD62F3063378>