From owner-cvs-ports@FreeBSD.ORG Tue Dec 28 17:32:46 2004 Return-Path: Delivered-To: cvs-ports@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7543916A4CE; Tue, 28 Dec 2004 17:32:46 +0000 (GMT) Received: from melon.pingpong.net (82.milagro.bahnhof.net [195.178.168.82]) by mx1.FreeBSD.org (Postfix) with ESMTP id C4A0F43D41; Tue, 28 Dec 2004 17:32:45 +0000 (GMT) (envelope-from girgen@FreeBSD.org) Received: from localhost (localhost.pingpong.net [127.0.0.1]) by melon.pingpong.net (Postfix) with ESMTP id A61014AC31; Tue, 28 Dec 2004 18:32:44 +0100 (CET) Received: from melon.pingpong.net ([127.0.0.1]) by localhost (melon.pingpong.net [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 37819-01-2; Tue, 28 Dec 2004 18:32:44 +0100 (CET) Received: from palle.girgensohn.se (1-2-8-5a.asp.sth.bostream.se [82.182.157.66]) by melon.pingpong.net (Postfix) with ESMTP id 453804AC2F; Tue, 28 Dec 2004 18:32:44 +0100 (CET) Date: Tue, 28 Dec 2004 18:32:44 +0100 From: girgen@FreeBSD.org To: Michael Johnson , ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org Message-ID: <535EAB1D90A2975AE0FEA412@palle.girgensohn.se> In-Reply-To: <200412280051.iBS0pwjr077269@repoman.freebsd.org> References: <200412280051.iBS0pwjr077269@repoman.freebsd.org> X-Mailer: Mulberry/3.1.6 (Linux/x86) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="==========6967CC8789A43B7508E9==========" X-Virus-Scanned: by amavisd-new at pingpong.net Subject: Re: cvs commit: ports/mail/thunderbird Makefilepatch-mail_app_mozilla.inmozconfig.in patch-browser_app_mozilla.in X-BeenThere: cvs-ports@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Dec 2004 17:32:46 -0000 --==========6967CC8789A43B7508E9========== Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Content-Disposition: inline Hi Michael, Somehow the point made by Jose M Rodriguez 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 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 --==========6967CC8789A43B7508E9========== Content-Type: text/plain; charset=iso-8859-1; name=d Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=d; size=1963 Index: www/firefox/files/patch-browser_app_mozilla.in =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D 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 =20 -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 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D 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 @@ =20 #???: 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 --==========6967CC8789A43B7508E9==========--