cvs commit: ports/mail/thunderbird Makefilepatch-mail_app_mozilla.inmozconfig.in patch-browser_app_mozilla.in

[girgen at FreeBSD.org]

Hi Michael,

Somehow the point made by Jose M Rodriguez <josemi at freebsd.jazztel.es> 
never reached the PR. expr on FreeBSD-4.10 is not POSIX compliant, and 
hence does not understand the  `--' construct:

5.3-machine$ expr -- -v : '.*:/.*'
0

4.10-machine$ expr -- -v : '.*:/.*'
expr: syntax error

So, the initial patch from ports/75262 must be used, i.e. prefixing with 
`X' instead of `--'. Sorry for the inconvenience. See attached patch.

/Palle

--On tisdag, december 28, 2004 00.51.58 +0000 Michael Johnson 
<ahze at FreeBSD.org> wrote:

> ahze        2004-12-28 00:51:58 UTC
>
>   FreeBSD ports repository
>
>   Modified files:
>     mail/thunderbird     Makefile
>     mail/thunderbird/files mozconfig.in patch-mail_app_mozilla.in
>     www/firefox          Makefile
>     www/firefox/files    mozconfig.in patch-browser_app_mozilla.in
>   Log:
>   - Remove WITH_NEW_ICON knob
>   - Mozilla license team has approved the FreeBSD Gnome team to
>     use official branding for firefox and thunderbird [1]
>     o Add  --enable-official-branding to mozconfig
>     o Install official thunderbird/firefox icon as default.xpm icon
>   - Fix error when running firefox/thunderbird -v [2]
>   - Bump PORTREVISION
>
>   References:
>           http://www.mozilla.org/foundation/licensing.html [1]
>
> http://people.freebsd.org/~ahze/firefox_thunderbird-approved.txt [1]
> PR:             ports/75262 [2]
>   Submitted by:   girgen [2]
>
>   Revision  Changes    Path
>   1.38      +4 -10     ports/mail/thunderbird/Makefile
>   1.9       +4 -1      ports/mail/thunderbird/files/mozconfig.in
>   1.2       +18 -2
> ports/mail/thunderbird/files/patch-mail_app_mozilla.in   1.112     +4 -7
> ports/www/firefox/Makefile
>   1.29      +4 -1      ports/www/firefox/files/mozconfig.in
>   1.4       +17 -3
> ports/www/firefox/files/patch-browser_app_mozilla.in



-------------- next part --------------
Index: www/firefox/files/patch-browser_app_mozilla.in
===================================================================
RCS file: /home/ncvs/ports/www/firefox/files/patch-browser_app_mozilla.in,v
retrieving revision 1.4
diff -u -r1.4 patch-browser_app_mozilla.in
--- www/firefox/files/patch-browser_app_mozilla.in	28 Dec 2004 00:51:58 -0000	1.4
+++ www/firefox/files/patch-browser_app_mozilla.in	28 Dec 2004 17:29:16 -0000
@@ -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
Index: mail/thunderbird/files/patch-mail_app_mozilla.in
===================================================================
RCS file: /home/ncvs/ports/mail/thunderbird/files/patch-mail_app_mozilla.in,v
retrieving revision 1.2
diff -u -r1.2 patch-mail_app_mozilla.in
--- mail/thunderbird/files/patch-mail_app_mozilla.in	28 Dec 2004 00:51:58 -0000	1.2
+++ mail/thunderbird/files/patch-mail_app_mozilla.in	28 Dec 2004 17:29:09 -0000
@@ -5,7 +5,7 @@
  
  #???: needs check if othersopt begin with -* ?
 -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