Hi,
This diff updates py-pexpect to the latest release.
Tested on amd64. Take maintainership.
Comments ? OK ?
--
Alexandr Shadchin
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/py-pexpect/Makefile,v
retrieving revision 1.23
diff -u -p -w -r1.23 Makefile
--- Makefile 17 Apr 2016 07:37:29 -0000 1.23
+++ Makefile 13 Jun 2016 13:31:35 -0000
@@ -2,14 +2,15 @@
COMMENT= pure Python Expect-like module
-MODPY_EGG_VERSION= 4.0.1
+MODPY_EGG_VERSION= 4.1.0
DISTNAME= pexpect-${MODPY_EGG_VERSION}
PKGNAME= py-${DISTNAME}
CATEGORIES= devel
-REVISION= 2
HOMEPAGE= http://pexpect.sourceforge.net/
+MAINTAINER = Alexandr Shadchin <shadc...@openbsd.org>
+
# ISC
PERMIT_PACKAGE_CDROM= Yes
@@ -32,7 +33,7 @@ MODPY_ADJ_FILES = tests/fakessh/ssh
EXAMPLESDIR= ${PREFIX}/share/examples/${MODPY_PY_PREFIX}pexpect
DOCDIR= ${PREFIX}/share/doc/${MODPY_PY_PREFIX}pexpect
-MAKE_ENV += PYTHONPATH=${WRKSRC}
SPHINXBUILD=${LOCALBASE}/bin/sphinx-build${MODPY_BIN_SUFFIX}
+MAKE_ENV += PYTHONPATH=${WRKSRC}
pre-build:
${SUBST_CMD} ${WRKSRC}/pexpect/replwrap.py
@@ -42,7 +43,8 @@ pre-build:
${SUBST_CMD} ${WRKSRC}/tests/test_run.py
post-build:
- cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} html
+ cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} html \
+ SPHINXBUILD=${LOCALBASE}/bin/sphinx-build${MODPY_BIN_SUFFIX}
post-install:
${INSTALL_DATA_DIR} ${EXAMPLESDIR}
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/py-pexpect/distinfo,v
retrieving revision 1.8
diff -u -p -w -r1.8 distinfo
--- distinfo 7 Jan 2016 17:16:20 -0000 1.8
+++ distinfo 13 Jun 2016 13:31:35 -0000
@@ -1,2 +1,2 @@
-SHA256 (pexpect-4.0.1.tar.gz) = IyeV68qvLhIDltu6o6Ep7aUXV+6q4ZEVWPTvjuQU/Gw=
-SIZE (pexpect-4.0.1.tar.gz) = 143657
+SHA256 (pexpect-4.1.0.tar.gz) = w4HGDxmHNVtl348Ion9CiDGRTIqBCRvRd4rDNvovJ+c=
+SIZE (pexpect-4.1.0.tar.gz) = 140294
Index: patches/patch-doc_Makefile
===================================================================
RCS file: patches/patch-doc_Makefile
diff -N patches/patch-doc_Makefile
--- patches/patch-doc_Makefile 16 Apr 2016 19:06:26 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-doc_Makefile,v 1.1 2016/04/16 19:06:26 shadchin Exp $
---- doc/Makefile.orig Fri Apr 15 20:41:00 2016
-+++ doc/Makefile Fri Apr 15 20:41:10 2016
-@@ -3,7 +3,7 @@
-
- # You can set these variables from the command line.
- SPHINXOPTS =
--SPHINXBUILD = sphinx-build
-+SPHINXBUILD ?= sphinx-build
- PAPER =
- BUILDDIR = _build
-
Index: patches/patch-tests_test_maxcanon_py
===================================================================
RCS file: patches/patch-tests_test_maxcanon_py
diff -N patches/patch-tests_test_maxcanon_py
--- patches/patch-tests_test_maxcanon_py 7 Jan 2016 17:16:21 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-tests_test_maxcanon_py,v 1.1 2016/01/07 17:16:21 shadchin Exp $
-https://github.com/pexpect/pexpect/issues/283
-
---- tests/test_maxcanon.py.orig Thu Dec 31 22:44:43 2015
-+++ tests/test_maxcanon.py Thu Dec 31 22:45:00 2015
-@@ -97,6 +97,7 @@ class TestCaseCanon(PexpectTestCase.PexpectTestCase):
- assert not child.isalive()
- assert child.exitstatus == 0
-
-+ @pytest.mark.xfail()
- @pytest.mark.skipif(
- sys.platform.lower().startswith('freebsd'),
- reason='os.write to BLOCK indefinitely on FreeBSD in this case'
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/py-pexpect/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -w -r1.8 PLIST
--- pkg/PLIST 15 Apr 2016 08:53:49 -0000 1.8
+++ pkg/PLIST 13 Jun 2016 13:31:35 -0000
@@ -20,7 +20,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/pexpect/${MODPY_PYCACHE}screen.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pexpect/${MODPY_PYCACHE}spawnbase.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pexpect/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pexpect/async.py
+lib/python${MODPY_VERSION}/site-packages/pexpect/async.py
+lib/python${MODPY_VERSION}/site-packages/pexpect/bashrc.sh
lib/python${MODPY_VERSION}/site-packages/pexpect/exceptions.py
lib/python${MODPY_VERSION}/site-packages/pexpect/expect.py
lib/python${MODPY_VERSION}/site-packages/pexpect/fdpexpect.py
