Update py-setproctitle to 1.1.5 and add a python3 flavor.
Ok?
Martin
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/py-setproctitle/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile 19 Dec 2011 10:37:41 -0000 1.1.1.1
+++ Makefile 8 Apr 2012 14:00:54 -0000
@@ -2,7 +2,7 @@
COMMENT = library for getting/setting process names
-MODPY_EGG_VERSION= 1.1.3
+MODPY_EGG_VERSION= 1.1.5
DISTNAME = setproctitle-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
@@ -22,6 +22,9 @@ MASTER_SITES= ${MASTER_SITE_PYPI:=s/set
MODULES = lang/python
+FLAVORS = python3
+FLAVOR ?=
+
WANTLIB += ${MODPY_WANTLIB}
BUILD_DIR = build/lib.${MODPY_VERSION}
@@ -29,10 +32,10 @@ MODPY_DISTUTILS_BUILDARGS = --build-lib
REGRESS_DEPENDS = devel/gmake
-MAKE_ENV += PYTHON="${MODPY_BIN}" PYCONFIG="${MODPY_BIN}-config"
+MAKE_ENV += PYTHON="${MODPY_BIN}" PYCONFIG="${MODPY_BIN}-config" \
+ PY2TO3="2to3-${MODPY_VERSION}"
do-regress:
- cd ${WRKSRC} && gmake ${MAKE_ENV} tests/pyrun && \
- PYTHONPATH=${BUILD_DIR} ${MODPY_BIN} tests/setproctitle_test.py
+ cd ${WRKSRC} && gmake ${MAKE_ENV} check
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/py-setproctitle/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 19 Dec 2011 10:37:41 -0000 1.1.1.1
+++ distinfo 8 Apr 2012 13:20:29 -0000
@@ -1,5 +1,5 @@
-MD5 (setproctitle-1.1.3.tar.gz) = ZAKFIYUNxoxbkNRTd94/XA==
-RMD160 (setproctitle-1.1.3.tar.gz) = ZGFBQZmOS1MVB4d4p1b2JK4g5CY=
-SHA1 (setproctitle-1.1.3.tar.gz) = efUzcaNwfXMojxcDjeepfuAzuFY=
-SHA256 (setproctitle-1.1.3.tar.gz) =
Svl+sBov67gQoItG9/U7Rgwe2mvroHiVwT6+dW9CIwY=
-SIZE (setproctitle-1.1.3.tar.gz) = 19286
+MD5 (setproctitle-1.1.5.tar.gz) = jcI2wjcnpKygMfzSm3+Kcw==
+RMD160 (setproctitle-1.1.5.tar.gz) = ycs2DpTxwBqma4SnvfhR4kpBjbI=
+SHA1 (setproctitle-1.1.5.tar.gz) = AH4b9Av5URvaLS+J44KX/pY0HvQ=
+SHA256 (setproctitle-1.1.5.tar.gz) =
xDRkVBKlVvckyP/lVaLptYfNESdCamHJh5SvI0eD9Fg=
+SIZE (setproctitle-1.1.5.tar.gz) = 22382
Index: patches/patch-Makefile
===================================================================
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Makefile 8 Apr 2012 13:59:40 -0000
@@ -0,0 +1,27 @@
+$OpenBSD$
+
+Copy missing file for python3 flavor and remove non supported cp option.
+
+--- Makefile.orig Mon Feb 6 13:49:36 2012
++++ Makefile Sun Apr 8 15:58:50 2012
+@@ -29,7 +29,7 @@
+ check: build tests/pyrun2
+ PYTHONPATH=`pwd`/$(BUILD_DIR):$$PYTHONPATH \
+ ROOT_PATH=$(ROOT_PATH) \
+- $(PYTHON) `which nosetests` -v -s -w tests
++ $(PYTHON) tests/setproctitle_test.py -v
+
+ tests/pyrun2: tests/pyrun.c
+ $(CC) $(PYINC) -o $@ $< $(PYLIB)
+@@ -48,9 +48,10 @@
+ $(MKDIR) py3
+ $(MKDIR) py3/src
+ $(MKDIR) py3/tests
+- for f in `grep -v "#" MANIFEST`; do cp -v $$f py3/$$f; done
++ for f in `grep -v "#" MANIFEST`; do cp $$f py3/$$f; done
+ # setup.py should be executable with python3 as distribute
+ # currenlty doesn't seem to try to convert it
++ cp tests/setproctitle_test.py py3/tests
+ $(PY2TO3) -w --no-diffs py3/tests
+
+ tests/pyrun3: tests/pyrun.c
Index: patches/patch-tests_pyrun_c
===================================================================
RCS file: /cvs/ports/devel/py-setproctitle/patches/patch-tests_pyrun_c,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-tests_pyrun_c
--- patches/patch-tests_pyrun_c 19 Dec 2011 10:37:41 -0000 1.1.1.1
+++ patches/patch-tests_pyrun_c 8 Apr 2012 13:57:12 -0000
@@ -1,6 +1,6 @@
-$OpenBSD: patch-tests_pyrun_c,v 1.1.1.1 2011/12/19 10:37:41 mpi Exp $
---- tests/pyrun.c Sun Dec 18 15:07:17 2011
-+++ tests/pyrun.c Sun Dec 18 15:07:28 2011
+$OpenBSD$
+--- tests/pyrun.c.orig Mon Feb 6 13:49:36 2012
++++ tests/pyrun.c Sun Apr 8 15:56:57 2012
@@ -10,6 +10,7 @@
*-------------------------------------------------------------------------
*/
Index: patches/patch-tests_setproctitle_test_py
===================================================================
RCS file:
/cvs/ports/devel/py-setproctitle/patches/patch-tests_setproctitle_test_py,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-tests_setproctitle_test_py
--- patches/patch-tests_setproctitle_test_py 19 Dec 2011 10:37:41 -0000
1.1.1.1
+++ patches/patch-tests_setproctitle_test_py 8 Apr 2012 13:56:58 -0000
@@ -1,7 +1,7 @@
-$OpenBSD: patch-tests_setproctitle_test_py,v 1.1.1.1 2011/12/19 10:37:41 mpi
Exp $
---- tests/setproctitle_test.py Wed Nov 9 02:54:18 2011
-+++ tests/setproctitle_test.py Sun Dec 18 15:47:52 2011
-@@ -431,7 +431,7 @@
+$OpenBSD$
+--- tests/setproctitle_test.py.orig Wed Feb 8 12:53:27 2012
++++ tests/setproctitle_test.py Sun Apr 8 15:56:57 2012
+@@ -479,7 +479,7 @@ class SetproctitleTestCase(unittest.TestCase):
if 'bsd' in sys.platform:
procname = os.path.basename(sys.executable)
title = ' '.join([t for t in title.split(' ')
