Date: Mon, 23 Jul 2012 13:17:05 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r885 - in branches/experimental: Mk mail/thunderbird-i18n www/firefox-i18n Message-ID: <201207231317.q6NDH5WN032724@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: flo
Date: Mon Jul 23 13:17:04 2012
New Revision: 885
Log:
Update for version 14
Modified:
branches/experimental/Mk/bsd.gecko.mk
branches/experimental/mail/thunderbird-i18n/Makefile
branches/experimental/www/firefox-i18n/Makefile
Modified: branches/experimental/Mk/bsd.gecko.mk
==============================================================================
--- branches/experimental/Mk/bsd.gecko.mk Mon Jul 23 13:15:18 2012 (r884)
+++ branches/experimental/Mk/bsd.gecko.mk Mon Jul 23 13:17:04 2012 (r885)
@@ -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+ 13+ 10 13+
+# Available values: yes 10+ 14+ 10 14+
# 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+ 13+ 10 13
+# Available values: yes 10+ 14+ 10 14
# NOTE:
# default value 10 is used in case of USE_THUNDERBIRD=yes
#
@@ -224,11 +224,11 @@
.endif
_FIREFOX_DEFAULT_VERSION= 10
-_FIREFOX_VERSIONS= 10 13
-_FIREFOX_RANGE_VERSIONS= 10+ 13+
+_FIREFOX_VERSIONS= 10 14
+_FIREFOX_RANGE_VERSIONS= 10+ 14+
# For specifying [10, ..]+
-_FIREFOX_13P= 13 ${_FIREFOX_10P}
+_FIREFOX_14P= 14 ${_FIREFOX_10P}
_FIREFOX_10P= 10
# Set the default Firefox version and check if USE_FIREFOX=yes was given
@@ -238,8 +238,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/'
-_FIREFOX_VER:= ${_TMP_VER:C/([0-9][0-9]).*/\1/}
+_FIREFOX_VER!= ${LOCALBASE}/bin/firefox --version 2>/dev/null | ${HEAD} -1 | ${SED} -e 's/Mozilla Firefox \([0-9]\{1,2\}\)\.\([0-9]*\).*/\1/'
.endif
# Check if installed Firefox version matches the wanted one
@@ -276,7 +275,7 @@
# Dependence lines for different Firefox versions
10_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox-esr
-13_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox
+14_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox
# Add dependencies
.if defined(USE_FIREFOX)
@@ -368,11 +367,11 @@
.endif
_THUNDERBIRD_DEFAULT_VERSION= 10
-_THUNDERBIRD_VERSIONS= 10 13
-_THUNDERBIRD_RANGE_VERSIONS= 10+ 13+
+_THUNDERBIRD_VERSIONS= 10 14
+_THUNDERBIRD_RANGE_VERSIONS= 10+ 14+
# For specifying [10, ..]+
-_THUNDERBIRD_13P= 13 ${_THUNDERBIRD_10P}
+_THUNDERBIRD_14P= 14 ${_THUNDERBIRD_10P}
_THUNDERBIRD_10P= 10
# Set the default Thunderbird version and check if USE_THUNDERBIRD=yes was given
@@ -382,8 +381,7 @@
# 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/}
+_THUNDERBIRD_VER!= ${LOCALBASE}/bin/thunderbird --version 2>/dev/null | ${HEAD} -1 | ${SED} -e 's/ Thunderbird \([0-9]\{1,2\}\)\.\([0-9]*\).*/\1/'
.endif
# Check if installed Thunderbird version matches the wanted one
@@ -419,7 +417,7 @@
# Dependence lines for different Thunderbird versions
10_DEPENDS= ${LOCALBASE}/lib/thunderbird/thunderbird:${PORTSDIR}/mail/thunderbird-esr
-13_DEPENDS= ${LOCALBASE}/lib/thunderbird/thunderbird:${PORTSDIR}/mail/thunderbird
+14_DEPENDS= ${LOCALBASE}/lib/thunderbird/thunderbird:${PORTSDIR}/mail/thunderbird
# Add dependencies
.if defined(USE_THUNDERBIRD)
Modified: branches/experimental/mail/thunderbird-i18n/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird-i18n/Makefile Mon Jul 23 13:15:18 2012 (r884)
+++ branches/experimental/mail/thunderbird-i18n/Makefile Mon Jul 23 13:17:04 2012 (r885)
@@ -27,7 +27,7 @@
.endif
NO_BUILD= yes
-USE_THUNDERBIRD= 13
+USE_THUNDERBIRD= 14
USE_XPI= thunderbird linux-thunderbird
THUNDERBIRD_I18N_ALL= ar br ca cs da de en-GB en-US es-AR es-ES et eu fi fr \
Modified: branches/experimental/www/firefox-i18n/Makefile
==============================================================================
--- branches/experimental/www/firefox-i18n/Makefile Mon Jul 23 13:15:18 2012 (r884)
+++ branches/experimental/www/firefox-i18n/Makefile Mon Jul 23 13:17:04 2012 (r885)
@@ -18,7 +18,7 @@
EXTRACT_DEPENDS= zip:${PORTSDIR}/archivers/zip
-USE_FIREFOX= 13
+USE_FIREFOX= 14
USE_XPI= firefox linux-firefox
USE_SUBMAKE= yes
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201207231317.q6NDH5WN032724>