openbsd/ports
1
0
Fork 0
mirror of https://github.com/openbsd/ports.git synced 2026-06-17 23:13:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

use external asciidoc instead of the embedded copy

Browse Source 
Switch to the ports asciidoc and stop using the bundled copy. This removes
the Python 2 dependency required by the old embedded asciidoc.

My proposal on ports@ from June suggested disabling the manual entirely, but
we can keep it for now. If this change blocks future asciidoc updates, we
can revisit and disable generation of the manual.
This commit is contained in:
daniel
2025-10-26 22:11:42 +00:00
parent 7d9506fb1a
commit 683ce6d95e
3 changed files with 34 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
x11/ede/desktop/Makefile
+9 -7
View File
@@ -1,7 +1,7 @@
COMMENT = Equinox desktop environment COMMENT = Equinox desktop environment
DISTNAME = ede-${V} DISTNAME = ede-${V}
REVISION = 14 REVISION = 15
WANTLIB += X11 Xau Xcursor Xdmcp Xext Xfixes Xft Xinerama Xpm c crypto WANTLIB += X11 Xau Xcursor Xdmcp Xext Xfixes Xft Xinerama Xpm c crypto
WANTLIB += curl dbus-1 edelib edelib_dbus edelib_gui fltk fltk_images WANTLIB += curl dbus-1 edelib edelib_dbus edelib_gui fltk fltk_images
@@ -12,15 +12,18 @@ WANTLIB += Xrender
COMPILER = base-clang ports-gcc base-gcc COMPILER = base-clang ports-gcc base-gcc
MODULES = lang/python MODULES = lang/python
MODPY_VERSION = ${MODPY_DEFAULT_VERSION_2}
BUILD_DEPENDS = devel/gettext,-tools \ BUILD_DEPENDS = devel/gettext,-tools \
devel/jam \ devel/jam \
misc/shared-mime-info misc/shared-mime-info \
textproc/asciidoc
LIB_DEPENDS = devel/startup-notification \ LIB_DEPENDS = devel/startup-notification \
graphics/jpeg \ graphics/jpeg \
graphics/png \ graphics/png \
net/curl \ net/curl \
x11/ede/lib x11/ede/lib
RUN_DEPENDS = devel/desktop-file-utils \ RUN_DEPENDS = devel/desktop-file-utils \
misc/shared-mime-info \ misc/shared-mime-info \
x11/gtk+4,-guic \ x11/gtk+4,-guic \
@@ -31,13 +34,12 @@ FAKE_FLAGS = sysconfdir="${TRUEPREFIX}/share/examples/ede"
CONFIGURE_STYLE = gnu CONFIGURE_STYLE = gnu
CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
PTHREAD_LIBS="-pthread" PTHREAD_CFLAGS="-pthread" \ PTHREAD_LIBS="-pthread" PTHREAD_CFLAGS="-pthread"
PYTHON=python${MODPY_VERSION}
MAKE_ENV = ASCIIDOC="${LOCALBASE}/bin/asciidoc"
NO_TEST = Yes NO_TEST = Yes
MODPY_ADJ_FILES = doc/asciidoc/asciidoc.py
pre-configure: pre-configure:
${SUBST_CMD} ${WRKSRC}/ede-keyboard-conf/ede-keyboard-conf.cpp ${SUBST_CMD} ${WRKSRC}/ede-keyboard-conf/ede-keyboard-conf.cpp
x11/ede/desktop/patches/patch-build_Doc_jam
+15
View File
@@ -0,0 +1,15 @@
Allow use of external asciidoc instead of the embedded
copy which is Python 2 code.
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" ;
x11/ede/desktop/pkg/PLIST
+10 -10
View File
@@ -62,16 +62,16 @@ share/doc/ede-${FULL_V}/manual/index.html
share/doc/ede-${FULL_V}/manual/introduction.html share/doc/ede-${FULL_V}/manual/introduction.html
share/ede/ share/ede/
share/ede/panel-applets/ share/ede/panel-applets/
share/ede/panel-applets/battery_monitor.so @so share/ede/panel-applets/battery_monitor.so
share/ede/panel-applets/clock.so @so share/ede/panel-applets/clock.so
share/ede/panel-applets/cpu_monitor.so @so share/ede/panel-applets/cpu_monitor.so
share/ede/panel-applets/keyboard_layout.so @so share/ede/panel-applets/keyboard_layout.so
share/ede/panel-applets/mem_monitor.so @so share/ede/panel-applets/mem_monitor.so
share/ede/panel-applets/pager.so @so share/ede/panel-applets/pager.so
share/ede/panel-applets/quick_launch.so @so share/ede/panel-applets/quick_launch.so
share/ede/panel-applets/start_menu.so @so share/ede/panel-applets/start_menu.so
share/ede/panel-applets/system_tray.so @so share/ede/panel-applets/system_tray.so
share/ede/panel-applets/taskbar.so @so share/ede/panel-applets/taskbar.so
share/ede/themes/ share/ede/themes/
share/ede/themes/splash-themes/ share/ede/themes/splash-themes/
share/ede/themes/splash-themes/scape/ share/ede/themes/splash-themes/scape/