From owner-cvs-ports@FreeBSD.ORG Thu Feb 12 02:26: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 6619416A4CE; Thu, 12 Feb 2004 02:26:46 -0800 (PST) Received: from obsecurity.dyndns.org (adsl-64-169-106-71.dsl.lsan03.pacbell.net [64.169.106.71]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2E0C043D1D; Thu, 12 Feb 2004 02:26:46 -0800 (PST) (envelope-from kris@obsecurity.org) Received: by obsecurity.dyndns.org (Postfix, from userid 1000) id 35B9866C67; Thu, 12 Feb 2004 02:26:45 -0800 (PST) Date: Thu, 12 Feb 2004 02:26:43 -0800 From: Kris Kennaway To: Dag-Erling Sm?rgrav Message-ID: <20040212102643.GA63287@xor.obsecurity.org> References: <200402110716.i1B7GH9D017803@repoman.freebsd.org> <1076508074.88428.14.camel@pav.hide.vol.cz> <20040211122704.X93022@blues.jpj.net> <20040211165940.Q98525@blues.jpj.net> <20040212031228.E31447@blues.jpj.net> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="Dxnq1zWXvFF0Q93v" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.4.1i cc: cvs-all@FreeBSD.org cc: ports-committers@FreeBSD.org cc: Pav Lucistnik cc: Joe Marcus Clarke cc: cvs-ports@FreeBSD.org cc: Trevor Johnson Subject: Re: cvs commit: ports/www/firefox Makefile distinfo pkg-descr pkg-message pkg-plist ports/www/firefox/files firebird.rb firefox.rb mkdistfile mozconfig.in patch-Double.cpp patch-build_unix_run-mozilla 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: Thu, 12 Feb 2004 10:26:46 -0000 --Dxnq1zWXvFF0Q93v Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Feb 12, 2004 at 11:16:58AM +0100, Dag-Erling Sm?rgrav wrote: > Trevor Johnson writes: > > > The "added dependency" argument is specious as it is only true for > > > RELENG_4_6 and earlier. > > grep OSVERSION /usr/ports/Mk/bsd.port.mk >=20 > what exactly are you trying to prove? >=20 > .if defined(USE_REINPLACE) > REINPLACE_ARGS?=3D -i.bak > .if ${OSVERSION} < 460101 || ( ${OSVERSION} >=3D 500000 && ${OSVERSION} <= 500036 ) > PATCH_DEPENDS+=3D ${LOCALBASE}/bin/sed_inplace:${PORTSDIR}/textproc/sed_i= nplace > REINPLACE_CMD?=3D ${LOCALBASE}/bin/sed_inplace ${REINPLACE_ARGS} > .else > REINPLACE_CMD?=3D ${SED} ${REINPLACE_ARGS} > .endif >=20 > BTW, I don't see why REINPLACE_CMD couldn't simply be ${PERL} -p > ${REINPLACE_ARGS} on systems that don't have sed -i, since both 4.x > and 5.x prior to 500036 have Perl in the base system. AFAIK we used to do this, but perl and sed regexps are not always interchangeable, and it was a real pain to keep fixing them so they were. Kris --Dxnq1zWXvFF0Q93v Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.4 (FreeBSD) iD8DBQFAK1TiWry0BWjoQKURAvtoAJ0fr9qGXkid2ph5jQ7XbsaWoyjLPACfSgG8 YTWFbnVt77PJv58VuztSU+M= =jMh4 -----END PGP SIGNATURE----- --Dxnq1zWXvFF0Q93v--