Tue Jun 11 23:50:14 2019 UTC ()
py-terminator: Drop old patch, require py-psutil

Drop old patch that workaround problem fixed (memory fault when prompting
for CWD) in py-psutil 5.6.3.

Register py-psutil as a dependency. It's not needed for every OS,
but most of them can make use of the call to determine the current
working directory.

Bump PKGREVISION.


(kamil)
diff -r1.19 -r1.20 pkgsrc/x11/py-terminator/Makefile
diff -r1.5 -r1.6 pkgsrc/x11/py-terminator/distinfo
diff -r1.1 -r0 pkgsrc/x11/py-terminator/patches/patch-terminatorlib_cwd.py
cvs diff -r1.19 -r1.20 pkgsrc/x11/py-terminator/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/py-terminator/Makefile 2019/06/01 01:17:12 1.19
+++ pkgsrc/x11/py-terminator/Makefile 2019/06/11 23:50:13 1.20
@@ -1,41 +1,43 @@ @@ -1,41 +1,43 @@
1# $NetBSD: Makefile,v 1.19 2019/06/01 01:17:12 kamil Exp $ 1# $NetBSD: Makefile,v 1.20 2019/06/11 23:50:13 kamil Exp $
2 2
3DISTNAME= terminator-0.98 3DISTNAME= terminator-0.98
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
5PKGREVISION= 8 5PKGREVISION= 9
6CATEGORIES= x11 6CATEGORIES= x11
7MASTER_SITES= https://launchpad.net/terminator/trunk/${PKGVERSION_NOREV}/+download/ 7MASTER_SITES= https://launchpad.net/terminator/trunk/${PKGVERSION_NOREV}/+download/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://launchpad.net/terminator 10HOMEPAGE= https://launchpad.net/terminator
11COMMENT= Terminator, multiple terminals in one window 11COMMENT= Terminator, multiple terminals in one window
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14PYTHON_VERSIONS_INCOMPATIBLE= 36 37 # not yet ported as of 0.98 14PYTHON_VERSIONS_INCOMPATIBLE= 36 37 # not yet ported as of 0.98
15 15
16REPLACE_PYTHON+= *.py 16REPLACE_PYTHON+= *.py
17REPLACE_PYTHON+= terminatorlib/*.py 17REPLACE_PYTHON+= terminatorlib/*.py
18REPLACE_PYTHON+= terminatorlib/plugins/*.py 18REPLACE_PYTHON+= terminatorlib/plugins/*.py
19 19
20USE_TOOLS+= intltool bash 20USE_TOOLS+= intltool bash
21 21
22REPLACE_SH+= terminator.wrapper 22REPLACE_SH+= terminator.wrapper
23REPLACE_BASH+= terminatorlib/pylint.sh 23REPLACE_BASH+= terminatorlib/pylint.sh
24REPLACE_BASH+= run_tests 24REPLACE_BASH+= run_tests
25 25
26SUBST_CLASSES+= manpath 26SUBST_CLASSES+= manpath
27SUBST_STAGE.manpath= pre-configure 27SUBST_STAGE.manpath= pre-configure
28SUBST_FILES.manpath= setup.py 28SUBST_FILES.manpath= setup.py
29SUBST_VARS.manpath= PKGMANDIR 29SUBST_VARS.manpath= PKGMANDIR
30 30
 31DEPENDS+= ${PYPKGPREFIX}-psutil>=5.6.3:../../sysutils/py-psutil
 32
31.include "../../devel/glib2/buildlink3.mk" 33.include "../../devel/glib2/buildlink3.mk"
32.include "../../devel/pango/buildlink3.mk" 34.include "../../devel/pango/buildlink3.mk"
33.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 35.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
34.include "../../lang/python/application.mk" 36.include "../../lang/python/application.mk"
35.include "../../lang/python/distutils.mk" 37.include "../../lang/python/distutils.mk"
36.include "../../sysutils/desktop-file-utils/desktopdb.mk" 38.include "../../sysutils/desktop-file-utils/desktopdb.mk"
37.include "../../sysutils/py-notify-python/buildlink3.mk" 39.include "../../sysutils/py-notify-python/buildlink3.mk"
38.include "../../x11/py-keybinder/buildlink3.mk" 40.include "../../x11/py-keybinder/buildlink3.mk"
39.include "../../x11/gtk2/buildlink3.mk" 41.include "../../x11/gtk2/buildlink3.mk"
40.include "../../x11/py-vte/buildlink3.mk" 42.include "../../x11/py-vte/buildlink3.mk"
41.include "../../mk/bsd.pkg.mk" 43.include "../../mk/bsd.pkg.mk"
cvs diff -r1.5 -r1.6 pkgsrc/x11/py-terminator/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/py-terminator/distinfo 2019/06/01 01:17:12 1.5
+++ pkgsrc/x11/py-terminator/distinfo 2019/06/11 23:50:13 1.6
@@ -1,8 +1,7 @@ @@ -1,8 +1,7 @@
1$NetBSD: distinfo,v 1.5 2019/06/01 01:17:12 kamil Exp $ 1$NetBSD: distinfo,v 1.6 2019/06/11 23:50:13 kamil Exp $
2 2
3SHA1 (terminator-0.98.tar.gz) = a35561ef4fec3d2f34e909bb7284f0b770a4e607 3SHA1 (terminator-0.98.tar.gz) = a35561ef4fec3d2f34e909bb7284f0b770a4e607
4RMD160 (terminator-0.98.tar.gz) = cddb24240b74fba3eb6694d9d4aaff11329a14b6 4RMD160 (terminator-0.98.tar.gz) = cddb24240b74fba3eb6694d9d4aaff11329a14b6
5SHA512 (terminator-0.98.tar.gz) = c40ac1929bb446239f769d33f37a6d49ee79ea10755dda4bbbd228763f13661f0ef7efd950a592462150237e516077311318e2a19c9f08adac76a418cf633573 5SHA512 (terminator-0.98.tar.gz) = c40ac1929bb446239f769d33f37a6d49ee79ea10755dda4bbbd228763f13661f0ef7efd950a592462150237e516077311318e2a19c9f08adac76a418cf633573
6Size (terminator-0.98.tar.gz) = 6007243 bytes 6Size (terminator-0.98.tar.gz) = 6007243 bytes
7SHA1 (patch-setup.py) = a94be7d3c4fa03ec36250c408646229b768fc81d 7SHA1 (patch-setup.py) = a94be7d3c4fa03ec36250c408646229b768fc81d
8SHA1 (patch-terminatorlib_cwd.py) = 7e5bae5af67af2790c0bc4c27b6d61f8e54a5658 
File Deleted: pkgsrc/x11/py-terminator/patches/Attic/patch-terminatorlib_cwd.py