nerge hotdoc into lang/python/3,-main, otherwise there's no upgrade path to

move 7.9-release users onto python 3.14 if they have it installed

lang/python/3/Makefile

@@ -4,7 +4,7 @@
 # Python itself.
 
 FULL_VERSION =		3.14.4
-REVISION-main =		0
+REVISION-main =		1
 SHARED_LIBS =		python3.14 0.0
 VERSION_SPEC =		>=3.14
 PORTROACH =		limit:^3\.14

lang/python/3/pkg/PLIST-main

@@ -2,15 +2,19 @@
 @option is-branch
 @conflict python->=3,<4
 @conflict python3-*
-@conflict glade-*
-@conflict py3-bsddb3-*
-@conflict py3-backports-zstd-*
 @pkgpath lang/python/3.8,-main
 @pkgpath lang/python/3.9,-main
 @pkgpath lang/python/3.10,-main
 @pkgpath lang/python/3.11,-main
 @pkgpath meta/python3
+@comment -- ports which were removed that, in the last release, depend on python
+@comment -- these need merging into python to avoid breaking updates
+@conflict glade-*
+@conflict hotdoc-*
+@conflict py3-bsddb3-*
+@conflict py2-backports-zstd-*
 @pkgpath devel/glade
+@pkgpath textproc/hotdoc
 @pkgpath databases/py-bsddb3
 @pkgpath archivers/py-backports-zstd
 bin/pydoc3