Hi All,
during my efforts to delete KDE4 I noticed the following issue.
$ pkg_add prison
Ambiguous: choose package for prison
a 0: <None>
1: prison-1.0p4
2: prison-5.68.0
Both packages have no conflicts of content so I never noticed it.
Now I want to delete prison-1.0p4. But I don't think we have a mechanism
for that scenario, do we?
The following diff updates prison-5.68.0 to prison-kf5-5.68.0 and does
not update prison-1.0p4. So far so good. But how we delete prison-1.0p4
in the next step?
OK for the diff below?
Rafael
Index: devel/kf5/prison/Makefile
===================================================================
RCS file: /cvs/ports/devel/kf5/prison/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- devel/kf5/prison/Makefile 23 Mar 2020 18:01:11 -0000 1.10
+++ devel/kf5/prison/Makefile 10 Jun 2020 05:09:17 -0000
@@ -2,6 +2,7 @@
COMMENT = bar code generator
DISTNAME = prison-${VERSION}
+PKGNAME = prison-kf5-${VERSION}
SHARED_LIBS = KF5Prison 5.0
Index: devel/kf5/prison/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/kf5/prison/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST
--- devel/kf5/prison/pkg/PLIST 23 Mar 2020 18:01:12 -0000 1.6
+++ devel/kf5/prison/pkg/PLIST 10 Jun 2020 05:09:17 -0000
@@ -1,6 +1,7 @@
@comment $OpenBSD: PLIST,v 1.6 2020/03/23 18:01:12 rsadowski Exp $
@option no-default-conflict
-@conflict prison->=5
+@conflict prison-<5
+@pkgpath devel/kf5/prison
include/KF5/
include/KF5/prison/
include/KF5/prison/AbstractBarcode
Index: devel/quirks/Makefile
===================================================================
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.960
diff -u -p -r1.960 Makefile
--- devel/quirks/Makefile 9 Jun 2020 18:43:09 -0000 1.960
+++ devel/quirks/Makefile 10 Jun 2020 05:09:22 -0000
@@ -5,7 +5,7 @@ CATEGORIES = devel databases
DISTFILES =
# API.rev
-PKGNAME = quirks-3.351
+PKGNAME = quirks-3.352
PKG_ARCH = *
MAINTAINER = Marc Espie <es...@openbsd.org>
Index: devel/quirks/files/Quirks.pm
===================================================================
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.978
diff -u -p -r1.978 Quirks.pm
--- devel/quirks/files/Quirks.pm 9 Jun 2020 18:43:09 -0000 1.978
+++ devel/quirks/files/Quirks.pm 10 Jun 2020 05:09:22 -0000
@@ -428,6 +428,7 @@ my $stem_extensions = {
'py-pynetbox' => 'py3-pynetbox',
'py-libvirt' => 'py3-libvirt',
'py-libxml' => 'py3-libxml',
+ 'prison' => 'prison-kf5',
};
my $obsolete_reason = {
