update to 1.9a4

Many changes since 0.1.3, compatibility is not provided, so this is
more or less a new pkg.

4 files changed, 24 insertions, 62 deletions

diff --git a/security/py-amkCrypto/Makefile b/security/py-amkCrypto/Makefile
index 04a591febd8..9f21de6f49c 100644
--- a/security/py-amkCrypto/Makefile
+++ b/security/py-amkCrypto/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2002/10/25 09:45:12 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2002/10/28 11:53:29 drochner Exp $
 #
 
-DISTNAME=	amkCrypto-0.1.3
-PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
+DISTNAME=	pycrypto-1.9a4
+PKGNAME=	${PYPKGPREFIX}-amkCrypto-1.9a4
 CATEGORIES=	security
 MASTER_SITES=	http://www.amk.ca/files/python/
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.amk.ca/python/code/crypto.html
@@ -15,13 +14,6 @@ USE_BUILDLINK2=	yes
 PYBINMODULE=	yes
 PYDISTUTILSPKG=	yes
 
-CONFIGURE_ENV+=	SSLBASE=${SSLBASE}
-
-do-configure:
-	${SED} -e "s|/usr/local/ssl|${SSLBASE}|g"                  \
-		${WRKSRC}/setup.py > ${WRKSRC}/setup.py.tmp
-	${MV} -f ${WRKSRC}/setup.py.tmp ${WRKSRC}/setup.py
-
 .include "../../security/openssl/buildlink2.mk"
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/py-amkCrypto/PLIST b/security/py-amkCrypto/PLIST
index 96f8d50fab8..82f35bbbb6f 100644
--- a/security/py-amkCrypto/PLIST
+++ b/security/py-amkCrypto/PLIST
@@ -1,40 +1,31 @@
-@comment $NetBSD: PLIST,v 1.2 2002/01/17 13:02:44 drochner Exp $
-${PYSITELIB}/Crypto/Cipher/ARC2.py
-${PYSITELIB}/Crypto/Cipher/ARC2.pyc
-${PYSITELIB}/Crypto/Cipher/ARC4.py
-${PYSITELIB}/Crypto/Cipher/ARC4.pyc
-${PYSITELIB}/Crypto/Cipher/Blowfish.py
-${PYSITELIB}/Crypto/Cipher/Blowfish.pyc
-${PYSITELIB}/Crypto/Cipher/CAST.py
-${PYSITELIB}/Crypto/Cipher/CAST.pyc
-${PYSITELIB}/Crypto/Cipher/DES.py
-${PYSITELIB}/Crypto/Cipher/DES.pyc
-${PYSITELIB}/Crypto/Cipher/DES3.py
-${PYSITELIB}/Crypto/Cipher/DES3.pyc
-${PYSITELIB}/Crypto/Cipher/IDEA.py
-${PYSITELIB}/Crypto/Cipher/IDEA.pyc
-${PYSITELIB}/Crypto/Cipher/RC5.py
-${PYSITELIB}/Crypto/Cipher/RC5.pyc
+@comment $NetBSD: PLIST,v 1.3 2002/10/28 11:53:29 drochner Exp $
+${PYSITELIB}/Crypto/Cipher/AES.so
+${PYSITELIB}/Crypto/Cipher/ARC2.so
+${PYSITELIB}/Crypto/Cipher/ARC4.so
+${PYSITELIB}/Crypto/Cipher/Blowfish.so
+${PYSITELIB}/Crypto/Cipher/CAST.so
+${PYSITELIB}/Crypto/Cipher/DES.so
+${PYSITELIB}/Crypto/Cipher/DES3.so
+${PYSITELIB}/Crypto/Cipher/IDEA.so
+${PYSITELIB}/Crypto/Cipher/RC5.so
+${PYSITELIB}/Crypto/Cipher/XOR.so
 ${PYSITELIB}/Crypto/Cipher/__init__.py
 ${PYSITELIB}/Crypto/Cipher/__init__.pyc
-${PYSITELIB}/Crypto/Ciphers.py
-${PYSITELIB}/Crypto/Ciphers.pyc
 ${PYSITELIB}/Crypto/Hash/HMAC.py
 ${PYSITELIB}/Crypto/Hash/HMAC.pyc
-${PYSITELIB}/Crypto/Hash/MD2.py
-${PYSITELIB}/Crypto/Hash/MD2.pyc
+${PYSITELIB}/Crypto/Hash/MD2.so
+${PYSITELIB}/Crypto/Hash/MD4.so
 ${PYSITELIB}/Crypto/Hash/MD5.py
 ${PYSITELIB}/Crypto/Hash/MD5.pyc
-${PYSITELIB}/Crypto/Hash/RIPEMD.py
-${PYSITELIB}/Crypto/Hash/RIPEMD.pyc
+${PYSITELIB}/Crypto/Hash/RIPEMD.so
 ${PYSITELIB}/Crypto/Hash/SHA.py
 ${PYSITELIB}/Crypto/Hash/SHA.pyc
 ${PYSITELIB}/Crypto/Hash/__init__.py
 ${PYSITELIB}/Crypto/Hash/__init__.pyc
-${PYSITELIB}/Crypto/Hashes.py
-${PYSITELIB}/Crypto/Hashes.pyc
 ${PYSITELIB}/Crypto/Protocol/AllOrNothing.py
 ${PYSITELIB}/Crypto/Protocol/AllOrNothing.pyc
+${PYSITELIB}/Crypto/Protocol/Chaffing.py
+${PYSITELIB}/Crypto/Protocol/Chaffing.pyc
 ${PYSITELIB}/Crypto/Protocol/__init__.py
 ${PYSITELIB}/Crypto/Protocol/__init__.pyc
 ${PYSITELIB}/Crypto/PublicKey/DSA.py
@@ -59,13 +50,10 @@ ${PYSITELIB}/Crypto/Util/randpool.py
 ${PYSITELIB}/Crypto/Util/randpool.pyc
 ${PYSITELIB}/Crypto/Util/test.py
 ${PYSITELIB}/Crypto/Util/test.pyc
-${PYSITELIB}/Crypto/Util/testdata.py
-${PYSITELIB}/Crypto/Util/testdata.pyc
-${PYSITELIB}/Crypto/Utils.py
-${PYSITELIB}/Crypto/Utils.pyc
 ${PYSITELIB}/Crypto/__init__.py
 ${PYSITELIB}/Crypto/__init__.pyc
-${PYSITELIB}/Crypto/mxCrypto.so
+${PYSITELIB}/Crypto/test.py
+${PYSITELIB}/Crypto/test.pyc
 @dirrm ${PYSITELIB}/Crypto/Util
 @dirrm ${PYSITELIB}/Crypto/PublicKey
 @dirrm ${PYSITELIB}/Crypto/Protocol
diff --git a/security/py-amkCrypto/distinfo b/security/py-amkCrypto/distinfo
index e33fd4ef94e..23478cef247 100644
--- a/security/py-amkCrypto/distinfo
+++ b/security/py-amkCrypto/distinfo
@@ -1,5 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2001/05/07 00:56:48 wiz Exp $
+$NetBSD: distinfo,v 1.2 2002/10/28 11:53:29 drochner Exp $
 
-SHA1 (amkCrypto-0.1.3.tgz) = aa50bc2df65dc21b50f7c2e801814a6f827738d1
-Size (amkCrypto-0.1.3.tgz) = 203870 bytes
-SHA1 (patch-aa) = 46fb8adcf355c0a001dce47720690245dafa4bf5
+SHA1 (pycrypto-1.9a4.tar.gz) = 0234ec4117e30875c20311c0677e09b7ff8195ff
+Size (pycrypto-1.9a4.tar.gz) = 143415 bytes
diff --git a/security/py-amkCrypto/patches/patch-aa b/security/py-amkCrypto/patches/patch-aa
deleted file mode 100644
index 0ccfce5b141..00000000000
--- a/security/py-amkCrypto/patches/patch-aa
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/05/07 00:56:48 wiz Exp $
-
---- mxCrypto/Setup.orig	Fri Jan 21 02:01:19 2000
-+++ mxCrypto/Setup
-@@ -18,10 +18,10 @@
- mxCrypto \
- #
- # SSLeay Libs: 
--	-L/usr/local/ssl/lib -lcrypto \
-+	-Wl,-R${SSLBASE} -L${SSLBASE}/lib -lcrypto \
- #
- # SSLeay Include files: 
--	-I/usr/local/ssl/include \
-+	-I${SSLBASE}/include \
- #
- # Some C++ compiler setups "forget" to link to the c++ libs (noteably
- # on Solaris), so you might succeed in linking them in by hand: