devel/py-asn1-modules: rename to py-pyasn1-modules to match upstream naming

- bump PORTREVISION for dependend ports

9 files changed, 9 insertions, 7 deletions

diff --git a/MOVED b/MOVED
index 8e75f0cd7b63..ad398644649a 100644
--- a/MOVED
+++ b/MOVED
@@ -7936,3 +7936,4 @@ databases/p5-DBD-mysql51|databases/p5-DBD-mysql|2015-11-10|Has expired: EOL upst
 databases/py-MySQLdb51||2015-11-10|Has expired: EOL upstream, use databases/py-MySQLdb instead
 deskutils/steadyflow||2015-11-13|Has expired: No new releases for years, consider using net/uget
 net/py-smb|net/py-pysmb|2015-11-14|Renamed to match upstream naming
+devel/py-asn1-modules|devel/py-pyasn1-modules|2015-11-14|Renamed to match upstream naming
diff --git a/devel/Makefile b/devel/Makefile
index b12058b9465b..77fed4f49775 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -3906,7 +3906,6 @@
     SUBDIR += py-argparse
     SUBDIR += py-args
     SUBDIR += py-asn1
-    SUBDIR += py-asn1-modules
     SUBDIR += py-aspects
     SUBDIR += py-aspyct
     SUBDIR += py-astroid
@@ -4183,6 +4182,7 @@
     SUBDIR += py-pudb
     SUBDIR += py-px
     SUBDIR += py-py
+    SUBDIR += py-pyasn1-modules
     SUBDIR += py-pycalendar
     SUBDIR += py-pycallgraph
     SUBDIR += py-pycerberus
diff --git a/devel/py-asn1-modules/Makefile b/devel/py-pyasn1-modules/Makefile
index d8f8e67e1eaa..a248c577007d 100644
--- a/devel/py-asn1-modules/Makefile
+++ b/devel/py-pyasn1-modules/Makefile
@@ -1,11 +1,10 @@
 # $FreeBSD$
 
-PORTNAME=	asn1-modules
+PORTNAME=	pyasn1-modules
 PORTVERSION=	0.0.7
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	py${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	rm@FreeBSD.org
 COMMENT=	Collection of ASN.1 data structures for py-asn1
@@ -20,7 +19,6 @@ USES=		python shebangfix
 SHEBANG_FILES=	tools/*.py
 USE_PYTHON=	autoplist distutils
 
-DOCSDIR=	${PREFIX}/share/doc/${PYTHON_PKGNAMEPREFIX}${PORTNAME}
 PORTDOCS=	CHANGES.txt README.txt
 TOOLS=		cmpdump.py crldump.py crmfdump.py ocspclient.py ocspreqdump.py \
 		ocsprspdump.py pkcs10dump.py pkcs1dump.py pkcs7dump.py \
diff --git a/devel/py-asn1-modules/distinfo b/devel/py-pyasn1-modules/distinfo
index c2df92a8be70..c2df92a8be70 100644
--- a/devel/py-asn1-modules/distinfo
+++ b/devel/py-pyasn1-modules/distinfo
diff --git a/devel/py-asn1-modules/pkg-descr b/devel/py-pyasn1-modules/pkg-descr
index 5bb541ddac2e..5bb541ddac2e 100644
--- a/devel/py-asn1-modules/pkg-descr
+++ b/devel/py-pyasn1-modules/pkg-descr
diff --git a/devel/py-asn1-modules/pkg-plist b/devel/py-pyasn1-modules/pkg-plist
index 6e5862b9a7e8..6e5862b9a7e8 100644
--- a/devel/py-asn1-modules/pkg-plist
+++ b/devel/py-pyasn1-modules/pkg-plist
diff --git a/net/py-ldap/Makefile b/net/py-ldap/Makefile
index a72801c76a75..0f133f9e7e27 100644
--- a/net/py-ldap/Makefile
+++ b/net/py-ldap/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	ldap
 PORTVERSION=	2.4.21
+PORTREVISION=	1
 CATEGORIES=	net python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,7 +14,7 @@ COMMENT=	LDAP module for python, for OpenLDAP2
 LICENSE=	PSFL
 LICENSE_FILE=	${WRKSRC}/LICENCE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}asn1-modules>=0:${PORTSDIR}/devel/py-asn1-modules
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyasn1-modules>0:${PORTSDIR}/devel/py-pyasn1-modules
 
 USES=		python:2
 USE_PYTHON=	autoplist distutils
diff --git a/security/py-oauth2client/Makefile b/security/py-oauth2client/Makefile
index 4de57cc3b871..7237f1f0fbc8 100644
--- a/security/py-oauth2client/Makefile
+++ b/security/py-oauth2client/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	oauth2client
 PORTVERSION=	1.4.11
+PORTREVISION=	1
 CATEGORIES=	security python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,7 +14,7 @@ COMMENT=	OAuth 2.0 client library
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}asn1>=0.1.7:${PORTSDIR}/devel/py-asn1 \
-		${PYTHON_PKGNAMEPREFIX}asn1-modules>=0.0.5:${PORTSDIR}/devel/py-asn1-modules \
+		${PYTHON_PKGNAMEPREFIX}pyasn1-modules>=0.0.5:${PORTSDIR}/devel/py-pyasn1-modules \
 		${PYTHON_PKGNAMEPREFIX}httplib2>=0.9.1:${PORTSDIR}/www/py-httplib2 \
 		${PYTHON_PKGNAMEPREFIX}rsa>=3.1.4:${PORTSDIR}/security/py-rsa \
 		${PYTHON_PKGNAMEPREFIX}six>=1.6.1:${PORTSDIR}/devel/py-six
diff --git a/security/py-service_identity/Makefile b/security/py-service_identity/Makefile
index dcd2c8c8fb8a..2f6da9c23e01 100644
--- a/security/py-service_identity/Makefile
+++ b/security/py-service_identity/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	service_identity
 PORTVERSION=	14.0.0
+PORTREVISION=	1
 CATEGORIES=	security python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -15,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}openssl>=0.14:${PORTSDIR}/security/py-openssl \
 		${PYTHON_PKGNAMEPREFIX}asn1>=0.1.7:${PORTSDIR}/devel/py-asn1 \
-		${PYTHON_PKGNAMEPREFIX}asn1-modules>=0.0.5:${PORTSDIR}/devel/py-asn1-modules \
+		${PYTHON_PKGNAMEPREFIX}pyasn1-modules>=0.0.5:${PORTSDIR}/devel/py-pyasn1-modules \
 		${PYTHON_PKGNAMEPREFIX}characteristic>=14.0.0:${PORTSDIR}/devel/py-characteristic
 
 USES=		python