From: Daniel Dickman <didickman@gmail.com>
Subject: x11/ede & python 2
To: ports@openbsd.org
Date: Sun, 29 Jun 2025 10:50:10 -0400

It looks like ede has very minimal use of Python 2. ede/desktop embeds an 
old copy of asciidoc that doesn't have support for Python 3.

I added a local patch to just disable using asciidoc to generate the 
manual so we can drop the BDEP on Python 2.

As for ede/lib -- it looks like the Changelog reports some support for 
Python 3 so I removed the dep on python 2 and it still seems to build.

Note that I don't use these ports at all, so would welcome any feedback 
from actual users.


Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/ede/desktop/Makefile,v
diff -u -p -u -r1.26 Makefile
--- Makefile	24 Apr 2023 11:41:29 -0000	1.26
+++ Makefile	29 Jun 2025 14:42:19 -0000
@@ -1,7 +1,7 @@
 COMMENT =		Equinox desktop environment
 
 DISTNAME =		ede-${V}
-REVISION =		13
+REVISION =		14
 
 WANTLIB += X11 Xau Xcursor Xdmcp Xext Xfixes Xft Xinerama Xpm c crypto
 WANTLIB += curl dbus-1 edelib edelib_dbus edelib_gui fltk fltk_images
@@ -11,7 +11,7 @@ WANTLIB += startup-notification-1 ${COMP
 COMPILER =		base-clang ports-gcc base-gcc
 
 MODULES =		lang/python
-MODPY_VERSION =	${MODPY_DEFAULT_VERSION_2}
+
 BUILD_DEPENDS =		devel/gettext,-tools \
 			devel/jam \
 			misc/shared-mime-info
Index: patches/patch-build_Doc_jam
===================================================================
RCS file: patches/patch-build_Doc_jam
diff -N patches/patch-build_Doc_jam
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-build_Doc_jam	29 Jun 2025 14:42:19 -0000
@@ -0,0 +1,15 @@
+Disable building with embedded copy of asciidoc which only
+supports Python 2.
+
+Index: build/Doc.jam
+--- build/Doc.jam.orig
++++ build/Doc.jam
+@@ -8,7 +8,7 @@
+ # GNU General Public License version 2 or newer.
+ # See COPYING for details.
+ 
+-ASCIIDOC  = "$(TOP)/doc/asciidoc/asciidoc.py" ;
++# ASCIIDOC  = "$(TOP)/doc/asciidoc/asciidoc.py" ;
+ DOCDIR    = "$(TOP)/doc" ;
+ MANUALDIR = "$(DOCDIR)/manual" ;
+ 
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/ede/desktop/pkg/PLIST,v
diff -u -p -u -r1.7 PLIST
--- pkg/PLIST	11 Mar 2022 20:15:27 -0000	1.7
+++ pkg/PLIST	29 Jun 2025 14:42:19 -0000
@@ -47,31 +47,18 @@ share/desktop-directories/ede-office.dir
 share/desktop-directories/ede-other.directory
 share/desktop-directories/ede-settings.directory
 share/desktop-directories/ede-system.directory
-share/doc/ede-${FULL_V}/
-share/doc/ede-${FULL_V}/manual/
-share/doc/ede-${FULL_V}/manual/README.html
-share/doc/ede-${FULL_V}/manual/dbus-usage.html
-share/doc/ede-${FULL_V}/manual/ede-calc.html
-share/doc/ede-${FULL_V}/manual/ede-dialog.html
-share/doc/ede-${FULL_V}/manual/ede-help.html
-share/doc/ede-${FULL_V}/manual/ede-notify-daemon.html
-share/doc/ede-${FULL_V}/manual/ede-tip.html
-share/doc/ede-${FULL_V}/manual/evoke.html
-share/doc/ede-${FULL_V}/manual/hacking.html
-share/doc/ede-${FULL_V}/manual/index.html
-share/doc/ede-${FULL_V}/manual/introduction.html
 share/ede/
 share/ede/panel-applets/
-share/ede/panel-applets/battery_monitor.so
-share/ede/panel-applets/clock.so
-share/ede/panel-applets/cpu_monitor.so
-share/ede/panel-applets/keyboard_layout.so
-share/ede/panel-applets/mem_monitor.so
-share/ede/panel-applets/pager.so
-share/ede/panel-applets/quick_launch.so
-share/ede/panel-applets/start_menu.so
-share/ede/panel-applets/system_tray.so
-share/ede/panel-applets/taskbar.so
+@so share/ede/panel-applets/battery_monitor.so
+@so share/ede/panel-applets/clock.so
+@so share/ede/panel-applets/cpu_monitor.so
+@so share/ede/panel-applets/keyboard_layout.so
+@so share/ede/panel-applets/mem_monitor.so
+@so share/ede/panel-applets/pager.so
+@so share/ede/panel-applets/quick_launch.so
+@so share/ede/panel-applets/start_menu.so
+@so share/ede/panel-applets/system_tray.so
+@so share/ede/panel-applets/taskbar.so
 share/ede/themes/
 share/ede/themes/splash-themes/
 share/ede/themes/splash-themes/scape/