On 2023/12/21 11:01, Stuart Henderson wrote:
> On 2023/12/20 17:59, Daniel Dickman wrote:
> > CVSROOT: /cvs
> > Module name: ports
> > Changes by: dan...@cvs.openbsd.org 2023/12/20 17:59:11
> >
> > Modified files:
> > sysutils/py-analyzemft: Makefile distinfo
> > sysutils/py-analyzemft/pkg: PLIST
> >
> > Log message:
> > update analyzeMFT to v3.0.1
> >
> > While there hasn't been a proper release in some time, the latest github
> > commits did the work to update the codebase to support Python 3.
> >
> > ok rpointel@ (MAINTAINER)
> >
>
> needs conflicts, etc for py-analyzemft -> py3-analyzemft. ok?
>
> Index: sysutils/Makefile
> ===================================================================
> RCS file: /cvs/ports/sysutils/Makefile,v
> retrieving revision 1.712
> diff -u -p -r1.712 Makefile
> --- sysutils/Makefile 2 Dec 2023 09:12:37 -0000 1.712
> +++ sysutils/Makefile 21 Dec 2023 10:59:59 -0000
> @@ -293,7 +293,7 @@
> SUBDIR += pstree
> SUBDIR += puppetserver
> SUBDIR += pv
> - SUBDIR += py-analyzemft
> + SUBDIR += py-analyzemft.python3
fixed locally, should be , - landry's eyes are working better than mine :)
> SUBDIR += py-ansible-compat,python3
> SUBDIR += py-apscheduler,python3
> SUBDIR += py-augeas,python3
> Index: devel/quirks/Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/quirks/Makefile,v
> retrieving revision 1.1586
> diff -u -p -r1.1586 Makefile
> --- devel/quirks/Makefile 17 Dec 2023 04:04:31 -0000 1.1586
> +++ devel/quirks/Makefile 21 Dec 2023 10:59:59 -0000
> @@ -3,7 +3,7 @@ CATEGORIES = devel databases
> DISTFILES =
>
> # API.rev
> -PKGNAME = quirks-6.202
> +PKGNAME = quirks-6.203
> 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.1597
> diff -u -p -r1.1597 Quirks.pm
> --- devel/quirks/files/Quirks.pm 17 Dec 2023 04:04:31 -0000 1.1597
> +++ devel/quirks/files/Quirks.pm 21 Dec 2023 10:59:59 -0000
> @@ -806,6 +806,7 @@ my $stem_extensions = {
> 'py-six' => 'py3-six',
> 'py-binaryornot' => 'py3-binaryornot',
> 'py-cython' => 'py3-cython',
> + 'py-analyzemft' => 'py3-analyzemft',
> };
>
> my $obsolete_reason = {};
> Index: sysutils/py-analyzemft/Makefile
> ===================================================================
> RCS file: /cvs/ports/sysutils/py-analyzemft/Makefile,v
> retrieving revision 1.5
> diff -u -p -r1.5 Makefile
> --- sysutils/py-analyzemft/Makefile 21 Dec 2023 00:59:11 -0000 1.5
> +++ sysutils/py-analyzemft/Makefile 21 Dec 2023 10:59:59 -0000
> @@ -20,4 +20,7 @@ MODULES = lang/python
>
> NO_TEST = Yes
>
> +FLAVOR = python3
> +FLAVORS = python3
> +
> .include <bsd.port.mk>
> Index: sysutils/py-analyzemft/pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/sysutils/py-analyzemft/pkg/PLIST,v
> retrieving revision 1.3
> diff -u -p -r1.3 PLIST
> --- sysutils/py-analyzemft/pkg/PLIST 21 Dec 2023 00:59:11 -0000 1.3
> +++ sysutils/py-analyzemft/pkg/PLIST 21 Dec 2023 10:59:59 -0000
> @@ -1,3 +1,5 @@
> +@conflict py-analyzemft-*
> +@pkgpath sysutils/py-analyzemft
> bin/analyzeMFT.py
>
> lib/python${MODPY_VERSION}/site-packages/analyzeMFT-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
> lib/python${MODPY_VERSION}/site-packages/analyzemft/
