On Sun 20/09/2020 19:52, Remi Pointel wrote:
> Hi,
>
> these are the diff to update plaso and its dependencies.
>
> Ok?
Update for devel/py-dtfabric needs a @conflict- and @pkgpath-marker in
PLIST. Please remove py-dtfabric from devel/Makefile, and add a quirk.
Diff below should be applied on top of your diff.
diff --git devel/Makefile devel/Makefile
index 1f98b7d1586..6e460ebe3ce 100644
--- devel/Makefile
+++ devel/Makefile
@@ -1427,7 +1427,6 @@
SUBDIR += py-docopt
SUBDIR += py-docopt,python3
SUBDIR += py-doit
- SUBDIR += py-dtfabric
SUBDIR += py-dtfabric,python3
SUBDIR += py-dulwich,python3
SUBDIR += py-easyprocess
diff --git devel/py-dtfabric/pkg/PLIST devel/py-dtfabric/pkg/PLIST
index 84dbbdd3db3..c8c3bdf5e7a 100644
--- devel/py-dtfabric/pkg/PLIST
+++ devel/py-dtfabric/pkg/PLIST
@@ -1,4 +1,6 @@
@comment $OpenBSD: PLIST,v 1.3 2018/09/07 05:54:13 rpointel Exp $
+@conflict py-dtfabric-*
+@pkgpath devel/py-dtfabric
bin/validate-definitions${MODPY_BIN_SUFFIX}
lib/python${MODPY_VERSION}/site-packages/dtfabric/
lib/python${MODPY_VERSION}/site-packages/dtfabric-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
diff --git devel/quirks/Makefile devel/quirks/Makefile
index 371ce7d1297..2723661e3f2 100644
--- devel/quirks/Makefile
+++ devel/quirks/Makefile
@@ -5,7 +5,7 @@ CATEGORIES = devel databases
DISTFILES =
# API.rev
-PKGNAME = quirks-3.436
+PKGNAME = quirks-3.437
PKG_ARCH = *
MAINTAINER = Marc Espie <es...@openbsd.org>
diff --git devel/quirks/files/Quirks.pm devel/quirks/files/Quirks.pm
index aacf0b23643..8c345f70bdf 100644
--- devel/quirks/files/Quirks.pm
+++ devel/quirks/files/Quirks.pm
@@ -478,6 +478,7 @@ my $stem_extensions = {
'rgain' => 'rgain3',
'py-urwid' => 'py3-urwid',
'py-ply' => 'py3-ply',
+ 'py-dtfabric' => 'py3-dtfabric',
};
my $obsolete_reason = {
