--- Makefile.org	Tue Jul  1 09:27:35 2003
+++ Makefile	Tue Jul  1 09:40:21 2003
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	m2crypto
-PORTVERSION=	0.06
+PORTVERSION=	0.11
 PORTREVISION=	1
 CATEGORIES=	security python
 MASTER_SITES=	http://www.post1.com/home/ngps/m2/
@@ -14,14 +14,12 @@
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ngps@post1.com
-COMMENT=	Python wrapper for OpenSSL
-
-BROKEN=		"Does not compile"
+COMMENT=	Crypto and SSL toolkit for Python
 
 BUILD_DEPENDS=	swig1.3:${PORTSDIR}/devel/swig13 \
 		pinstall:${PORTSDIR}/devel/pinstall
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/swig
+WRKSRC=		${WRKDIR}/${DISTNAME}/SWIG
 USE_PYTHON=	yes
 USE_ZIP=	yes
 USE_OPENSSL=	yes
--- distinfo.org	Tue Jul  1 09:27:35 2003
+++ distinfo	Tue Jul  1 09:27:35 2003
@@ -1 +1 @@
-MD5 (m2crypto-0.06.zip) = 58eefec00424bafe3a80bc1c9cf4e010
+MD5 (m2crypto-0.11.zip) = c018c94e00b33aac969fbbe02b244aba
--- pkg-descr.org	Tue Jul  1 09:27:35 2003
+++ pkg-descr	Tue Jul  1 10:02:19 2003
@@ -1,8 +1,16 @@
-M2Crypto is a Python wrapper for OpenSSL.
-It makes accessible to the Python programmer the following:
+M2Crypto is a crypto and SSL toolkit for Python:
 
-    - DH, RSA, DSA, symmetric ciphers, message digests, HMACs.
-    - SSL functionality to implement clients and servers.
+    - DH, RSA, DSA, symmetric ciphers including AES, message digests, HMACs.
+    - SSL functionality to implement clients and servers, with examples.
+    - HTTPS extensions to Python's httplib, urllib and xmlrpclib.
+    - Unforgeable HMAC'ing AuthCookies for web session management.
+    - FTP/TLS client and server.
     - S/MIME v2.
+    - ZServerSSL: A HTTPS server for Zope.
+    - ZSmime: An S/MIME messenger for Zope.
 
 WWW: http://www.post1.com/home/ngps/m2/
+
+Ng Pheng Siong
+ngps@post1.com
+
--- pkg-plist.org	Tue Jul  1 09:27:35 2003
+++ pkg-plist	Tue Jul  1 09:55:06 2003
@@ -1,27 +1,47 @@
 lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/ASN1.py
 lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/ASN1.pyc
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/AuthCookie.py
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/AuthCookie.pyc
 lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/BIO.py
 lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/BIO.pyc
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/callback.py
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/callback.pyc
 lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/DH.py
 lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/DH.pyc
 lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/DSA.py
 lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/DSA.pyc
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/Err.py
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/Err.pyc
 lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/EVP.py
 lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/EVP.pyc
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/Err.py
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/Err.pyc
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/RC4.py
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/RC4.pyc
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/RSA.py
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/RSA.pyc
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/Rand.py
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/Rand.pyc
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/SMIME.py
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/SMIME.pyc
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/X509.py
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/X509.pyc
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/__m2crypto.so
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/_m2crypto.py
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/callback.py
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/callback.pyc
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/ftpslib.py
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/ftpslib.pyc
 lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/httpslib.py
 lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/httpslib.pyc
 lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/m2.py
 lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/m2.pyc
 lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/m2urllib.py
 lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/m2urllib.pyc
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/PGP/constants.py
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/PGP/constants.pyc
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/PGP/packet.py
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/PGP/packet.pyc
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/m2xmlrpclib.py
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/m2xmlrpclib.pyc
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/threading.py
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/threading.pyc
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/util.py
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/util.pyc
 lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/PGP/PublicKey.py
 lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/PGP/PublicKey.pyc
 lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/PGP/PublicKeyRing.py
@@ -30,51 +50,35 @@
 lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/PGP/RSA.pyc
 lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/PGP/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/PGP/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/Rand.py
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/Rand.pyc
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/RC4.py
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/RC4.pyc
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/RSA.py
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/RSA.pyc
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/SMIME.py
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/SMIME.pyc
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/SSL/cb.py
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/SSL/cb.pyc
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/PGP/constants.py
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/PGP/constants.pyc
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/PGP/packet.py
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/PGP/packet.pyc
 lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/SSL/Cipher.py
 lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/SSL/Cipher.pyc
 lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/SSL/Connection.py
 lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/SSL/Connection.pyc
 lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/SSL/Context.py
 lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/SSL/Context.pyc
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/SSL/Session.py
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/SSL/Session.pyc
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/SSL/Error.py
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/SSL/Error.pyc
 lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/SSL/SSLServer.py
 lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/SSL/SSLServer.pyc
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/SSL/Session.py
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/SSL/Session.pyc
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/SSL/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/SSL/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/SSL/cb.py
+lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/SSL/cb.pyc
 lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/SSL/ssl_dispatcher.py
 lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/SSL/ssl_dispatcher.pyc
 lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/SSL/timeout.py
 lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/SSL/timeout.pyc
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/SSL/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/SSL/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/SSL/Error.py
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/SSL/Error.pyc
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/threading.py
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/threading.pyc
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/util.py
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/util.pyc
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/X509.py
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/X509.pyc
 lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/XML/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/XML/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/m2xmlrpclib.py
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/m2xmlrpclib.pyc
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/_m2cryptoc.so
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/_m2crypto.py
-lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/_m2crypto.pyc
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/PGP
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/SSL
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/XML/dsig
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/M2Crypto/XML
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/M2Crypto
+