From owner-freebsd-current@FreeBSD.ORG  Thu Mar 12 23:18:24 2009
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: freebsd-current@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8147D10656E6
	for <freebsd-current@FreeBSD.org>; Thu, 12 Mar 2009 23:18:24 +0000 (UTC)
	(envelope-from thompsa@FreeBSD.org)
Received: from pele.citylink.co.nz (pele.citylink.co.nz [202.8.44.226])
	by mx1.freebsd.org (Postfix) with ESMTP id 3795C8FC0C
	for <freebsd-current@FreeBSD.org>; Thu, 12 Mar 2009 23:18:24 +0000 (UTC)
	(envelope-from thompsa@FreeBSD.org)
Received: from localhost (localhost [127.0.0.1])
	by pele.citylink.co.nz (Postfix) with ESMTP id 06342FFAC;
	Fri, 13 Mar 2009 12:18:23 +1300 (NZDT)
X-Virus-Scanned: Debian amavisd-new at citylink.co.nz
Received: from pele.citylink.co.nz ([127.0.0.1])
	by localhost (pele.citylink.co.nz [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id SG2RccOo4zQF; Fri, 13 Mar 2009 12:18:15 +1300 (NZDT)
Received: from citylink.fud.org.nz (unknown [202.8.44.45])
	by pele.citylink.co.nz (Postfix) with ESMTP;
	Fri, 13 Mar 2009 12:18:15 +1300 (NZDT)
Received: by citylink.fud.org.nz (Postfix, from userid 1001)
	id ED6941142F; Fri, 13 Mar 2009 12:18:14 +1300 (NZDT)
Date: Thu, 12 Mar 2009 16:18:14 -0700
From: Andrew Thompson <thompsa@FreeBSD.org>
To: Boris Samorodov <bsam@ipt.ru>
Message-ID: <20090312231814.GA79022@citylink.fud.org.nz>
References: <11273764@bb.ipt.ru> <20090312133915.548350e4@gluon>
	<68384190@bb.ipt.ru> <20090312143911.653c3f72@gluon>
	<02302840@bb.ipt.ru>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <02302840@bb.ipt.ru>
User-Agent: Mutt/1.5.17 (2007-11-01)
Cc: Bruce Cran <bruce@cran.org.uk>, freebsd-current@FreeBSD.org,
	pav@FreeBSD.org
Subject: Re: libusb and fast current changes
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>, 
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 12 Mar 2009 23:18:25 -0000

On Thu, Mar 12, 2009 at 05:51:51PM +0300, Boris Samorodov wrote:
> On Thu, 12 Mar 2009 14:39:11 +0000 Bruce Cran wrote:
> > On Thu, 12 Mar 2009 17:29:21 +0300
> > Boris Samorodov <bsam@ipt.ru> wrote:
> > > On Thu, 12 Mar 2009 13:39:15 +0000 Bruce Cran wrote:
> > > 
> > > > Lots of changes were made a couple of days ago to the
> > > > installation of libusb[20]: libusb20 is now installed as libusb, and
> > > > libusb20_compat01.h was renamed to usb.h to be compatible with
> > > > libusb-0.1.  So for example any patches which change <usb.h> to
> > > > <libusb20_compat01.h> can be removed.
> > > 
> > > Wow! Bruce, that was a nice shot. You definitely undertand what's
> > > going on here. Thanks!
> > > 
> > > Pav, can you test the attached patch? It work for the latest
> > > i386/amd64 CURRENT for me.
> 
> > You may find you're repeating work that's already been done:
> > http://www.freebsd.org/cgi/cvsweb.cgi/ports/graphics/libgphoto2/ shows
> > libgphoto2 was updated a few days ago to fix the build problems
> > introduced with the renaming. 
> 
> It's the last version that doesn't work here. Please, take a look at
> the patch at my previous email and you'll understand that I
> implemented just what you said: "any patches which change <usb.h> to
> <libusb20_compat01.h> can be removed". ;-)
> 
> I think that an extra-patch for OSVERSION>800069 was introduced by an
> accident.

Yes, it should be removed.

Andrew