From owner-freebsd-current@FreeBSD.ORG Sat Jun 23 20:31:58 2007 Return-Path: X-Original-To: freebsd-current@FreeBSD.org Delivered-To: freebsd-current@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BF1DC16A400 for ; Sat, 23 Jun 2007 20:31:58 +0000 (UTC) (envelope-from skreuzer@exit2shell.com) Received: from mail.exit2shell.com (clamps.exit2shell.com [38.99.2.93]) by mx1.freebsd.org (Postfix) with ESMTP id AE93713C484 for ; Sat, 23 Jun 2007 20:31:58 +0000 (UTC) (envelope-from skreuzer@exit2shell.com) Received: from clamps.exit2shell.com (localhost [127.0.0.1]) by mail.exit2shell.com (8.13.5.20060614/8.13.3) with ESMTP id l5NKVkVj016316; Sat, 23 Jun 2007 13:31:47 -0700 (PDT) Received: (from skreuzer@localhost) by clamps.exit2shell.com (8.13.5.20060614/8.13.3) id l5NKVk07011005; Sat, 23 Jun 2007 13:31:46 -0700 (PDT) Date: Sat, 23 Jun 2007 13:31:46 -0700 From: Steven Kreuzer To: Gabor Kovesdan Message-ID: <20070623203146.GA16913@clamps.exit2shell.com> References: <20070622210119.GA4186@clamps.exit2shell.com> <467C45C7.6020401@FreeBSD.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <467C45C7.6020401@FreeBSD.org> User-Agent: Mutt/1.4.2.2i Cc: freebsd-current@FreeBSD.org Subject: Re: Port of OpenBSD's sdiff 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: Sat, 23 Jun 2007 20:31:58 -0000 On Fri, Jun 22, 2007 at 11:57:27PM +0200, Gabor Kovesdan wrote: > Steven Kreuzer escribi?: > >Greetings- > > > >OpenBSD includes a version of sdiff released to the public domain. > >In a quest to remove as much GPL code from FreeBSD as possible, I > >ported it over. > > > >If you want to try it out, You can download the source at > >http://www.exit2shell.com/~skreuzer/code/sdiff.tar.gz > > > >I had a few people who are part of the NYC BSD Users Group beta > >test it for me and so far no one has encountered any problems so > >I thought I would pass it along to see if it would be considered > >as a replacement for the GNU version. > > > >The contents of the tarball is a shar archive which extracts the > >code in usr/src/usr.bin/sdiff and a patch the adds adds "sdiff" > >to SUBDIR in the Makefile in usr.bin and removes "sdiff" from the > >Makefile in gnu/usr.bin > > > >Questions, comments and criticisms are all welcome. > > > > > Hello Steven, > > these are very good news! You might also want to take a look at > textproc/bsddiff, textproc/bsdgrep and textproc/bsdsort. These are the > BSD-licensed text processing tools from OpenBSD, as well, but I haven't > looked at sdiff, yet, thus I can only tell about the former 3 ones. If > we change to those, we should make sure, that they are compatible with > the GNU versions as much as they can be. Thus we might need a bit of > feature completion there. For example, we should check if the long > command line options are available there, too. For diff, grep and sort, > there are some of those, but they are undocumented in the manual page, > so we have to complete the manpages, too. Now I'm busy with SoC and > other high priority tasks, but if I have some time, I'll take a look as > I'm also interested in getting these completed. I am pretty sure it is compatiable with the GNU version of sdiff, but I will take a closer look to make sure. One thing worth noting, which was brought up on the NYCBUG mailing list is that --help is missing Ray Lai, who is the original author of this, responded with: "I don't really like the GNU-style --help/--version stuff. I'd rather improve the man pages instead of trying to keep two different manuals." I think he makes a pretty good point, but if you guys think this should be available, I could hack it in. Also, I am going to run some tests to make sure that there is no regression with mergemaster -- Steven Kreuzer http://www.exit2shell.com/~skreuzer