ok.
On 2025/01/16 12:04, Rafael Sadowski wrote:
> On Thu Jan 16, 2025 at 10:11:09AM +0000, Stuart Henderson wrote:
> > On 2025/01/16 10:50, Rafael Sadowski wrote:
> > > Simple diff to migrate away kf5 prefixes in package names.
> >
> > suffix not prefix :)
>
> yes of course :)
>
> >
> > I am pretty sure that "quirks rename" still compares the version
> > number so you would need to add REVISION=0 for most of them and bump
> > kdepim-runtime to REVISION=2.
>
> Thanks of the hint!
>
> >
> > > +++ b/x11/kde-applications/kdepim-runtime/Makefile
> > > @@ -2,9 +2,7 @@ USE_WXNEEDED = Yes
> > >
> > > COMMENT = KDE PIM mail related libraries
> > > DISTNAME = kdepim-runtime-${VERSION}
> > > -PKGNAME = kdepim-runtime-kf5-${VERSION}
> > > CATEGORIES = devel
> > > -REVISION = 1
> > >
> > > SHARED_LIBS += akonadi-filestore 1.0 # 5.13.2
> > > SHARED_LIBS += akonadi-singlefileresource 2.0 # 5.13.2
> > > diff --git a/x11/kde-applications/kdepim-runtime/pkg/PLIST
> > > b/x11/kde-applications/kdepim-runtime/pkg/PLIST
> > > index a94cf0d8c41..4aa0edf2052 100644
> > > --- a/x11/kde-applications/kdepim-runtime/pkg/PLIST
> > > +++ b/x11/kde-applications/kdepim-runtime/pkg/PLIST
> > > @@ -1,3 +1,4 @@
> > > +@conflict kdepim-runtime-kf5-<=24.08.3
> >
> > I don't remember the rules for when REVISION is considered in the
> > version number check and when it isn't, so this might already work
> > but I'm not sure. Nevertheless you don't need to check the version
> > number anyway, so I would avoid the ambiguity and use -* instead of
> > -<=.
> >
>
> Thanks for the review, new diff below:
>
> diff --git a/devel/quirks/Makefile b/devel/quirks/Makefile
> index d9a93791a32..5eb4f5c901e 100644
> --- a/devel/quirks/Makefile
> +++ b/devel/quirks/Makefile
> @@ -3,7 +3,7 @@ CATEGORIES = devel databases
> DISTFILES =
>
> # API.rev
> -PKGNAME = quirks-7.81
> +PKGNAME = quirks-7.82
> PKG_ARCH = *
> MAINTAINER = Marc Espie <es...@openbsd.org>
>
> diff --git a/devel/quirks/files/Quirks.pm b/devel/quirks/files/Quirks.pm
> index d7743519b08..2c40cab856e 100644
> --- a/devel/quirks/files/Quirks.pm
> +++ b/devel/quirks/files/Quirks.pm
> @@ -604,6 +604,10 @@ my $stem_extensions = {
> 'kio-extras' => 'kf6-kio-extras',
> 'py-rcsparse' => 'py3-rcsparse',
> 'py3-jsonschema-spec' => 'py3-jsonschema-path',
> + 'kdepim-runtime-kf5' => 'kdepim-runtime',
> + 'kcron-kf5' => 'kcron',
> + 'dolphin-plugins-kf5' => 'dolphin-plugins',
> + 'audiocd-kio-kf5' => 'audiocd-kio',
> };
>
> my $obsolete_reason = {};
> diff --git a/x11/kde-applications/audiocd-kio/Makefile
> b/x11/kde-applications/audiocd-kio/Makefile
> index 09376f0d866..62cc49776c3 100644
> --- a/x11/kde-applications/audiocd-kio/Makefile
> +++ b/x11/kde-applications/audiocd-kio/Makefile
> @@ -1,7 +1,7 @@
> COMMENT = Kio slave for accessing audio CDs
> DISTNAME = audiocd-kio-${VERSION}
> -PKGNAME = audiocd-kio-kf5-${VERSION}
> CATEGORIES = devel audio
> +REVISION = 0
>
> SHARED_LIBS += audiocdplugins 3.0 # 5.0
>
> diff --git a/x11/kde-applications/audiocd-kio/pkg/PLIST
> b/x11/kde-applications/audiocd-kio/pkg/PLIST
> index d153dd123a7..79c01940c66 100644
> --- a/x11/kde-applications/audiocd-kio/pkg/PLIST
> +++ b/x11/kde-applications/audiocd-kio/pkg/PLIST
> @@ -1,3 +1,4 @@
> +@conflict audiocd-kio-kf5-*
> @conflict kdebase-<4
> include/audiocdplugins/
> include/audiocdplugins/audiocdencoder.h
> diff --git a/x11/kde-applications/dolphin-plugins/Makefile
> b/x11/kde-applications/dolphin-plugins/Makefile
> index 14b4089d5e3..673a7aeddb0 100644
> --- a/x11/kde-applications/dolphin-plugins/Makefile
> +++ b/x11/kde-applications/dolphin-plugins/Makefile
> @@ -1,7 +1,7 @@
> COMMENT = Dolphin plugins
> DISTNAME = dolphin-plugins-${VERSION}
> -PKGNAME = dolphin-plugins-kf5-${VERSION}
> CATEGORIES = x11
> +REVISION = 0
>
> WANTLIB += ${COMPILER_LIBCXX} GL KF6Bookmarks KF6ColorScheme KF6Completion
> WANTLIB += KF6ConfigCore KF6ConfigGui KF6ConfigWidgets KF6CoreAddons
> diff --git a/x11/kde-applications/dolphin-plugins/pkg/PLIST
> b/x11/kde-applications/dolphin-plugins/pkg/PLIST
> index a50b35af148..886ed9d9ec7 100644
> --- a/x11/kde-applications/dolphin-plugins/pkg/PLIST
> +++ b/x11/kde-applications/dolphin-plugins/pkg/PLIST
> @@ -1,3 +1,4 @@
> +@conflict dolphin-plugins-kf5-*
> lib/qt6/plugins/dolphin/vcs/
> @so lib/qt6/plugins/dolphin/vcs/fileviewbazaarplugin.so
> @so lib/qt6/plugins/dolphin/vcs/fileviewdropboxplugin.so
> diff --git a/x11/kde-applications/kcron/Makefile
> b/x11/kde-applications/kcron/Makefile
> index 9f87a3b1877..21889a212c6 100644
> --- a/x11/kde-applications/kcron/Makefile
> +++ b/x11/kde-applications/kcron/Makefile
> @@ -1,7 +1,7 @@
> COMMENT = KDE-based GUI for cron task scheduler
> DISTNAME = kcron-${VERSION}
> -PKGNAME = kcron-kf5-${VERSION}
> CATEGORIES = x11
> +REVISION = 0
>
> WANTLIB += ${COMPILER_LIBCXX} GL KF6AuthCore KF6ColorScheme KF6Completion
> WANTLIB += KF6ConfigCore KF6ConfigGui KF6ConfigWidgets KF6CoreAddons
> diff --git a/x11/kde-applications/kcron/pkg/PLIST
> b/x11/kde-applications/kcron/pkg/PLIST
> index 057206d8ea4..43e189ed305 100644
> --- a/x11/kde-applications/kcron/pkg/PLIST
> +++ b/x11/kde-applications/kcron/pkg/PLIST
> @@ -1,3 +1,4 @@
> +@conflict kcron-kf5-*
> lib/qt6/plugins/plasma/
> lib/qt6/plugins/plasma/kcms/
> lib/qt6/plugins/plasma/kcms/systemsettings_qwidgets/
> diff --git a/x11/kde-applications/kdepim-runtime/Makefile
> b/x11/kde-applications/kdepim-runtime/Makefile
> index 476d8c73a89..6b55bca8265 100644
> --- a/x11/kde-applications/kdepim-runtime/Makefile
> +++ b/x11/kde-applications/kdepim-runtime/Makefile
> @@ -2,9 +2,8 @@ USE_WXNEEDED = Yes
>
> COMMENT = KDE PIM mail related libraries
> DISTNAME = kdepim-runtime-${VERSION}
> -PKGNAME = kdepim-runtime-kf5-${VERSION}
> CATEGORIES = devel
> -REVISION = 1
> +REVISION = 2
>
> SHARED_LIBS += akonadi-filestore 1.0 # 5.13.2
> SHARED_LIBS += akonadi-singlefileresource 2.0 # 5.13.2
> diff --git a/x11/kde-applications/kdepim-runtime/pkg/PLIST
> b/x11/kde-applications/kdepim-runtime/pkg/PLIST
> index a94cf0d8c41..89cca8065a6 100644
> --- a/x11/kde-applications/kdepim-runtime/pkg/PLIST
> +++ b/x11/kde-applications/kdepim-runtime/pkg/PLIST
> @@ -1,3 +1,4 @@
> +@conflict kdepim-runtime-kf5-*
> @bin bin/akonadi_akonotes_resource
> @bin bin/akonadi_birthdays_resource
> @bin bin/akonadi_contacts_resource
