Date: Tue, 5 Dec 2006 15:31:21 -0500 From: Wesley Shields <wxs@atarininja.org> To: Doug Barton <dougb@FreeBSD.org> Cc: ports@freebsd.org, Scot Hetzel <swhetzel@gmail.com> Subject: Re: distfile belongs to? Message-ID: <20061205203120.GA53894@atarininja.org> In-Reply-To: <20061205194146.GC52966@atarininja.org> References: <17771.24717.95357.989644@jerusalem.litteratus.org> <456B70E9.4030408@FreeBSD.org> <20061204213106.GA42084@atarininja.org> <45749998.3070308@FreeBSD.org> <20061204232125.GA42307@atarininja.org> <790a9fff0612050838s66c655fapfde80d4038f64ca2@mail.gmail.com> <20061205172803.GA51892@atarininja.org> <4575C568.70905@FreeBSD.org> <20061205194146.GC52966@atarininja.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Tue, Dec 05, 2006 at 02:41:46PM -0500, Wesley Shields wrote: > On Tue, Dec 05, 2006 at 11:15:52AM -0800, Doug Barton wrote: > > Wesley Shields wrote: > > > I was going to suggest wrapping the patch in an OSVERSION check for the > > > proper pkg_info update, however I think your approach is better. > > > > To me it seems odd that pkg_create has to know about every line in the > > tmp plist. (Having pkg_info know about it is nice too, but not > > necessary to make the mechanics of the change work.) Would it not be a > > better idea to update pkg_create so that it simply packages up what's > > there? Is there a benefit to pkg_create having special knowledge about > > the details like this? > > All I know is that "make package" would error out when it ran into the > @distfile line when I was working on this. This is why I had to make > the change to pkg_create. [...] > I'd like to finalize how it should look in +CONTENTS before I make this > change, but it will get done eventually. :) > > One way I was exploring is adding > > @comment DISTFILE:$filename:$size:$md5:$sha256 > > into the generated plist. This way we shouldn't have to change > pkg_create and only modify pkg_info and other tools. I haven't tested > this fully but it was just a fairly easy and concise way that I believe > will work. By adding it to +CONTENTS using some type of @comment line we > can avoid changing pkg_create and make for easier adoption. The only > changes that will need to be made will be to those programs which > process +CONTENTS directly, and even those modifications will be > minimal. Turns out I had some time free up today so I put together the patch to bsd.port.mk as described above. I've tested it out on a fairly recent -CURRENT box and a 6.1-p10 box and I'm able to build packages with out a problem. I see no need for an OSVERSION check when done this way. If you think this is a better idea I'll go ahead and send-pr, then make the necessary change to pkg_info and send-pr that. http://www.atarininja.org/~wxs/patches/package-distinfo.diff
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20061205203120.GA53894>