Alistair Crooks wrote:
> On Fri, Jun 10, 2005 at 12:41:50PM -0400, Johnny C. Lam wrote:
>>
>>The files in pkgtools/pkg_install/files are supposed to mirror the files 
>>in src/usr.sbin/pkg_install.  According to the CVS log, the version 
>>number of pkg_install in the "src" module has in the past only bumped 
>>for changes which are user-visible, e.g., a new flag is added to 
>>pkg_info(1), fixing a bug in dewey comparisons, etc.
> 
> 
> That is only true since we moved to a hardcoded version number.  Prior
> to that, the version number was bumped on every commit to the
> repository.


Okay, I wasn't aware of this since this pre-dates the time when I first 
started working on the pkg_install tools, and I didn't see any mention 
of this in the CVS log for pkg_install/lib/version.h.  Again, I don't 
dispute that it makes sense to have different version numbers for 
different sources, but this isn't how we've used the pkg_install version 
number for the past four years.  I think part of the reluctance to 
bumping the version for every change to the sources has been due to the 
fact that the pkg_install sources are considered "live" at all times.


>>We can choose to change the rules for bumping the version number on 
>>pkg_install, but it should be clear to everyone that this is a change 
>>from our existing practice (for pkgtools/pkg_install).  This does make 
>>it more difficult to keep the pkg_install sources between the "src" and 
>>"pkgsrc" modules in sync with each other, especially if it's possible 
>>for the pkgsrc version to have a different version number than the one 
>>in src.  We could remove this difficulty by having the pkgsrc 
>>pkg_install be the "master" version of pkg_install and periodically 
>>pulling those sources into src, instead of the reverse (which is what we 
>>do right now).  It would then be possible for a pkg_install on NetBSD to 
>>have a newer version number with no differences whatsoever from an older 
>>version, but we can certainly live with that.
> 
> 
> The difference here is that it would appear to only be parts of the
> autoconf additions to the pkgsrc pkg_install that were modified. I still
> think that bumping the pkg_install version in src to mirror the pkgsrc
> version would be appropriate.


Yes, this would be fine, too.  The version of pkg_install in src can be 
considered the same as the one in pkgsrc "with some cleanup", so I think 
the two should have the same version number.  We can simply bump the 
version number in "src" to 20050607 and request a pullup to netbsd-3.


> Please note - I am not yet advocating making the pkgsrc version the
> master, although the duplicated sources, one autoconf-ed, one not, is
> definitely presenting us with problems.


I think given the recent history of pkg_install development, it would 
make the most sense for pkgsrc to completely absorb the pkg_install 
sources, and for src to either cvs import into src/usr.sbin/pkg_install 
directly or into src/dist and use reachover Makefiles.  pkg_install 
development has most definitely been driven by pkgsrc users, several of 
whom don't even use NetBSD or checkout the NetBSD src module.  We should 
seriously consider doing this after we branch for pkgsrc-2005Q2.

	Cheers,

	-- Johnny Lam <jlam@NetBSD.org>