On Tue 25/02/2020 11:27, Paco Esteban wrote: > Hi Bjorn, > > On Tue, 25 Feb 2020, Bjorn Ketelaars wrote: > > > diff --git Makefile Makefile > > index a8556156e5e..b7b12ba4908 100644 > > --- Makefile > > +++ Makefile > > @@ -2,10 +2,9 @@ > > > > COMMENT = terminals served to term.js using Tornado websockets > > > > -MODPY_EGG_VERSION = 0.8.2 > > +MODPY_EGG_VERSION = 0.8.3 > > DISTNAME = terminado-${MODPY_EGG_VERSION} > > PKGNAME = py-${DISTNAME} > > -REVISION = 0 > > > > CATEGORIES = www > > > > @@ -23,6 +22,6 @@ RUN_DEPENDS += > > devel/py-ptyprocess${MODPY_FLAVOR} \ > > www/py-tornado${MODPY_FLAVOR}>=4 > > > > FLAVORS = python3 > > -FLAVOR ?= > > +FLAVOR ?= python3 > > shouldn't this be FLAVOR = python3 ?
Yes, it should! New diff enclosed. diff --git Makefile Makefile index a8556156e5e..2c22ba0bb0d 100644 --- Makefile +++ Makefile @@ -2,10 +2,9 @@ COMMENT = terminals served to term.js using Tornado websockets -MODPY_EGG_VERSION = 0.8.2 +MODPY_EGG_VERSION = 0.8.3 DISTNAME = terminado-${MODPY_EGG_VERSION} PKGNAME = py-${DISTNAME} -REVISION = 0 CATEGORIES = www @@ -23,6 +22,6 @@ RUN_DEPENDS += devel/py-ptyprocess${MODPY_FLAVOR} \ www/py-tornado${MODPY_FLAVOR}>=4 FLAVORS = python3 -FLAVOR ?= +FLAVOR = python3 .include <bsd.port.mk> diff --git distinfo distinfo index 08f9e3663ab..e138035e5f5 100644 --- distinfo +++ distinfo @@ -1,2 +1,2 @@ -SHA256 (terminado-0.8.2.tar.gz) = 3gjhQfg8OgeYsFDssJerYlnD8DMbL3t3UMkHXO0sIMI= -SIZE (terminado-0.8.2.tar.gz) = 21041 +SHA256 (terminado-0.8.3.tar.gz) = SASndPgCMGp9mvcyIZPFOQ8doKu0KeCCoQ7x1G5vssI= +SIZE (terminado-0.8.3.tar.gz) = 21165 diff --git patches/patch-terminado_management_py patches/patch-terminado_management_py new file mode 100644 index 00000000000..a1b382ede55 --- /dev/null +++ patches/patch-terminado_management_py @@ -0,0 +1,18 @@ +$OpenBSD$ + +Don't call getpgid() when killing a test. Taken from +https://github.com/jupyter/terminado/pull/72. + +Index: terminado/management.py +--- terminado/management.py.orig ++++ terminado/management.py +@@ -70,8 +70,7 @@ class PtyWithClients(object): + """Send a signal to the process group of the process in the pty""" + if os.name == 'nt': + return self.ptyproc.kill(sig) +- pgid = os.getpgid(self.ptyproc.pid) +- os.killpg(pgid, sig) ++ os.killpg(self.ptyproc.pid, sig) + + @gen.coroutine + def terminate(self, force=False): diff --git pkg/PLIST pkg/PLIST index 7075ad4b8b1..99ec2dae658 100644 --- pkg/PLIST +++ pkg/PLIST @@ -1,4 +1,6 @@ @comment $OpenBSD: PLIST,v 1.2 2016/11/06 13:42:57 shadchin Exp $ +@conflict py-terminado-* +@pkgpath www/py-terminado lib/python${MODPY_VERSION}/site-packages/terminado/ lib/python${MODPY_VERSION}/site-packages/terminado-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info lib/python${MODPY_VERSION}/site-packages/terminado/__init__.py