On 2020/10/08 11:42, Stuart Henderson wrote:
> On 2020/10/08 02:33, James Cook wrote:
> > I'm reporting a slight hiccup upgrading from 6.7 to snapshot. This might
> > count as my own fault, but reporting it in case it's something that's
> > supposed to run smoothly. (I was able to recover; no help needed.)
> >
> > I upgraded from 6.7 to a snapshot (with sysupgrade -s), then ran
> > "doas pkg_add -u", and got this:
> >
> >
> > Collision in python-3.8.6: the following files already exist
> > /usr/local/bin/2to3 from python-3.8.6
> > /usr/local/bin/pydoc3 from python-3.8.6
> > /usr/local/bin/python3 from python-3.8.6
> > /usr/local/bin/python3-config from python-3.8.6
> > /usr/local/lib/pkgconfig/python3.pc from python-3.8.6
> > It seems to be a missing package registration
>
> This is because,
>
> 1) The default Python version in ports was switched from 3.7 to 3.8,
> so the symlinks for the "default names" moved at that time
>
> 2) After this, Python 3.7 was updated in 6.7-stable
>
> The @conflict lines in the PLIST files for 3.8 in -current should have
> been updated after the -stable update, so pkg_add doesn't know that
> it needs to update 3.7.9 to the "6.8 version" (without the symlinks)
> before installing 3.8.
>
> We can't do anything for the main 6.8 release packages now, but it can
> be fixed in 6.8-stable once it's open. For those arches with -stable
> packages available, once those packages are built it shouldn't be
> noticeable to users.
>
> > After this, pkg_delete partial-python; pkg_add python3; pkg_add -u
> > completed the upgrade without trouble (though I haven't tested anything).
>
> Yes that should do the trick.
>
... needs testing but I think this is the diff
Index: 3.7/Makefile
===================================================================
RCS file: /cvs/ports/lang/python/3.7/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- 3.7/Makefile 24 Aug 2020 15:00:29 -0000 1.19
+++ 3.7/Makefile 8 Oct 2020 12:29:23 -0000
@@ -10,6 +10,9 @@ PATCHLEVEL = .9
SHARED_LIBS = python3.7m 0.0
VERSION_SPEC = >=3.7,<3.8
+REVISION-idle = 0
+REVISION-main = 0
+
CONFIGURE_ARGS += --with-ensurepip=no
CONFIGURE_ARGS += --enable-loadable-sqlite-extensions
Index: 3.8/Makefile
===================================================================
RCS file: /cvs/ports/lang/python/3.8/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- 3.8/Makefile 28 Sep 2020 11:36:03 -0000 1.8
+++ 3.8/Makefile 8 Oct 2020 12:29:23 -0000
@@ -10,6 +10,9 @@ PATCHLEVEL = .6
SHARED_LIBS = python3.8 0.0
VERSION_SPEC = >=3.8,<3.9
+REVISION-idle = 0
+REVISION-main = 0
+
CONFIGURE_ARGS += --with-ensurepip=no
CONFIGURE_ARGS += --enable-loadable-sqlite-extensions
Index: 3.8/pkg/PLIST-idle
===================================================================
RCS file: /cvs/ports/lang/python/3.8/pkg/PLIST-idle,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST-idle
--- 3.8/pkg/PLIST-idle 3 Jul 2020 21:10:55 -0000 1.4
+++ 3.8/pkg/PLIST-idle 8 Oct 2020 12:29:23 -0000
@@ -2,7 +2,7 @@
@option no-default-conflict
@option is-branch
@conflict python-idle-${VERSION_SPEC}
-@conflict python-idle->=3.7,<3.7.8p0
+@conflict python-idle->=3.7,<3.7.9p0
bin/idle3
bin/idle3.8
lib/python3.8/idlelib/
Index: 3.8/pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/lang/python/3.8/pkg/PLIST-main,v
retrieving revision 1.9
diff -u -p -r1.9 PLIST-main
--- 3.8/pkg/PLIST-main 28 Sep 2020 11:36:03 -0000 1.9
+++ 3.8/pkg/PLIST-main 8 Oct 2020 12:29:23 -0000
@@ -2,7 +2,7 @@
@option no-default-conflict
@option is-branch
@conflict python-${VERSION_SPEC}
-@conflict python->=3.7,<3.7.8p0
+@conflict python->=3.7,<3.7.9p0
bin/2to3
bin/2to3-3.8
bin/pydoc3
