- Update pkg-descr to better reflect firefox

- Fix expr usage for 4.x since expr on 4.x
  is not POSIX compliant. [1]

Submitted by:	girgen [1]

18 files changed, 108 insertions, 54 deletions

diff --git a/www/firefox-devel/files/patch-browser_app_mozilla.in b/www/firefox-devel/files/patch-browser_app_mozilla.in
index d576c95816b8..9ad04f41976b 100644
--- a/www/firefox-devel/files/patch-browser_app_mozilla.in
+++ b/www/firefox-devel/files/patch-browser_app_mozilla.in
@@ -13,7 +13,7 @@
  done #last arg
  
 -if [ `expr "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
-+if [ `expr -- "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
++if [ `expr X"${_optLast}" : 'X.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
  	# Last argument seems to be a local file/directory
  	# Check, if it is absolutely specified (ie. /home/foo/file vs. ./file)
  	# If it is just "relatively" (./file) specified, make it absolutely
diff --git a/www/firefox-devel/pkg-descr b/www/firefox-devel/pkg-descr
index b6576089aa3b..99b11c5e72e2 100644
--- a/www/firefox-devel/pkg-descr
+++ b/www/firefox-devel/pkg-descr
@@ -1,6 +1,12 @@
-Mozilla Firefox is the next-generation browser from the Mozilla project. See
-its home page for more details.
+Firefox is an award winning, free, open-source web browser for many platforms
+and is based on the Mozilla codebase. It is small, fast and easy to use, and
+offers many advanced features:
+ o Popup Blocking
+ o Tabbed Browsing
+ o Live Bookmarks (ie. RSS)
+ o Extensions
+ o Themes
+ o FastFind
+ o Improved Security
 
-WWW:  http://www.mozilla.org/products/firefox/
-
--- AlanE <alane@freebsd.org>
+WWW: http://www.mozilla.org/products/firefox/
diff --git a/www/firefox-esr/files/patch-browser_app_mozilla.in b/www/firefox-esr/files/patch-browser_app_mozilla.in
index d576c95816b8..9ad04f41976b 100644
--- a/www/firefox-esr/files/patch-browser_app_mozilla.in
+++ b/www/firefox-esr/files/patch-browser_app_mozilla.in
@@ -13,7 +13,7 @@
  done #last arg
  
 -if [ `expr "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
-+if [ `expr -- "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
++if [ `expr X"${_optLast}" : 'X.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
  	# Last argument seems to be a local file/directory
  	# Check, if it is absolutely specified (ie. /home/foo/file vs. ./file)
  	# If it is just "relatively" (./file) specified, make it absolutely
diff --git a/www/firefox-esr/pkg-descr b/www/firefox-esr/pkg-descr
index b6576089aa3b..99b11c5e72e2 100644
--- a/www/firefox-esr/pkg-descr
+++ b/www/firefox-esr/pkg-descr
@@ -1,6 +1,12 @@
-Mozilla Firefox is the next-generation browser from the Mozilla project. See
-its home page for more details.
+Firefox is an award winning, free, open-source web browser for many platforms
+and is based on the Mozilla codebase. It is small, fast and easy to use, and
+offers many advanced features:
+ o Popup Blocking
+ o Tabbed Browsing
+ o Live Bookmarks (ie. RSS)
+ o Extensions
+ o Themes
+ o FastFind
+ o Improved Security
 
-WWW:  http://www.mozilla.org/products/firefox/
-
--- AlanE <alane@freebsd.org>
+WWW: http://www.mozilla.org/products/firefox/
diff --git a/www/firefox/files/patch-browser_app_mozilla.in b/www/firefox/files/patch-browser_app_mozilla.in
index d576c95816b8..9ad04f41976b 100644
--- a/www/firefox/files/patch-browser_app_mozilla.in
+++ b/www/firefox/files/patch-browser_app_mozilla.in
@@ -13,7 +13,7 @@
  done #last arg
  
 -if [ `expr "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
-+if [ `expr -- "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
++if [ `expr X"${_optLast}" : 'X.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
  	# Last argument seems to be a local file/directory
  	# Check, if it is absolutely specified (ie. /home/foo/file vs. ./file)
  	# If it is just "relatively" (./file) specified, make it absolutely
diff --git a/www/firefox/pkg-descr b/www/firefox/pkg-descr
index b6576089aa3b..99b11c5e72e2 100644
--- a/www/firefox/pkg-descr
+++ b/www/firefox/pkg-descr
@@ -1,6 +1,12 @@
-Mozilla Firefox is the next-generation browser from the Mozilla project. See
-its home page for more details.
+Firefox is an award winning, free, open-source web browser for many platforms
+and is based on the Mozilla codebase. It is small, fast and easy to use, and
+offers many advanced features:
+ o Popup Blocking
+ o Tabbed Browsing
+ o Live Bookmarks (ie. RSS)
+ o Extensions
+ o Themes
+ o FastFind
+ o Improved Security
 
-WWW:  http://www.mozilla.org/products/firefox/
-
--- AlanE <alane@freebsd.org>
+WWW: http://www.mozilla.org/products/firefox/
diff --git a/www/firefox10/files/patch-browser_app_mozilla.in b/www/firefox10/files/patch-browser_app_mozilla.in
index d576c95816b8..9ad04f41976b 100644
--- a/www/firefox10/files/patch-browser_app_mozilla.in
+++ b/www/firefox10/files/patch-browser_app_mozilla.in
@@ -13,7 +13,7 @@
  done #last arg
  
 -if [ `expr "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
-+if [ `expr -- "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
++if [ `expr X"${_optLast}" : 'X.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
  	# Last argument seems to be a local file/directory
  	# Check, if it is absolutely specified (ie. /home/foo/file vs. ./file)
  	# If it is just "relatively" (./file) specified, make it absolutely
diff --git a/www/firefox10/pkg-descr b/www/firefox10/pkg-descr
index b6576089aa3b..99b11c5e72e2 100644
--- a/www/firefox10/pkg-descr
+++ b/www/firefox10/pkg-descr
@@ -1,6 +1,12 @@
-Mozilla Firefox is the next-generation browser from the Mozilla project. See
-its home page for more details.
+Firefox is an award winning, free, open-source web browser for many platforms
+and is based on the Mozilla codebase. It is small, fast and easy to use, and
+offers many advanced features:
+ o Popup Blocking
+ o Tabbed Browsing
+ o Live Bookmarks (ie. RSS)
+ o Extensions
+ o Themes
+ o FastFind
+ o Improved Security
 
-WWW:  http://www.mozilla.org/products/firefox/
-
--- AlanE <alane@freebsd.org>
+WWW: http://www.mozilla.org/products/firefox/
diff --git a/www/firefox15/files/patch-browser_app_mozilla.in b/www/firefox15/files/patch-browser_app_mozilla.in
index d576c95816b8..9ad04f41976b 100644
--- a/www/firefox15/files/patch-browser_app_mozilla.in
+++ b/www/firefox15/files/patch-browser_app_mozilla.in
@@ -13,7 +13,7 @@
  done #last arg
  
 -if [ `expr "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
-+if [ `expr -- "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
++if [ `expr X"${_optLast}" : 'X.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
  	# Last argument seems to be a local file/directory
  	# Check, if it is absolutely specified (ie. /home/foo/file vs. ./file)
  	# If it is just "relatively" (./file) specified, make it absolutely
diff --git a/www/firefox15/pkg-descr b/www/firefox15/pkg-descr
index b6576089aa3b..99b11c5e72e2 100644
--- a/www/firefox15/pkg-descr
+++ b/www/firefox15/pkg-descr
@@ -1,6 +1,12 @@
-Mozilla Firefox is the next-generation browser from the Mozilla project. See
-its home page for more details.
+Firefox is an award winning, free, open-source web browser for many platforms
+and is based on the Mozilla codebase. It is small, fast and easy to use, and
+offers many advanced features:
+ o Popup Blocking
+ o Tabbed Browsing
+ o Live Bookmarks (ie. RSS)
+ o Extensions
+ o Themes
+ o FastFind
+ o Improved Security
 
-WWW:  http://www.mozilla.org/products/firefox/
-
--- AlanE <alane@freebsd.org>
+WWW: http://www.mozilla.org/products/firefox/
diff --git a/www/firefox3-devel/files/patch-browser_app_mozilla.in b/www/firefox3-devel/files/patch-browser_app_mozilla.in
index d576c95816b8..9ad04f41976b 100644
--- a/www/firefox3-devel/files/patch-browser_app_mozilla.in
+++ b/www/firefox3-devel/files/patch-browser_app_mozilla.in
@@ -13,7 +13,7 @@
  done #last arg
  
 -if [ `expr "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
-+if [ `expr -- "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
++if [ `expr X"${_optLast}" : 'X.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
  	# Last argument seems to be a local file/directory
  	# Check, if it is absolutely specified (ie. /home/foo/file vs. ./file)
  	# If it is just "relatively" (./file) specified, make it absolutely
diff --git a/www/firefox3-devel/pkg-descr b/www/firefox3-devel/pkg-descr
index b6576089aa3b..99b11c5e72e2 100644
--- a/www/firefox3-devel/pkg-descr
+++ b/www/firefox3-devel/pkg-descr
@@ -1,6 +1,12 @@
-Mozilla Firefox is the next-generation browser from the Mozilla project. See
-its home page for more details.
+Firefox is an award winning, free, open-source web browser for many platforms
+and is based on the Mozilla codebase. It is small, fast and easy to use, and
+offers many advanced features:
+ o Popup Blocking
+ o Tabbed Browsing
+ o Live Bookmarks (ie. RSS)
+ o Extensions
+ o Themes
+ o FastFind
+ o Improved Security
 
-WWW:  http://www.mozilla.org/products/firefox/
-
--- AlanE <alane@freebsd.org>
+WWW: http://www.mozilla.org/products/firefox/
diff --git a/www/firefox35/files/patch-browser_app_mozilla.in b/www/firefox35/files/patch-browser_app_mozilla.in
index d576c95816b8..9ad04f41976b 100644
--- a/www/firefox35/files/patch-browser_app_mozilla.in
+++ b/www/firefox35/files/patch-browser_app_mozilla.in
@@ -13,7 +13,7 @@
  done #last arg
  
 -if [ `expr "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
-+if [ `expr -- "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
++if [ `expr X"${_optLast}" : 'X.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
  	# Last argument seems to be a local file/directory
  	# Check, if it is absolutely specified (ie. /home/foo/file vs. ./file)
  	# If it is just "relatively" (./file) specified, make it absolutely
diff --git a/www/firefox35/pkg-descr b/www/firefox35/pkg-descr
index b6576089aa3b..99b11c5e72e2 100644
--- a/www/firefox35/pkg-descr
+++ b/www/firefox35/pkg-descr
@@ -1,6 +1,12 @@
-Mozilla Firefox is the next-generation browser from the Mozilla project. See
-its home page for more details.
+Firefox is an award winning, free, open-source web browser for many platforms
+and is based on the Mozilla codebase. It is small, fast and easy to use, and
+offers many advanced features:
+ o Popup Blocking
+ o Tabbed Browsing
+ o Live Bookmarks (ie. RSS)
+ o Extensions
+ o Themes
+ o FastFind
+ o Improved Security
 
-WWW:  http://www.mozilla.org/products/firefox/
-
--- AlanE <alane@freebsd.org>
+WWW: http://www.mozilla.org/products/firefox/
diff --git a/www/firefox36/files/patch-browser_app_mozilla.in b/www/firefox36/files/patch-browser_app_mozilla.in
index d576c95816b8..9ad04f41976b 100644
--- a/www/firefox36/files/patch-browser_app_mozilla.in
+++ b/www/firefox36/files/patch-browser_app_mozilla.in
@@ -13,7 +13,7 @@
  done #last arg
  
 -if [ `expr "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
-+if [ `expr -- "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
++if [ `expr X"${_optLast}" : 'X.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
  	# Last argument seems to be a local file/directory
  	# Check, if it is absolutely specified (ie. /home/foo/file vs. ./file)
  	# If it is just "relatively" (./file) specified, make it absolutely
diff --git a/www/firefox36/pkg-descr b/www/firefox36/pkg-descr
index b6576089aa3b..99b11c5e72e2 100644
--- a/www/firefox36/pkg-descr
+++ b/www/firefox36/pkg-descr
@@ -1,6 +1,12 @@
-Mozilla Firefox is the next-generation browser from the Mozilla project. See
-its home page for more details.
+Firefox is an award winning, free, open-source web browser for many platforms
+and is based on the Mozilla codebase. It is small, fast and easy to use, and
+offers many advanced features:
+ o Popup Blocking
+ o Tabbed Browsing
+ o Live Bookmarks (ie. RSS)
+ o Extensions
+ o Themes
+ o FastFind
+ o Improved Security
 
-WWW:  http://www.mozilla.org/products/firefox/
-
--- AlanE <alane@freebsd.org>
+WWW: http://www.mozilla.org/products/firefox/
diff --git a/www/flock/files/patch-browser_app_mozilla.in b/www/flock/files/patch-browser_app_mozilla.in
index d576c95816b8..9ad04f41976b 100644
--- a/www/flock/files/patch-browser_app_mozilla.in
+++ b/www/flock/files/patch-browser_app_mozilla.in
@@ -13,7 +13,7 @@
  done #last arg
  
 -if [ `expr "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
-+if [ `expr -- "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
++if [ `expr X"${_optLast}" : 'X.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
  	# Last argument seems to be a local file/directory
  	# Check, if it is absolutely specified (ie. /home/foo/file vs. ./file)
  	# If it is just "relatively" (./file) specified, make it absolutely
diff --git a/www/flock/pkg-descr b/www/flock/pkg-descr
index b6576089aa3b..99b11c5e72e2 100644
--- a/www/flock/pkg-descr
+++ b/www/flock/pkg-descr
@@ -1,6 +1,12 @@
-Mozilla Firefox is the next-generation browser from the Mozilla project. See
-its home page for more details.
+Firefox is an award winning, free, open-source web browser for many platforms
+and is based on the Mozilla codebase. It is small, fast and easy to use, and
+offers many advanced features:
+ o Popup Blocking
+ o Tabbed Browsing
+ o Live Bookmarks (ie. RSS)
+ o Extensions
+ o Themes
+ o FastFind
+ o Improved Security
 
-WWW:  http://www.mozilla.org/products/firefox/
-
--- AlanE <alane@freebsd.org>
+WWW: http://www.mozilla.org/products/firefox/