Re: libarchive update

[Thomas Klausner <wiz%NetBSD.org@localhost>]

On Fri, Jan 12, 2024 at 01:38:23PM +0100, Adam Ciarciński wrote:
> What is the proper way to update archivers/libarchive? `cvs import files` with extracted 3.7.2 release and then `cvs add` for the rest?

I think it works like an 'cvs import' in the base system, so basically:

tar xzf libarchive-3.7.2.tar.gz
cd libarchive-3.7.2
# import original sources
cvs import pkgsrc/archivers/libarchive/files KIENTZLE libarchive-3-7-2
# merge changes
cvs checkout -jlibarchive-3-4-0 -jlibarchive-3-7-2 pkgsrc/archivers/libarchive/files
cd pkgsrc/archivers/libarchive/files
# fix all merge conflicts, looking for '<<<<', '===', '>>>>>'
# make sure it builds
cvs commit

You can prepare the -j step by doing
cd pkgsrc/archivers/libarchive/files
cvs di -r libarchive-3-7-2 > ~/local-changes
tar xzf libarchive-3.7.2.tar.gz
cd libarchive-3.7.2
patch < ~/local-changes

then you'll see how much of the local changes will apply cleanly.

This is close to what CVS will be doing.
 Thomas