- Update to 0.22.3

- Use PYDISTUTILS_AUTOPLIST
- Reformat pkg-descr
- Add PyPI as primary WWW

Changes:	https://github.com/martinpaljak/M2Crypto/commits/master

4 files changed, 11 insertions, 146 deletions

diff --git a/security/py-m2crypto/Makefile b/security/py-m2crypto/Makefile
index e2d9611fa3dd..0a706e142215 100644
--- a/security/py-m2crypto/Makefile
+++ b/security/py-m2crypto/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	m2crypto
-PORTVERSION=	0.21.1
-PORTREVISION=	1
+PORTVERSION=	0.22.3
 CATEGORIES=	security python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,15 +13,10 @@ COMMENT=	Crypto and SSL toolkit for Python
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/swig:${PORTSDIR}/devel/swig13
 
+PYDISTUTILS_AUTOPLIST=	yes
 PYDISTUTILS_BUILDARGS=	build_ext --openssl="${OPENSSLBASE}"
-PYDISTUTILS_PKGNAME=	M2Crypto
 USE_OPENSSL=	yes
 USE_PYDISTUTILS=yes
 USE_PYTHON=	2
-MAKE_ARGS=	PYTHON_VERSION=${PYTHON_VER}
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|setuptools|do_not_use_&|; /test_suite/d' ${WRKSRC}/${PYSETUP}
-	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/SWIG/Makefile
 
 .include <bsd.port.mk>
diff --git a/security/py-m2crypto/distinfo b/security/py-m2crypto/distinfo
index 4f3a99d11b85..4f953f3f4785 100644
--- a/security/py-m2crypto/distinfo
+++ b/security/py-m2crypto/distinfo
@@ -1,2 +1,2 @@
-SHA256 (M2Crypto-0.21.1.tar.gz) = 25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a
-SIZE (M2Crypto-0.21.1.tar.gz) = 413563
+SHA256 (M2Crypto-0.22.3.tar.gz) = 6071bfc817d94723e9b458a010d565365104f84aa73f7fe11919871f7562ff72
+SIZE (M2Crypto-0.22.3.tar.gz) = 74795
diff --git a/security/py-m2crypto/pkg-descr b/security/py-m2crypto/pkg-descr
index b337839c13b5..7cb73323b3e8 100644
--- a/security/py-m2crypto/pkg-descr
+++ b/security/py-m2crypto/pkg-descr
@@ -1,8 +1,9 @@
-M2Crypto is the most complete Python wrapper for OpenSSL featuring RSA, DSA,
-DH, HMACs, message digests, symmetric ciphers (including AES); SSL
-functionality to implement clients and servers; HTTPS extensions to Python's
-httplib, urllib, and xmlrpclib; unforgeable HMAC'ing AuthCookies for web
-session management; FTP/TLS client and server; S/MIME; ZServerSSL: A HTTPS
-server for Zope and ZSmime: An S/MIME messenger for Zope.
+M2Crypto is the most complete Python wrapper for OpenSSL featuring RSA, DSA, DH,
+HMACs, message digests, symmetric ciphers (including AES); SSL functionality to
+implement clients and servers; HTTPS extensions to Python's httplib, urllib, and
+xmlrpclib; unforgeable HMAC'ing AuthCookies for web session management; FTP/TLS
+client and server; S/MIME; ZServerSSL: A HTTPS server for Zope and ZSmime: An
+S/MIME messenger for Zope.
 
+WWW: https://pypi.python.org/pypi/M2Crypto
 WWW: http://chandlerproject.org/Projects/MeTooCrypto
diff --git a/security/py-m2crypto/pkg-plist b/security/py-m2crypto/pkg-plist
deleted file mode 100644
index a92ba6076c39..000000000000
--- a/security/py-m2crypto/pkg-plist
+++ /dev/null
@@ -1,130 +0,0 @@
-%%PYTHON_SITELIBDIR%%/M2Crypto/ASN1.py
-%%PYTHON_SITELIBDIR%%/M2Crypto/ASN1.pyc
-%%PYTHON_SITELIBDIR%%/M2Crypto/ASN1.pyo
-%%PYTHON_SITELIBDIR%%/M2Crypto/AuthCookie.py
-%%PYTHON_SITELIBDIR%%/M2Crypto/AuthCookie.pyc
-%%PYTHON_SITELIBDIR%%/M2Crypto/AuthCookie.pyo
-%%PYTHON_SITELIBDIR%%/M2Crypto/BIO.py
-%%PYTHON_SITELIBDIR%%/M2Crypto/BIO.pyc
-%%PYTHON_SITELIBDIR%%/M2Crypto/BIO.pyo
-%%PYTHON_SITELIBDIR%%/M2Crypto/BN.py
-%%PYTHON_SITELIBDIR%%/M2Crypto/BN.pyc
-%%PYTHON_SITELIBDIR%%/M2Crypto/BN.pyo
-%%PYTHON_SITELIBDIR%%/M2Crypto/DH.py
-%%PYTHON_SITELIBDIR%%/M2Crypto/DH.pyc
-%%PYTHON_SITELIBDIR%%/M2Crypto/DH.pyo
-%%PYTHON_SITELIBDIR%%/M2Crypto/DSA.py
-%%PYTHON_SITELIBDIR%%/M2Crypto/DSA.pyc
-%%PYTHON_SITELIBDIR%%/M2Crypto/DSA.pyo
-%%PYTHON_SITELIBDIR%%/M2Crypto/EC.py
-%%PYTHON_SITELIBDIR%%/M2Crypto/EC.pyc
-%%PYTHON_SITELIBDIR%%/M2Crypto/EC.pyo
-%%PYTHON_SITELIBDIR%%/M2Crypto/EVP.py
-%%PYTHON_SITELIBDIR%%/M2Crypto/EVP.pyc
-%%PYTHON_SITELIBDIR%%/M2Crypto/EVP.pyo
-%%PYTHON_SITELIBDIR%%/M2Crypto/Engine.py
-%%PYTHON_SITELIBDIR%%/M2Crypto/Engine.pyc
-%%PYTHON_SITELIBDIR%%/M2Crypto/Engine.pyo
-%%PYTHON_SITELIBDIR%%/M2Crypto/Err.py
-%%PYTHON_SITELIBDIR%%/M2Crypto/Err.pyc
-%%PYTHON_SITELIBDIR%%/M2Crypto/Err.pyo
-%%PYTHON_SITELIBDIR%%/M2Crypto/PGP/PublicKey.py
-%%PYTHON_SITELIBDIR%%/M2Crypto/PGP/PublicKey.pyc
-%%PYTHON_SITELIBDIR%%/M2Crypto/PGP/PublicKey.pyo
-%%PYTHON_SITELIBDIR%%/M2Crypto/PGP/PublicKeyRing.py
-%%PYTHON_SITELIBDIR%%/M2Crypto/PGP/PublicKeyRing.pyc
-%%PYTHON_SITELIBDIR%%/M2Crypto/PGP/PublicKeyRing.pyo
-%%PYTHON_SITELIBDIR%%/M2Crypto/PGP/RSA.py
-%%PYTHON_SITELIBDIR%%/M2Crypto/PGP/RSA.pyc
-%%PYTHON_SITELIBDIR%%/M2Crypto/PGP/RSA.pyo
-%%PYTHON_SITELIBDIR%%/M2Crypto/PGP/__init__.py
-%%PYTHON_SITELIBDIR%%/M2Crypto/PGP/__init__.pyc
-%%PYTHON_SITELIBDIR%%/M2Crypto/PGP/__init__.pyo
-%%PYTHON_SITELIBDIR%%/M2Crypto/PGP/constants.py
-%%PYTHON_SITELIBDIR%%/M2Crypto/PGP/constants.pyc
-%%PYTHON_SITELIBDIR%%/M2Crypto/PGP/constants.pyo
-%%PYTHON_SITELIBDIR%%/M2Crypto/PGP/packet.py
-%%PYTHON_SITELIBDIR%%/M2Crypto/PGP/packet.pyc
-%%PYTHON_SITELIBDIR%%/M2Crypto/PGP/packet.pyo
-%%PYTHON_SITELIBDIR%%/M2Crypto/RC4.py
-%%PYTHON_SITELIBDIR%%/M2Crypto/RC4.pyc
-%%PYTHON_SITELIBDIR%%/M2Crypto/RC4.pyo
-%%PYTHON_SITELIBDIR%%/M2Crypto/RSA.py
-%%PYTHON_SITELIBDIR%%/M2Crypto/RSA.pyc
-%%PYTHON_SITELIBDIR%%/M2Crypto/RSA.pyo
-%%PYTHON_SITELIBDIR%%/M2Crypto/Rand.py
-%%PYTHON_SITELIBDIR%%/M2Crypto/Rand.pyc
-%%PYTHON_SITELIBDIR%%/M2Crypto/Rand.pyo
-%%PYTHON_SITELIBDIR%%/M2Crypto/SMIME.py
-%%PYTHON_SITELIBDIR%%/M2Crypto/SMIME.pyc
-%%PYTHON_SITELIBDIR%%/M2Crypto/SMIME.pyo
-%%PYTHON_SITELIBDIR%%/M2Crypto/SSL/Checker.py
-%%PYTHON_SITELIBDIR%%/M2Crypto/SSL/Checker.pyc
-%%PYTHON_SITELIBDIR%%/M2Crypto/SSL/Checker.pyo
-%%PYTHON_SITELIBDIR%%/M2Crypto/SSL/Cipher.py
-%%PYTHON_SITELIBDIR%%/M2Crypto/SSL/Cipher.pyc
-%%PYTHON_SITELIBDIR%%/M2Crypto/SSL/Cipher.pyo
-%%PYTHON_SITELIBDIR%%/M2Crypto/SSL/Connection.py
-%%PYTHON_SITELIBDIR%%/M2Crypto/SSL/Connection.pyc
-%%PYTHON_SITELIBDIR%%/M2Crypto/SSL/Connection.pyo
-%%PYTHON_SITELIBDIR%%/M2Crypto/SSL/Context.py
-%%PYTHON_SITELIBDIR%%/M2Crypto/SSL/Context.pyc
-%%PYTHON_SITELIBDIR%%/M2Crypto/SSL/Context.pyo
-%%PYTHON_SITELIBDIR%%/M2Crypto/SSL/SSLServer.py
-%%PYTHON_SITELIBDIR%%/M2Crypto/SSL/SSLServer.pyc
-%%PYTHON_SITELIBDIR%%/M2Crypto/SSL/SSLServer.pyo
-%%PYTHON_SITELIBDIR%%/M2Crypto/SSL/Session.py
-%%PYTHON_SITELIBDIR%%/M2Crypto/SSL/Session.pyc
-%%PYTHON_SITELIBDIR%%/M2Crypto/SSL/Session.pyo
-%%PYTHON_SITELIBDIR%%/M2Crypto/SSL/TwistedProtocolWrapper.py
-%%PYTHON_SITELIBDIR%%/M2Crypto/SSL/TwistedProtocolWrapper.pyc
-%%PYTHON_SITELIBDIR%%/M2Crypto/SSL/TwistedProtocolWrapper.pyo
-%%PYTHON_SITELIBDIR%%/M2Crypto/SSL/__init__.py
-%%PYTHON_SITELIBDIR%%/M2Crypto/SSL/__init__.pyc
-%%PYTHON_SITELIBDIR%%/M2Crypto/SSL/__init__.pyo
-%%PYTHON_SITELIBDIR%%/M2Crypto/SSL/cb.py
-%%PYTHON_SITELIBDIR%%/M2Crypto/SSL/cb.pyc
-%%PYTHON_SITELIBDIR%%/M2Crypto/SSL/cb.pyo
-%%PYTHON_SITELIBDIR%%/M2Crypto/SSL/ssl_dispatcher.py
-%%PYTHON_SITELIBDIR%%/M2Crypto/SSL/ssl_dispatcher.pyc
-%%PYTHON_SITELIBDIR%%/M2Crypto/SSL/ssl_dispatcher.pyo
-%%PYTHON_SITELIBDIR%%/M2Crypto/SSL/timeout.py
-%%PYTHON_SITELIBDIR%%/M2Crypto/SSL/timeout.pyc
-%%PYTHON_SITELIBDIR%%/M2Crypto/SSL/timeout.pyo
-%%PYTHON_SITELIBDIR%%/M2Crypto/X509.py
-%%PYTHON_SITELIBDIR%%/M2Crypto/X509.pyc
-%%PYTHON_SITELIBDIR%%/M2Crypto/X509.pyo
-%%PYTHON_SITELIBDIR%%/M2Crypto/__init__.py
-%%PYTHON_SITELIBDIR%%/M2Crypto/__init__.pyc
-%%PYTHON_SITELIBDIR%%/M2Crypto/__init__.pyo
-%%PYTHON_SITELIBDIR%%/M2Crypto/__m2crypto.so
-%%PYTHON_SITELIBDIR%%/M2Crypto/callback.py
-%%PYTHON_SITELIBDIR%%/M2Crypto/callback.pyc
-%%PYTHON_SITELIBDIR%%/M2Crypto/callback.pyo
-%%PYTHON_SITELIBDIR%%/M2Crypto/ftpslib.py
-%%PYTHON_SITELIBDIR%%/M2Crypto/ftpslib.pyc
-%%PYTHON_SITELIBDIR%%/M2Crypto/ftpslib.pyo
-%%PYTHON_SITELIBDIR%%/M2Crypto/httpslib.py
-%%PYTHON_SITELIBDIR%%/M2Crypto/httpslib.pyc
-%%PYTHON_SITELIBDIR%%/M2Crypto/httpslib.pyo
-%%PYTHON_SITELIBDIR%%/M2Crypto/m2.py
-%%PYTHON_SITELIBDIR%%/M2Crypto/m2.pyc
-%%PYTHON_SITELIBDIR%%/M2Crypto/m2.pyo
-%%PYTHON_SITELIBDIR%%/M2Crypto/m2urllib.py
-%%PYTHON_SITELIBDIR%%/M2Crypto/m2urllib.pyc
-%%PYTHON_SITELIBDIR%%/M2Crypto/m2urllib.pyo
-%%PYTHON_SITELIBDIR%%/M2Crypto/m2urllib2.py
-%%PYTHON_SITELIBDIR%%/M2Crypto/m2urllib2.pyc
-%%PYTHON_SITELIBDIR%%/M2Crypto/m2urllib2.pyo
-%%PYTHON_SITELIBDIR%%/M2Crypto/m2xmlrpclib.py
-%%PYTHON_SITELIBDIR%%/M2Crypto/m2xmlrpclib.pyc
-%%PYTHON_SITELIBDIR%%/M2Crypto/m2xmlrpclib.pyo
-%%PYTHON_SITELIBDIR%%/M2Crypto/threading.py
-%%PYTHON_SITELIBDIR%%/M2Crypto/threading.pyc
-%%PYTHON_SITELIBDIR%%/M2Crypto/threading.pyo
-%%PYTHON_SITELIBDIR%%/M2Crypto/util.py
-%%PYTHON_SITELIBDIR%%/M2Crypto/util.pyc
-%%PYTHON_SITELIBDIR%%/M2Crypto/util.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/M2Crypto/SSL
-@dirrm %%PYTHON_SITELIBDIR%%/M2Crypto/PGP
-@dirrm %%PYTHON_SITELIBDIR%%/M2Crypto