From owner-svn-src-head@FreeBSD.ORG Wed Jan 12 20:12:48 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 83FC6106564A; Wed, 12 Jan 2011 20:12:48 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from mail.icecube.wisc.edu (trout.icecube.wisc.edu [128.104.255.119]) by mx1.freebsd.org (Postfix) with ESMTP id 54F318FC13; Wed, 12 Jan 2011 20:12:48 +0000 (UTC) Received: from localhost (localhost.localdomain [127.0.0.1]) by mail.icecube.wisc.edu (Postfix) with ESMTP id A9ABE58134; Wed, 12 Jan 2011 14:12:47 -0600 (CST) X-Virus-Scanned: amavisd-new at icecube.wisc.edu Received: from mail.icecube.wisc.edu ([127.0.0.1]) by localhost (trout.icecube.wisc.edu [127.0.0.1]) (amavisd-new, port 10030) with ESMTP id jtAEFuarfZDN; Wed, 12 Jan 2011 14:12:47 -0600 (CST) Received: from wanderer.tachypleus.net (i3-dhcp-172-16-223-197.icecube.wisc.edu [172.16.223.197]) by mail.icecube.wisc.edu (Postfix) with ESMTP id 86E575811D; Wed, 12 Jan 2011 14:12:47 -0600 (CST) Message-ID: <4D2E0B3F.3010402@freebsd.org> Date: Wed, 12 Jan 2011 14:12:47 -0600 From: Nathan Whitehorn User-Agent: Mozilla/5.0 (X11; U; FreeBSD amd64; en-US; rv:1.9.2.13) Gecko/20101227 Thunderbird/3.1.7 MIME-Version: 1.0 To: John Baldwin References: <201101121455.p0CEt3PD092660@svn.freebsd.org> <201101121133.34607.jhb@freebsd.org> In-Reply-To: <201101121133.34607.jhb@freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r217309 - in head: . contrib/dialog contrib/dialog/po contrib/dialog/samples contrib/dialog/samples/copifuncs contrib/dialog/samples/install gnu/lib gnu/lib/libdialog gnu/lib/libdialog/... X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Jan 2011 20:12:48 -0000 On 01/12/11 10:33, John Baldwin wrote: > On Wednesday, January 12, 2011 9:55:03 am Nathan Whitehorn wrote: >> Author: nwhitehorn >> Date: Wed Jan 12 14:55:02 2011 >> New Revision: 217309 >> URL: http://svn.freebsd.org/changeset/base/217309 >> >> Log: >> Update dialog to version 20100428. This changes the license under which >> dialog is distributed from GPLv2 to LGPLv2 and introduces a number of new >> features and a new and better libdialog API. The existing libdialog will >> be kept temporarily as libodialog for compatibility purposes until sade, >> sysinstall and tzsetup have been either updated or replaced. >> >> __FreeBSD_version is now 900030. > > Hmm, did you import this to the vendor area first or did you just add it > directly to contrib? I did it wrong, and put it directly into contrib. I'm not sure what is the best way to fix it. Here are the possibilities that I came up with: - Fix it when there's an update - Import it into vendor now for historical purposes - Import it into vendor and synthesize mergeinfo on contrib/dialog. -Nathan