From owner-freebsd-current@FreeBSD.ORG Sat Jun 23 05:34:13 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 0B00616A46C for ; Sat, 23 Jun 2007 05:34:13 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from harmony.bsdimp.com (bsdimp.com [199.45.160.85]) by mx1.freebsd.org (Postfix) with ESMTP id BB1FD13C4AD for ; Sat, 23 Jun 2007 05:34:12 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from localhost (localhost [127.0.0.1]) by harmony.bsdimp.com (8.13.8/8.13.4) with ESMTP id l5N5Ve7e073846; Fri, 22 Jun 2007 23:31:41 -0600 (MDT) (envelope-from imp@bsdimp.com) Date: Fri, 22 Jun 2007 23:32:14 -0600 (MDT) Message-Id: <20070622.233214.58456427.imp@bsdimp.com> To: skreuzer@exit2shell.com From: "M. Warner Losh" In-Reply-To: <20070622210119.GA4186@clamps.exit2shell.com> References: <20070622210119.GA4186@clamps.exit2shell.com> X-Mailer: Mew version 5.2 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-2.0 (harmony.bsdimp.com [127.0.0.1]); Fri, 22 Jun 2007 23:31:41 -0600 (MDT) 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 05:34:13 -0000 In message: <20070622210119.GA4186@clamps.exit2shell.com> Steven Kreuzer writes: : 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. I've been using the OpenBSD diff in my products for quite some time now, and it works great for everything except mergemaster, which uses sdiff. If we have sdiff too, then we can merge that as well. Warner