From owner-freebsd-current@FreeBSD.ORG Wed Aug 11 00:34:22 2010 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A4492106564A; Wed, 11 Aug 2010 00:34:22 +0000 (UTC) (envelope-from jhellenthal@gmail.com) Received: from mail-qy0-f175.google.com (mail-qy0-f175.google.com [209.85.216.175]) by mx1.freebsd.org (Postfix) with ESMTP id 1CB718FC15; Wed, 11 Aug 2010 00:34:21 +0000 (UTC) Received: by qyk11 with SMTP id 11so4151450qyk.13 for ; Tue, 10 Aug 2010 17:34:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:message-id:date:from :user-agent:mime-version:to:cc:subject:references:in-reply-to :x-enigmail-version:openpgp:content-type:content-transfer-encoding; bh=eBXmlStKKEm2DqS9h6sbSf0vkbClFMLhvy5b8vyg86M=; b=STzVO95XSXeIKA/mhMrtF8K0578cZr1h9hXVL6CSEJMpUz4d21e7QQR8Djv/Bkb5L7 EJWqSA45i7eIJlMV8ddhPTo+hXMhaDUErM6+Ju5aFgxc4TJGwDFlJpygmaN8zSO3AD7O iqpuf4HEFK24nz4EF0d9Ehz079srKPboiyoPA= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:x-enigmail-version:openpgp:content-type :content-transfer-encoding; b=vKgRIBIJ9PsnO9OSCOnDtRyUdRDyOkMKYgX4rrg4/2w+dQe/r9Pw5DuYYbGQEQh3eX fojEDX6H0hwqNYrfXfVaeHJtQFTZlbdER8WluIptf3/TMgVk4x60ljd5iJOgXwyLtQys yWidwHnT2f50JGoF68dwDtEVbg4lSRNH96yG4= Received: by 10.220.127.65 with SMTP id f1mr10908464vcs.94.1281486861039; Tue, 10 Aug 2010 17:34:21 -0700 (PDT) Received: from centel.dataix.local (adsl-99-19-46-227.dsl.klmzmi.sbcglobal.net [99.19.46.227]) by mx.google.com with ESMTPS id m30sm3180970vbr.19.2010.08.10.17.34.19 (version=SSLv3 cipher=RC4-MD5); Tue, 10 Aug 2010 17:34:20 -0700 (PDT) Sender: "J. Hellenthal" Message-ID: <4C61F00A.6050408@dataix.net> Date: Tue, 10 Aug 2010 20:34:18 -0400 From: jhell User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.9.2.8) Gecko/20100806 Lightning/1.0b1 Thunderbird MIME-Version: 1.0 To: Anonymous References: <4C61C50E.8040900__28807.0786548362$1281476071$gmane$org@dataix.net> <86hbj2qc0n.fsf@gmail.com> In-Reply-To: <86hbj2qc0n.fsf@gmail.com> X-Enigmail-Version: 1.1.2 OpenPGP: id=89D8547E Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: Doug Barton , FreeBSD Stable , FreeBSD Current Subject: Re: [CFT] [sys/conf/newvers.sh] Cleanup and additions. X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Aug 2010 00:34:22 -0000 On 08/10/2010 19:32, Anonymous wrote: > jhell writes: > >> * Adjust the paths that are checked for binaries to be of only >> /usr/local/bin and /usr/bin. "/bin" is highly unlikely to hold svn(1), >> git(1) or hg(1). > > Please, look at conf/146828. That script shouldn't blindly assume where > user installs his packages[1]. > > [1] using non-default LOCALBASE is a convenient way to identify > non-conforming ports > And that would be to identify non-conforming ports using non-standard locations. Though the option is available to look in a non-standard location for binaries, IMHO it does not belong here and I don't find that right for building world. I also find this method a little hard to adjust for targeting specific locations, for example if the base system finally had a svnversion(1) installed and we prefered that over use of a local installed port. Currently I can just subtract that path from any one of the given SCM's configured to work with this patch without effecting the others. I have had another idea along the likes of this but just throwing an entry point hook in that checks for the existence of a user built or supplied file if you will so newvers.sh can keep doing what it has been doing for all these years without the interruption for small changes like the ones were talking about now. If people are interested in something like this I would be more than happy to oblige and provide a patch to do just that. >> + gitsvnid="`$git log |fgrep 'git-svn-id:' |head -1 |\ >> + sed -n 's/^.*@\([0-9][0-9]*\).*$/\1/p'`" > > The above line can be sed-only. A few parts can be simplified, too. > I agree with this. I had just copied it over from what was already existing and excepted by the original committee and whoever reviewed it. I will adjust the patch for the sed(1) portion of this but I would prefer to wait for further comments from the lists before adjusting the search paths to use a function and look in a non-standard place. I also meant to CC dougb@ on this as I believe he had something to do with the original commits of the git(1) portions and possibly other parts. Thank you for following up with me on this. Regards, -- jhell,v