Re: [new] graphics/krita-gmic-plugin

Stefan Hagen wrote (2022-03-28 23:23 CEST):
> Stuart Henderson wrote (2022-03-28 22:02 CEST):
> > On 2022/03/28 21:57, Rafael Sadowski wrote:
> > > On Mon Mar 28, 2022 at 07:40:59PM +0200, Stefan Hagen wrote:
> > > > Stefan Hagen wrote (2022-03-26 15:32 CET):
> > > >
> > > > [... snip port discussion ...]
> > > >
> > > > > Is this Quirks entry correct? So users that have gmic-qt-krita installed
> > > > > in 7.0 would be moved to krita-gmic-plugin in 7.1?
> > > >
> > > > I imported krita-gmic-plugin already.
> > > >
> > > > I haven't added a quirk yet, so I'd like to get an OK for this one.
> > > > In my last diff, I didn't change PKGNAME. Is bump needed?
> > > >
> > > > Index: devel/quirks/Makefile
> > > > ===================================================================
> > > > RCS file: /home/cvs/ports/devel/quirks/Makefile,v
> > > > retrieving revision 1.1366
> > > > diff -u -p -u -p -r1.1366 Makefile
> > > > --- devel/quirks/Makefile 21 Mar 2022 12:46:22 -0000 1.1366
> > > > +++ devel/quirks/Makefile 28 Mar 2022 17:31:31 -0000
> > > > @@ -3,7 +3,7 @@ CATEGORIES = devel databases
> > > > DISTFILES =
> > > >
> > > > # API.rev
> > > > -PKGNAME = quirks-5.4
> > > > +PKGNAME = quirks-5.5
> > > > PKG_ARCH = *
> > > > MAINTAINER = Marc Espie <espie@openbsd.org>
> > > >
> > > > Index: devel/quirks/files/Quirks.pm
> > > > ===================================================================
> > > > RCS file: /home/cvs/ports/devel/quirks/files/Quirks.pm,v
> > > > retrieving revision 1.1380
> > > > diff -u -p -u -p -r1.1380 Quirks.pm
> > > > --- devel/quirks/files/Quirks.pm 21 Mar 2022 12:46:22 -0000 1.1380
> > > > +++ devel/quirks/files/Quirks.pm 26 Mar 2022 14:20:38 -0000
> > > > @@ -719,6 +719,7 @@ my $stem_extensions = {
> > > > 'py-tz' => 'py3-tz',
> > > > 'py-pretend' => 'py3-pretend',
> > > > 'py-mock' => 'py3-mock',
> > > > + 'gmic-qt-krita' => 'krita-gmic-plugin',
> > > > };
> > > >
> > > > my $obsolete_reason = {};
> > > >
> > >
> > > graphics/gmic-qt/krita should be deleted, right? You need this to make
> > > the update seamless:
> > >
> > > @conflict gmic-qt-krita-<=3.0.2
> > > @pkgpath graphics/gmic-qt/krita
> > >
> > > Rafael
> > >
> >
> > pkg_add still compares the version number with a "quirks rename",
> > so EPOCH will need to be set in krita-gmic-plugin
> >
>
> So this would be the full change then:
>
> * remove gmic-qt/krita
> * add conflict marker + pkgpath
> * add quirks entry
>
> Right?

@lines go into the plist, not the Makefile...

Index: graphics/gmic-qt/Makefile
===================================================================
RCS file: /home/cvs/ports/graphics/gmic-qt/Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile
--- graphics/gmic-qt/Makefile 2 Mar 2022 11:03:04 -0000 1.3
+++ graphics/gmic-qt/Makefile 28 Mar 2022 21:16:51 -0000
@@ -1,5 +1,4 @@
SUBDIR += gimp
- SUBDIR += krita
SUBDIR += none

.include <bsd.port.subdir.mk>
Index: graphics/gmic-qt/krita/Makefile
===================================================================
RCS file: graphics/gmic-qt/krita/Makefile
diff -N graphics/gmic-qt/krita/Makefile
--- graphics/gmic-qt/krita/Makefile 2 Mar 2022 11:03:04 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-COMMENT = gmic plugin for krita
-BROKEN = the krita devs forked for whatever reason
-
-RUN_DEPENDS = graphics/krita
-QT_HOST = krita
-
-.include <bsd.port.mk>
-
Index: graphics/gmic-qt/krita/pkg/PLIST
===================================================================
RCS file: graphics/gmic-qt/krita/pkg/PLIST
diff -N graphics/gmic-qt/krita/pkg/PLIST
--- graphics/gmic-qt/krita/pkg/PLIST 2 Mar 2022 11:03:04 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1 +0,0 @@
-@bin bin/gmic_krita_qt
Index: graphics/krita-gmic-plugin/pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/graphics/krita-gmic-plugin/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PLIST
--- graphics/krita-gmic-plugin/pkg/PLIST 26 Mar 2022 20:33:50 -0000 1.1.1.1
+++ graphics/krita-gmic-plugin/pkg/PLIST 28 Mar 2022 22:30:14 -0000
@@ -1 +1,3 @@
+@conflict gmic-qt-krita-<=3.0.2
+@pkgpath graphics/gmic-qt/krita
@so lib/kritaplugins/krita_gmic_qt.so
Index: devel/quirks/Makefile
===================================================================
RCS file: /home/cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.1366
diff -u -p -u -p -r1.1366 Makefile
--- devel/quirks/Makefile 21 Mar 2022 12:46:22 -0000 1.1366
+++ devel/quirks/Makefile 28 Mar 2022 17:31:31 -0000
@@ -3,7 +3,7 @@ CATEGORIES = devel databases
DISTFILES =

# API.rev
-PKGNAME = quirks-5.4
+PKGNAME = quirks-5.5
PKG_ARCH = *
MAINTAINER = Marc Espie <espie@openbsd.org>

Index: devel/quirks/files/Quirks.pm
===================================================================
RCS file: /home/cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.1380
diff -u -p -u -p -r1.1380 Quirks.pm
--- devel/quirks/files/Quirks.pm 21 Mar 2022 12:46:22 -0000 1.1380
+++ devel/quirks/files/Quirks.pm 26 Mar 2022 14:20:38 -0000
@@ -719,6 +719,7 @@ my $stem_extensions = {
'py-tz' => 'py3-tz',
'py-pretend' => 'py3-pretend',
'py-mock' => 'py3-mock',
+ 'gmic-qt-krita' => 'krita-gmic-plugin',
};

my $obsolete_reason = {};