- Update to 0.16

- Update WWW

5 files changed, 19 insertions, 83 deletions

diff --git a/security/py-m2crypto/Makefile b/security/py-m2crypto/Makefile
index 523ae64ee4f2..4ba0f6d99aea 100644
--- a/security/py-m2crypto/Makefile
+++ b/security/py-m2crypto/Makefile
@@ -6,25 +6,19 @@
 #
 
 PORTNAME=	m2crypto
-PORTVERSION=	0.13.1
+PORTVERSION=	0.16
 CATEGORIES=	security python
-MASTER_SITES=	http://sandbox.rulemaker.net/ngps/Dist/
+MASTER_SITES=	http://wiki.osafoundation.org/pub/Projects/MeTooCrypto/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.1$//}
-
-PATCH_SITES=	${MASTER_SITES}
 
 MAINTAINER=	mnag@FreeBSD.org
 COMMENT=	Crypto and SSL toolkit for Python
 
 BUILD_DEPENDS=	swig1.3:${PORTSDIR}/devel/swig13
 
-PATCHFILES+=	0.13p1.patch
-
 DIST_SUBDIR=	python
-USE_PYTHON=	yes
+USE_PYTHON=	2.3+
 USE_PYDISTUTILS=yes
-USE_ZIP=	yes
 USE_OPENSSL=	yes
 
 post-patch:
diff --git a/security/py-m2crypto/distinfo b/security/py-m2crypto/distinfo
index 2572cb62991d..ba8bc5d1fec6 100644
--- a/security/py-m2crypto/distinfo
+++ b/security/py-m2crypto/distinfo
@@ -1,6 +1,3 @@
-MD5 (python/m2crypto-0.13.zip) = be2790a34349ab452dddbcfe4c95606a
-SHA256 (python/m2crypto-0.13.zip) = c1c67839d4af290aecd8f7743312aacc0a39ae99757f0910918531ef9a63e14f
-SIZE (python/m2crypto-0.13.zip) = 410759
-MD5 (python/0.13p1.patch) = 4bc65c6cd30d01fa5ea5163b637464d5
-SHA256 (python/0.13p1.patch) = 2d491e912b6836ec2c1d131fe503b9920dc96a134c3542264df5b5565042f304
-SIZE (python/0.13p1.patch) = 1645
+MD5 (python/m2crypto-0.16.tar.gz) = 6fc06583a2be56fc2a46872a0540d78e
+SHA256 (python/m2crypto-0.16.tar.gz) = 9734e7b73eb538c9078fd180e9c9e386d6336bd934e53904f27fe1905746b5f9
+SIZE (python/m2crypto-0.16.tar.gz) = 347250
diff --git a/security/py-m2crypto/files/patch-setup.py b/security/py-m2crypto/files/patch-setup.py
deleted file mode 100644
index 3848aa024d10..000000000000
--- a/security/py-m2crypto/files/patch-setup.py
+++ /dev/null
@@ -1,59 +0,0 @@
---- setup.py.orig	Sun Mar 28 08:06:59 2004
-+++ setup.py	Fri Mar 18 22:44:10 2005
-@@ -12,56 +12,6 @@
- from distutils.core import setup, Extension
- from distutils.command import build_ext
- 
--# This copy of swig_sources is from Python 2.2.
--
--def swig_sources (self, sources):
--
--    """Walk the list of source files in 'sources', looking for SWIG
--    interface (.i) files.  Run SWIG on all that are found, and
--    return a modified 'sources' list with SWIG source files replaced
--    by the generated C (or C++) files.
--    """
--
--    new_sources = []
--    swig_sources = []
--    swig_targets = {}
--
--    # XXX this drops generated C/C++ files into the source tree, which
--    # is fine for developers who want to distribute the generated
--    # source -- but there should be an option to put SWIG output in
--    # the temp dir.
--
--    if self.swig_cpp:
--        target_ext = '.cpp'
--    else:
--        target_ext = '.c'
--
--    for source in sources:
--        (base, ext) = os.path.splitext(source)
--        if ext == ".i":             # SWIG interface file
--            new_sources.append(base + target_ext)
--            swig_sources.append(source)
--            swig_targets[source] = new_sources[-1]
--        else:
--            new_sources.append(source)
--
--    if not swig_sources:
--        return new_sources
--
--    swig = self.find_swig()
--    swig_cmd = [swig, "-python", "-ISWIG"]
--    if self.swig_cpp:
--        swig_cmd.append("-c++")
--
--    for source in swig_sources:
--        target = swig_targets[source]
--        self.announce("swigging %s to %s" % (source, target))
--        self.spawn(swig_cmd + ["-o", target, source])
--
--    return new_sources
--
--build_ext.build_ext.swig_sources = swig_sources
--
- my_inc = os.path.join(os.getcwd(), 'SWIG')
- 
- if os.name == 'nt':
diff --git a/security/py-m2crypto/pkg-descr b/security/py-m2crypto/pkg-descr
index 964128e86728..15cf24f9b4cc 100644
--- a/security/py-m2crypto/pkg-descr
+++ b/security/py-m2crypto/pkg-descr
@@ -9,6 +9,4 @@ M2Crypto is a crypto and SSL toolkit for Python featuring the following:
 * ZServerSSL: A HTTPS server for Zope.
 * ZSmime: An S/MIME messenger for Zope.
 
-WWW: http://sandbox.rulemaker.net/ngps/m2/
-
-Marcus Alves Grando <mnag@FreeBSD.org>
+WWW:	http://wiki.osafoundation.org/bin/view/Projects/MeTooCrypto
diff --git a/security/py-m2crypto/pkg-plist b/security/py-m2crypto/pkg-plist
index 64e3760d1d71..55028bf3ac83 100644
--- a/security/py-m2crypto/pkg-plist
+++ b/security/py-m2crypto/pkg-plist
@@ -7,12 +7,18 @@
 %%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
@@ -62,9 +68,6 @@
 %%PYTHON_SITELIBDIR%%/M2Crypto/util.py
 %%PYTHON_SITELIBDIR%%/M2Crypto/util.pyc
 %%PYTHON_SITELIBDIR%%/M2Crypto/util.pyo
-%%PYTHON_SITELIBDIR%%/M2Crypto/_version.py
-%%PYTHON_SITELIBDIR%%/M2Crypto/_version.pyc
-%%PYTHON_SITELIBDIR%%/M2Crypto/_version.pyo
 %%PYTHON_SITELIBDIR%%/M2Crypto/PGP/PublicKey.py
 %%PYTHON_SITELIBDIR%%/M2Crypto/PGP/PublicKey.pyc
 %%PYTHON_SITELIBDIR%%/M2Crypto/PGP/PublicKey.pyo
@@ -83,6 +86,9 @@
 %%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
@@ -92,15 +98,15 @@
 %%PYTHON_SITELIBDIR%%/M2Crypto/SSL/Context.py
 %%PYTHON_SITELIBDIR%%/M2Crypto/SSL/Context.pyc
 %%PYTHON_SITELIBDIR%%/M2Crypto/SSL/Context.pyo
-%%PYTHON_SITELIBDIR%%/M2Crypto/SSL/Error.py
-%%PYTHON_SITELIBDIR%%/M2Crypto/SSL/Error.pyc
-%%PYTHON_SITELIBDIR%%/M2Crypto/SSL/Error.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