devel/py-pylib: Rename to devel/py-py

- Rename py-pylib to py-py to match upstream (PyPi) name [1]
- Update to 1.4.26
- Remove DISTNAME override, no longer necessary
- Update COMMENT

Accordingly:

- Update MOVED
- Update dependents

While I'm here:

- Sort USE_PYTHON values
- Canonicalize regression-test invocations
- Make TEST_DEPENDS explicit

[1] https://pypi.python.org/pypi/py/1.4.26

8 files changed, 16 insertions, 15 deletions

diff --git a/devel/Makefile b/devel/Makefile
index 795bb9bf11f8..6fb2df0d8958 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -3926,6 +3926,7 @@
     SUBDIR += py-ptrace
     SUBDIR += py-pudb
     SUBDIR += py-px
+    SUBDIR += py-py
     SUBDIR += py-pycalendar
     SUBDIR += py-pycallgraph
     SUBDIR += py-pycerberus
@@ -3941,7 +3942,6 @@
     SUBDIR += py-pykde4
     SUBDIR += py-pykdeuic4
     SUBDIR += py-pyke
-    SUBDIR += py-pylib
     SUBDIR += py-pymarc
     SUBDIR += py-pympler
     SUBDIR += py-pyparsing15
diff --git a/devel/py-mwlib/Makefile b/devel/py-mwlib/Makefile
index c4d045ca1d62..a8205a77865d 100644
--- a/devel/py-mwlib/Makefile
+++ b/devel/py-mwlib/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mwlib
 PORTVERSION=	0.15.14
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -25,7 +25,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}apipkg>=1.2:${PORTSDIR}/devel/py-apipkg \
 		${PYTHON_PKGNAMEPREFIX}timelib>=0.2:${PORTSDIR}/devel/py-timelib \
 		${PYTHON_PKGNAMEPREFIX}pdf>=1.12:${PORTSDIR}/print/py-pdf \
 		${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow \
-		${PYTHON_PKGNAMEPREFIX}pylib>=1.4.0:${PORTSDIR}/devel/py-pylib \
+		${PYTHON_PKGNAMEPREFIX}py>=1.4.0:${PORTSDIR}/devel/py-py \
 		${PYTHON_PKGNAMEPREFIX}qserve>=0:${PORTSDIR}/devel/py-qserve \
 		${PYTHON_PKGNAMEPREFIX}roman>=0:${PORTSDIR}/math/py-roman \
 		${PYTHON_PKGNAMEPREFIX}simplejson>2.0.8:${PORTSDIR}/devel/py-simplejson \
@@ -36,6 +36,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}apipkg>=1.2:${PORTSDIR}/devel/py-apipkg \
 USES=		python:2 zip
 USE_PYTHON=	autoplist distutils
 USE_RC_SUBR=	mwqserve nserve nslave postman
+
 SUB_LIST=	PYTHON_CMD=${PYTHON_CMD}
 
 post-patch:
diff --git a/devel/py-pylib/Makefile b/devel/py-py/Makefile
index d6ffb58bead2..900e5412b4cf 100644
--- a/devel/py-pylib/Makefile
+++ b/devel/py-py/Makefile
@@ -1,15 +1,14 @@
 # Created by: Yi-Jheng Lin <yzlin@cs.nctu.edu.tw>
 # $FreeBSD$
 
-PORTNAME=	pylib
-PORTVERSION=	1.4.23
+PORTNAME=	py
+PORTVERSION=	1.4.26
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	py-${PORTVERSION}
 
 MAINTAINER=	python@FreeBSD.org
-COMMENT=	Agile development and test support library
+COMMENT=	Python development support library
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
diff --git a/devel/py-py/distinfo b/devel/py-py/distinfo
new file mode 100644
index 000000000000..103e8fb5cb63
--- /dev/null
+++ b/devel/py-py/distinfo
@@ -0,0 +1,2 @@
+SHA256 (py-1.4.26.tar.gz) = 28dd0b90d29b386afb552efc4e355c889f4639ce93658a7872a2150ece28bb89
+SIZE (py-1.4.26.tar.gz) = 190617
diff --git a/devel/py-pylib/pkg-descr b/devel/py-py/pkg-descr
index 727e3606e1fc..727e3606e1fc 100644
--- a/devel/py-pylib/pkg-descr
+++ b/devel/py-py/pkg-descr
diff --git a/devel/py-pylib/distinfo b/devel/py-pylib/distinfo
deleted file mode 100644
index 8062f9453a3c..000000000000
--- a/devel/py-pylib/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (py-1.4.23.tar.gz) = ba8f2a3894caf1121799a2b239d67873a56bd0dfa24e1673d92990a8ae7370ca
-SIZE (py-1.4.23.tar.gz) = 189520
diff --git a/devel/py-pytest/Makefile b/devel/py-pytest/Makefile
index 2baece8a4298..c94dee708940 100644
--- a/devel/py-pytest/Makefile
+++ b/devel/py-pytest/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	pytest
 PORTVERSION=	2.6.1
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,9 +13,8 @@ COMMENT=	Mature full-featured Python testing tool
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pylib>=1.4.22:${PORTSDIR}/devel/py-pylib
-TEST_DEPENDS:=	${RUN_DEPENDS} \
-		${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}py>=1.4.22:${PORTSDIR}/devel/py-py
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-tox/Makefile b/devel/py-tox/Makefile
index 419470e20093..4c8e82bc67b9 100644
--- a/devel/py-tox/Makefile
+++ b/devel/py-tox/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	tox
 PORTVERSION=	1.7.2
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,10 +15,10 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}virtualenv>=1.11.2:${PORTSDIR}/devel/py-virtualenv \
-		${PYTHON_PKGNAMEPREFIX}pylib>=1.4.17:${PORTSDIR}/devel/py-pylib
+		${PYTHON_PKGNAMEPREFIX}py>=1.4.17:${PORTSDIR}/devel/py-py
 
 USES=		python
-USE_PYTHON=	distutils autoplist
+USE_PYTHON=	autoplist distutils
 
 OPTIONS_DEFINE=	PYTEST
 PYTEST_DESC=	Include the pytest test runner
@@ -31,6 +32,6 @@ RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}argparse>0:${PORTSDIR}/devel/py-argparse
 .endif
 
 regression-test: build
-	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test
+	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
 
 .include <bsd.port.post.mk>