On Wed, Mar 23, 2022 at 12:44:51PM +0100, Stefan Hagen wrote:
> Hi,
>
> x11/gnome/cheese,-main and x11/gnome/cheese,-libs both contain the file
> ${PREFIX}/share/metainfo/org.gnome.Cheese.appdata.xml
>
> And cheese,-main depends on cheese,-libs. Which leads to:
>
> $ pkg_add cheese
> quirks-5.4 signed on 2022-03-22T23:10:22Z
> Collision in cheese-41.1: the following files already exist
> /usr/local/share/metainfo/org.gnome.Cheese.appdata.xml
> (libcheese-41.1 and cheese-41.1)
> Couldn't install cheese-41.1
>
> The diff below takes the file out of ,-libs
>
> OK?
Just remove the entry from PLIST-libs.
Also use REVISION-main and REVISION-libs please.
With this, ok aja.
>
> Best Regards,
> Stefan
>
> Index: x11/gnome/cheese/Makefile
> ===================================================================
> RCS file: /home/cvs/ports/x11/gnome/cheese/Makefile,v
> retrieving revision 1.36
> diff -u -p -u -p -r1.36 Makefile
> --- x11/gnome/cheese/Makefile 12 Mar 2022 09:32:57 -0000 1.36
> +++ x11/gnome/cheese/Makefile 23 Mar 2022 11:31:34 -0000
> @@ -6,6 +6,8 @@ COMMENT-libs= webcam display and captur
> GNOME_PROJECT= cheese
> GNOME_VERSION= 41.1
>
> +REVISION= 0
> +
> PKGNAME-libs= libcheese-${GNOME_VERSION}
>
> CATEGORIES= multimedia
> Index: x11/gnome/cheese/pkg/PLIST-libs
> ===================================================================
> RCS file: /home/cvs/ports/x11/gnome/cheese/pkg/PLIST-libs,v
> retrieving revision 1.1
> diff -u -p -u -p -r1.1 PLIST-libs
> --- x11/gnome/cheese/pkg/PLIST-libs 12 Mar 2022 09:32:57 -0000 1.1
> +++ x11/gnome/cheese/pkg/PLIST-libs 23 Mar 2022 11:33:22 -0000
> @@ -16,5 +16,5 @@ lib/pkgconfig/cheese-gtk.pc
> lib/pkgconfig/cheese.pc
> share/gir-1.0/Cheese-3.0.gir
> share/glib-2.0/schemas/org.gnome.Cheese.gschema.xml
> -share/metainfo/org.gnome.Cheese.appdata.xml
> +@comment share/metainfo/org.gnome.Cheese.appdata.xml # included in -main
> @tag glib-compile-schemas
>
--
Antoine
