diff --git a/x11/py-terminator/Makefile b/x11/py-terminator/Makefile index a7a5d1b9c35c..ba2839ba00b8 100644 --- a/x11/py-terminator/Makefile +++ b/x11/py-terminator/Makefile @@ -1,21 +1,19 @@ -# $NetBSD: Makefile,v 1.33 2024/08/10 11:33:31 wiz Exp $ +# $NetBSD: Makefile,v 1.34 2024/08/10 11:39:12 wiz Exp $ -DISTNAME= terminator-2.1.0 +DISTNAME= terminator-2.1.4 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} -PKGREVISION= 2 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_GITHUB:=gnome-terminator/} GITHUB_PROJECT= terminator GITHUB_TAG= v${PKGVERSION_NOREV} MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= https://launchpad.net/terminator +HOMEPAGE= https://github.com/gnome-terminator/terminator COMMENT= Terminator, multiple terminals in one window LICENSE= gnu-gpl-v2 TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools TOOL_DEPENDS+= ${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel -#TOOL_DEPENDS+= ${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo DEPENDS+= ${PYPKGPREFIX}-configobj-[0-9]*:../../devel/py-configobj DEPENDS+= ${PYPKGPREFIX}-dbus-[0-9]*:../../sysutils/py-dbus @@ -39,6 +37,9 @@ SUBST_VARS.manpath= PKGMANDIR PYTHON_VERSIONS_INCOMPATIBLE= 27 +# as of 2.1.4 +# 6 warnings, 46 errors + .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../lang/python/application.mk" .include "../../lang/python/wheel.mk" diff --git a/x11/py-terminator/PLIST b/x11/py-terminator/PLIST index 775ac7949d9e..7c2b941af183 100644 --- a/x11/py-terminator/PLIST +++ b/x11/py-terminator/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2024/08/10 11:33:31 wiz Exp $ +@comment $NetBSD: PLIST,v 1.6 2024/08/10 11:39:12 wiz Exp $ bin/remotinator bin/terminator ${PYSITELIB}/${WHEEL_INFODIR}/AUTHORS @@ -31,9 +31,6 @@ ${PYSITELIB}/terminatorlib/debugserver.pyo ${PYSITELIB}/terminatorlib/editablelabel.py ${PYSITELIB}/terminatorlib/editablelabel.pyc ${PYSITELIB}/terminatorlib/editablelabel.pyo -${PYSITELIB}/terminatorlib/encoding.py -${PYSITELIB}/terminatorlib/encoding.pyc -${PYSITELIB}/terminatorlib/encoding.pyo ${PYSITELIB}/terminatorlib/factory.py ${PYSITELIB}/terminatorlib/factory.pyc ${PYSITELIB}/terminatorlib/factory.pyo @@ -71,12 +68,30 @@ ${PYSITELIB}/terminatorlib/plugins/command_notify.pyo ${PYSITELIB}/terminatorlib/plugins/custom_commands.py ${PYSITELIB}/terminatorlib/plugins/custom_commands.pyc ${PYSITELIB}/terminatorlib/plugins/custom_commands.pyo +${PYSITELIB}/terminatorlib/plugins/dir_open.py +${PYSITELIB}/terminatorlib/plugins/dir_open.pyc +${PYSITELIB}/terminatorlib/plugins/dir_open.pyo +${PYSITELIB}/terminatorlib/plugins/insert_term_name.py +${PYSITELIB}/terminatorlib/plugins/insert_term_name.pyc +${PYSITELIB}/terminatorlib/plugins/insert_term_name.pyo ${PYSITELIB}/terminatorlib/plugins/logger.py ${PYSITELIB}/terminatorlib/plugins/logger.pyc ${PYSITELIB}/terminatorlib/plugins/logger.pyo ${PYSITELIB}/terminatorlib/plugins/maven.py ${PYSITELIB}/terminatorlib/plugins/maven.pyc ${PYSITELIB}/terminatorlib/plugins/maven.pyo +${PYSITELIB}/terminatorlib/plugins/mousefree_url_handler.py +${PYSITELIB}/terminatorlib/plugins/mousefree_url_handler.pyc +${PYSITELIB}/terminatorlib/plugins/mousefree_url_handler.pyo +${PYSITELIB}/terminatorlib/plugins/run_cmd_on_match.py +${PYSITELIB}/terminatorlib/plugins/run_cmd_on_match.pyc +${PYSITELIB}/terminatorlib/plugins/run_cmd_on_match.pyo +${PYSITELIB}/terminatorlib/plugins/save_last_session_layout.py +${PYSITELIB}/terminatorlib/plugins/save_last_session_layout.pyc +${PYSITELIB}/terminatorlib/plugins/save_last_session_layout.pyo +${PYSITELIB}/terminatorlib/plugins/save_user_session_layout.py +${PYSITELIB}/terminatorlib/plugins/save_user_session_layout.pyc +${PYSITELIB}/terminatorlib/plugins/save_user_session_layout.pyo ${PYSITELIB}/terminatorlib/plugins/terminalshot.py ${PYSITELIB}/terminatorlib/plugins/terminalshot.pyc ${PYSITELIB}/terminatorlib/plugins/terminalshot.pyo diff --git a/x11/py-terminator/distinfo b/x11/py-terminator/distinfo index 30a5727990f6..b11203dc1491 100644 --- a/x11/py-terminator/distinfo +++ b/x11/py-terminator/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.10 2024/08/10 11:33:31 wiz Exp $ +$NetBSD: distinfo,v 1.11 2024/08/10 11:39:12 wiz Exp $ -BLAKE2s (terminator-2.1.0.tar.gz) = ab7ddf2f55be79849e35623a4b75230d1c369fd0dafd768147a3ba7386850835 -SHA512 (terminator-2.1.0.tar.gz) = 0406b0542d5b4498084968b4e49a5ae3ff10db394907930923ad76ac5edf459c976a0a5b8617fd3a14dcde464b563ae137beb33e04b5b82ae856c497abf3fd04 -Size (terminator-2.1.0.tar.gz) = 1030864 bytes -SHA1 (patch-setup.py) = c8827cccc9c0f390136f93c72fb0037b3498d420 +BLAKE2s (terminator-2.1.4.tar.gz) = 2d428380aa7134e9f0a91bd83c165e46a041ac0697dbe7974e81c9b15729ee81 +SHA512 (terminator-2.1.4.tar.gz) = 6a6d441fa849695a5c4919db6d553ce8572f75ef66bfb6d4c7cd044d2e952428841c315a90aca0906592bdfff28ff93a17e8a0d6a72287563d1a6d3d6a319db9 +Size (terminator-2.1.4.tar.gz) = 1064970 bytes +SHA1 (patch-setup.py) = cc42f3c4bd03becb9511911c0ff6785332cac47c diff --git a/x11/py-terminator/patches/patch-setup.py b/x11/py-terminator/patches/patch-setup.py index 5b1b23c4d008..f2ef2062b477 100644 --- a/x11/py-terminator/patches/patch-setup.py +++ b/x11/py-terminator/patches/patch-setup.py @@ -1,17 +1,14 @@ -$NetBSD: patch-setup.py,v 1.5 2024/08/10 11:33:31 wiz Exp $ +$NetBSD: patch-setup.py,v 1.6 2024/08/10 11:39:13 wiz Exp $ Use the right path for man-pages in pkgsrc. -Install the man pages in the right directory. - ---- setup.py.orig 2021-01-04 15:50:10.000000000 +0000 +--- setup.py.orig 2024-05-30 02:19:25.000000000 +0000 +++ setup.py -@@ -186,11 +186,7 @@ class InstallData(install_data): - +@@ -175,10 +175,7 @@ class InstallData(install_data): return data_files -- --if platform.system() in ['FreeBSD', 'OpenBSD']: + +-if platform.system() in ['OpenBSD']: - man_dir = 'man' -else: - man_dir = 'share/man' @@ -19,11 +16,3 @@ test_deps = [ 'pytest' -@@ -232,7 +228,6 @@ setup(name=APP_NAME, - 'terminatorlib.plugins', - ], - setup_requires=[ -- 'pytest-runner', - ], - install_requires=[ - 'pycairo',