Updated to 0.22.3. No ChangeLog. Remove python/extension.mk from Makefile,

since egg.mk includes that. PGP module seems to have been removed from
package.

4 files changed, 16 insertions, 36 deletions

diff --git a/security/py-m2crypto/Makefile b/security/py-m2crypto/Makefile
index be07ccd1080..5a8a092cfab 100644
--- a/security/py-m2crypto/Makefile
+++ b/security/py-m2crypto/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2014/05/09 07:37:18 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2014/06/01 23:51:25 rodent Exp $
 
-DISTNAME=		M2Crypto-0.21.1
+DISTNAME=		M2Crypto-0.22.3
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME:tl}
-PKGREVISION=		3
 CATEGORIES=		security python
 MASTER_SITES=		http://pypi.python.org/packages/source/M/M2Crypto/
 
@@ -21,7 +20,6 @@ PYSETUPBUILDARGS=	build_ext --openssl=${BUILDLINK_PREFIX.openssl}
 
 PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # not yet ported as of 0.21.1
 
-.include "../../lang/python/extension.mk"
 .include "../../lang/python/egg.mk"
 .include "../../devel/swig/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
diff --git a/security/py-m2crypto/PLIST b/security/py-m2crypto/PLIST
index 1ea8b22bd85..284222010ae 100644
--- a/security/py-m2crypto/PLIST
+++ b/security/py-m2crypto/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2012/10/05 10:14:46 apb Exp $
+@comment $NetBSD: PLIST,v 1.7 2014/06/01 23:51:25 rodent Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
@@ -33,24 +33,6 @@ ${PYSITELIB}/M2Crypto/Engine.pyo
 ${PYSITELIB}/M2Crypto/Err.py
 ${PYSITELIB}/M2Crypto/Err.pyc
 ${PYSITELIB}/M2Crypto/Err.pyo
-${PYSITELIB}/M2Crypto/PGP/PublicKey.py
-${PYSITELIB}/M2Crypto/PGP/PublicKey.pyc
-${PYSITELIB}/M2Crypto/PGP/PublicKey.pyo
-${PYSITELIB}/M2Crypto/PGP/PublicKeyRing.py
-${PYSITELIB}/M2Crypto/PGP/PublicKeyRing.pyc
-${PYSITELIB}/M2Crypto/PGP/PublicKeyRing.pyo
-${PYSITELIB}/M2Crypto/PGP/RSA.py
-${PYSITELIB}/M2Crypto/PGP/RSA.pyc
-${PYSITELIB}/M2Crypto/PGP/RSA.pyo
-${PYSITELIB}/M2Crypto/PGP/__init__.py
-${PYSITELIB}/M2Crypto/PGP/__init__.pyc
-${PYSITELIB}/M2Crypto/PGP/__init__.pyo
-${PYSITELIB}/M2Crypto/PGP/constants.py
-${PYSITELIB}/M2Crypto/PGP/constants.pyc
-${PYSITELIB}/M2Crypto/PGP/constants.pyo
-${PYSITELIB}/M2Crypto/PGP/packet.py
-${PYSITELIB}/M2Crypto/PGP/packet.pyc
-${PYSITELIB}/M2Crypto/PGP/packet.pyo
 ${PYSITELIB}/M2Crypto/RC4.py
 ${PYSITELIB}/M2Crypto/RC4.pyc
 ${PYSITELIB}/M2Crypto/RC4.pyo
diff --git a/security/py-m2crypto/distinfo b/security/py-m2crypto/distinfo
index d3044375882..f434d87992a 100644
--- a/security/py-m2crypto/distinfo
+++ b/security/py-m2crypto/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2012/01/22 10:05:19 apb Exp $
+$NetBSD: distinfo,v 1.7 2014/06/01 23:51:25 rodent Exp $
 
-SHA1 (M2Crypto-0.21.1.tar.gz) = 3c7135b952092e4f2eee7a94c5153319cccba94e
-RMD160 (M2Crypto-0.21.1.tar.gz) = 313dcab450846a0363e7192a10364bdfd5dfae85
-Size (M2Crypto-0.21.1.tar.gz) = 413563 bytes
-SHA1 (patch-setup.py) = 9a1952e842353ab3ddf32482f34c7dbe705cd56d
+SHA1 (M2Crypto-0.22.3.tar.gz) = c5e39d928aff7a47e6d82624210a7a31b8220a50
+RMD160 (M2Crypto-0.22.3.tar.gz) = 3ba7498308949f4c40c7eb8b649d575afd665a55
+Size (M2Crypto-0.22.3.tar.gz) = 74795 bytes
+SHA1 (patch-setup.py) = 994ddaa88ef942967d344d84b34f0cbed2778910
diff --git a/security/py-m2crypto/patches/patch-setup.py b/security/py-m2crypto/patches/patch-setup.py
index 882a3953d94..b5e645c0eb0 100644
--- a/security/py-m2crypto/patches/patch-setup.py
+++ b/security/py-m2crypto/patches/patch-setup.py
@@ -1,17 +1,17 @@
-$NetBSD: patch-setup.py,v 1.1 2012/01/22 10:05:19 apb Exp $
+$NetBSD: patch-setup.py,v 1.2 2014/06/01 23:51:25 rodent Exp $
 
 Don't pass "-includeall" to swig.  It causes compiler-dependent
 tests in system include files to break (e.g. "#ifdef __GNUC__"
 doesn't work properly.)
 
---- setup.py.orig	2011-01-15 19:10:06.000000000 +0000
+--- setup.py.orig	2014-01-22 19:36:53.000000000 +0000
 +++ setup.py
-@@ -54,7 +54,7 @@ class _M2CryptoBuildExt(build_ext.build_
-         
+@@ -75,7 +75,7 @@ class _M2CryptoBuildExt(build_ext.build_
+ 
          self.swig_opts = ['-I%s' % i for i in self.include_dirs + \
-                           [opensslIncludeDir]]
+                           [opensslIncludeDir, os.path.join(opensslIncludeDir, "openssl")]]
 -        self.swig_opts.append('-includeall')
 +        #self.swig_opts.append('-includeall')
-         #self.swig_opts.append('-D__i386__') # Uncomment for early OpenSSL 0.9.7 versions, or on Fedora Core if build fails
-         #self.swig_opts.append('-DOPENSSL_NO_EC') # Try uncommenting if you can't build with EC disabled
-         
+         self.swig_opts.append('-modern')
+ 
+         # Fedora does hat tricks.