Upstream has a couple new versions, but they also rerolled the 0.6.2
tarball it semms.

Looks like newer versions have python 3 support, but I'd just like to
get rid of python 2 here and leave the update with all its testing to
somone else, which then may bring python 3 bindings back.

So merge the obsolete -python subpackage into -main and build with
python bits disabled;  works for me.

Feedback? Objection? OK?

Index: Makefile
===================================================================
RCS file: /cvs/ports/editors/texworks/Makefile,v
retrieving revision 1.57
diff -u -p -r1.57 Makefile
--- Makefile    31 Mar 2022 16:52:00 -0000      1.57
+++ Makefile    3 Dec 2022 20:56:29 -0000
@@ -1,5 +1,4 @@
 COMMENT-main =         easy to use LaTeX and ConTeXt editor
-COMMENT-python =       Python scripting for TeXworks
 COMMENT-lua =          Lua scripting for TeXworks
 
 V =                    0.6.2
@@ -8,8 +7,7 @@ GH_PROJECT =            texworks
 GH_TAGNAME =           release-${V}
 
 REVISION-lua =         2
-REVISION-python =      3
-REVISION-main =                6
+REVISION-main =                7
 
 EPOCH =                        0
 
@@ -20,11 +18,9 @@ MAINTAINER =         Edd Barrett <edd@openbsd.o
 # GPLv2
 PERMIT_PACKAGE =       Yes
 
-MODULES =              lang/python \
-                       lang/lua \
+MODULES =              lang/lua \
                        x11/qt5 \
                        devel/cmake
-MODPY_VERSION =        ${MODPY_DEFAULT_VERSION_2}
 
 # c++-11 required for poppler
 COMPILER =             base-clang ports-gcc
@@ -36,10 +32,7 @@ WANTLIB += m poppler poppler-qt5 synctex
 WANTLIB-lua += ${COMPILER_LIBCXX} ${MODLUA_WANTLIB} Qt5Concurrent Qt5Core
 WANTLIB-lua += Qt5DBus Qt5Gui Qt5Script Qt5ScriptTools Qt5Widgets Qt5Xml m GL
 
-WANTLIB-python += ${COMPILER_LIBCXX} Qt5Concurrent Qt5Core Qt5DBus Qt5Gui GL
-WANTLIB-python += Qt5Script Qt5ScriptTools Qt5Widgets Qt5Xml m ${MODPY_WANTLIB}
-
-MULTI_PACKAGES =       -main -lua -python
+MULTI_PACKAGES =       -main -lua
 
 LIB_DEPENDS =          ${MODQT5_LIB_DEPENDS} \
                        x11/qt5/qtscript
@@ -49,13 +42,10 @@ LIB_DEPENDS-main =  ${LIB_DEPENDS} \
                        textproc/hunspell
 LIB_DEPENDS-lua =      ${LIB_DEPENDS} \
                        ${MODLUA_LIB_DEPENDS}
-LIB_DEPENDS-python =   ${LIB_DEPENDS} \
-                       ${MODPY_LIB_DEPENDS}
 
 RUN_DEPENDS-main =     devel/desktop-file-utils \
                        print/texlive/base>=2018
 RUN_DEPENDS-lua =      editors/texworks,-main
-RUN_DEPENDS-python =   editors/texworks,-main
 
 MODLUA_SA =            Yes
 
@@ -65,7 +55,7 @@ NO_TEST =             Yes
 SUBST_VARS +=          MODLUA-VERSION
 
 CONFIGURE_STYLE =      cmake
-CONFIGURE_ARGS +=      -DWITH_PYTHON=ON \
+CONFIGURE_ARGS +=      -DWITH_PYTHON=OFF \
                        -DTeXworks_DIC_DIR=${TRUEPREFIX}/share/mozilla-dicts
 # The handling of the manual install dir is odd.
 CONFIGURE_ARGS +=      -DTeXworks_MAN_DIR=/man/man1
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/editors/texworks/pkg/PLIST-main,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST-main
--- pkg/PLIST-main      11 Mar 2022 18:58:35 -0000      1.7
+++ pkg/PLIST-main      3 Dec 2022 21:04:52 -0000
@@ -1,3 +1,5 @@
+@conflict textworks-python-*
+@pkgpath editors/texworks,-python
 @pkgpath editors/texworks
 @bin bin/texworks
 lib/texworks/

Reply via email to