Re: Package collisions

On 2022/10/06 17:54:37 +0200, Omar Polo <op@omarpolo.com> wrote:
> On 2022/10/06 14:58:42 +0100, Stuart Henderson <stu@spacehopper.org> wrote:
> > On 2022/10/06 15:34, Omar Polo wrote:
> > > On 2022/10/05 22:47:27 +0100, Stuart Henderson <stu@spacehopper.org> wrote:
> > > > I would rename bin/widget in p5-Tk-demo, I don't think that will cause any
> > > > issue.
> > > >
> > > > Disappointing that lrzip added a conflict with a long-standing Unix
> > > > utility. Undecided between renaming that to bin/lrzip and adding an @conflict.
> > >
> > > lrzip installs both lrzip(1) and lrz(1), which are different
> > > executables... :/
> >
> > Reckon an @conflict is simplest then :)
>
> forgot to attach the diff...

i've still have this locally; will commit in a few days if nobody
objects. we can drop the conflict if/when lrzip stop installing lrz.

> Index: archivers/lrzip/Makefile
> ===================================================================
> RCS file: /home/cvs/ports/archivers/lrzip/Makefile,v
> retrieving revision 1.2
> diff -u -p -r1.2 Makefile
> --- archivers/lrzip/Makefile 4 Jul 2022 12:17:55 -0000 1.2
> +++ archivers/lrzip/Makefile 6 Oct 2022 13:23:50 -0000
> @@ -3,6 +3,7 @@ COMMENT = compression utility for large
> GH_ACCOUNT = ckolivas
> GH_PROJECT = lrzip
> GH_TAGNAME = v0.651
> +REVISION = 0
>
> CATEGORIES = archivers
>
> Index: archivers/lrzip/pkg/PLIST
> ===================================================================
> RCS file: /home/cvs/ports/archivers/lrzip/pkg/PLIST,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 PLIST
> --- archivers/lrzip/pkg/PLIST 21 Jun 2022 07:11:50 -0000 1.1.1.1
> +++ archivers/lrzip/pkg/PLIST 6 Oct 2022 13:27:53 -0000
> @@ -1,3 +1,4 @@
> +@conflict lrzsz-*
> bin/lrunzip
> bin/lrz
> bin/lrzcat
> Index: comms/lrzsz/Makefile
> ===================================================================
> RCS file: /home/cvs/ports/comms/lrzsz/Makefile,v
> retrieving revision 1.30
> diff -u -p -r1.30 Makefile
> --- comms/lrzsz/Makefile 11 Mar 2022 18:26:28 -0000 1.30
> +++ comms/lrzsz/Makefile 6 Oct 2022 13:29:10 -0000
> @@ -1,7 +1,7 @@
> COMMENT= receive/send files via X/Y/ZMODEM protocol
>
> DISTNAME= lrzsz-0.12.20
> -REVISION= 2
> +REVISION= 3
> CATEGORIES= comms
>
> HOMEPAGE= https://www.ohse.de/uwe/software/lrzsz.html
> Index: comms/lrzsz/pkg/PLIST
> ===================================================================
> RCS file: /home/cvs/ports/comms/lrzsz/pkg/PLIST,v
> retrieving revision 1.6
> diff -u -p -r1.6 PLIST
> --- comms/lrzsz/pkg/PLIST 11 Mar 2022 18:26:28 -0000 1.6
> +++ comms/lrzsz/pkg/PLIST 6 Oct 2022 13:29:05 -0000
> @@ -1,3 +1,4 @@
> +@conflict lrzip-*
> @bin bin/lrb
> @bin bin/lrx
> @bin bin/lrz