3 files changed, 10 insertions, 133 deletions

diff --git a/security/py-m2crypto/Makefile b/security/py-m2crypto/Makefile
index 436c68da700b..909e36475186 100644
--- a/security/py-m2crypto/Makefile
+++ b/security/py-m2crypto/Makefile
@@ -6,10 +6,12 @@
 #
 
 PORTNAME=	m2crypto
-PORTVERSION=	0.18.2
+PORTVERSION=	0.19.1
 CATEGORIES=	security python
-MASTER_SITES=	http://chandlerproject.org/pub/Projects/MeTooCrypto/
+MASTER_SITES=	CHEESESHOP \
+		http://chandlerproject.org/pub/Projects/MeTooCrypto/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=	M2Crypto-${PORTVERSION}
 DIST_SUBDIR=	python
 
 MAINTAINER=	mnag@FreeBSD.org
@@ -19,7 +21,8 @@ BUILD_DEPENDS=	swig1.3:${PORTSDIR}/devel/swig13
 
 USE_PYTHON=	2.3+
 USE_OPENSSL=	yes
-USE_PYDISTUTILS=yes
+USE_PYDISTUTILS=	easy_install
+PYEASYINSTALL_ARCHDEP=	yes
 PYDISTUTILS_PKGNAME=	M2Crypto
 
 .include <bsd.port.pre.mk>
diff --git a/security/py-m2crypto/distinfo b/security/py-m2crypto/distinfo
index fd565da7f161..6a79ae12a45a 100644
--- a/security/py-m2crypto/distinfo
+++ b/security/py-m2crypto/distinfo
@@ -1,3 +1,3 @@
-MD5 (python/m2crypto-0.18.2.tar.gz) = 445dce53fcfc7ec8f6fd31f54da8a067
-SHA256 (python/m2crypto-0.18.2.tar.gz) = 62ed44c8b2d392bdc757981ac37f05d808a0d917e4f9d95de2fbf3c2bdad41a7
-SIZE (python/m2crypto-0.18.2.tar.gz) = 386148
+MD5 (python/M2Crypto-0.19.1.tar.gz) = c92286fdf0a75f017e72122c2832d5ff
+SHA256 (python/M2Crypto-0.19.1.tar.gz) = a9cfce4ffc2690d35adf31e655fd89ee67590e222c84f75f2a62672e9c37aa27
+SIZE (python/M2Crypto-0.19.1.tar.gz) = 390933
diff --git a/security/py-m2crypto/pkg-plist b/security/py-m2crypto/pkg-plist
index 51892d5e9851..ddf68a1c022f 100644
--- a/security/py-m2crypto/pkg-plist
+++ b/security/py-m2crypto/pkg-plist
@@ -1,127 +1 @@
-%%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/Err.py
-%%PYTHON_SITELIBDIR%%/M2Crypto/Err.pyc
-%%PYTHON_SITELIBDIR%%/M2Crypto/Err.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/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
-%%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/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
-@dirrm %%PYTHON_SITELIBDIR%%/M2Crypto/PGP
-@dirrm %%PYTHON_SITELIBDIR%%/M2Crypto/SSL
-@dirrm %%PYTHON_SITELIBDIR%%/M2Crypto
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%