4 files changed, 25 insertions, 14 deletions
diff --git a/security/py-cryptopp/Makefile b/security/py-cryptopp/Makefile
index ec1ed29a2c3..eef5e8bb47f 100644
--- a/security/py-cryptopp/Makefile
+++ b/security/py-cryptopp/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2010/09/24 18:10:46 gdt Exp $
+# $NetBSD: Makefile,v 1.5 2012/02/18 21:18:02 gls Exp $
 #
 
-VERSION=	0.5.25
+VERSION=	0.5.29
 DISTNAME=	pycryptopp-${VERSION}
 PKGNAME=	${PYPKGPREFIX}-cryptopp-${VERSION}
 CATEGORIES=	security python
@@ -15,5 +15,10 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LANGUAGES=	c c++
 
+REPLACE_INTERPRETER+=  python
+REPLACE.python.old=    /usr/bin/env python
+REPLACE.python.new=    ${PYTHONBIN}
+REPLACE_FILES.python=  pycryptopp/test/*.py
+
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/py-cryptopp/PLIST b/security/py-cryptopp/PLIST
index fcce511c1ff..34fbbe21337 100644
--- a/security/py-cryptopp/PLIST
+++ b/security/py-cryptopp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2010/07/23 23:17:48 gdt Exp $
+@comment $NetBSD: PLIST,v 1.3 2012/02/18 21:18:02 gls Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
@@ -43,12 +43,18 @@ ${PYSITELIB}/pycryptopp/test/test_aes.pyo
 ${PYSITELIB}/pycryptopp/test/test_ecdsa.py
 ${PYSITELIB}/pycryptopp/test/test_ecdsa.pyc
 ${PYSITELIB}/pycryptopp/test/test_ecdsa.pyo
+${PYSITELIB}/pycryptopp/test/test_from_Nikratio.py
+${PYSITELIB}/pycryptopp/test/test_from_Nikratio.pyc
+${PYSITELIB}/pycryptopp/test/test_from_Nikratio.pyo
 ${PYSITELIB}/pycryptopp/test/test_rsa.py
 ${PYSITELIB}/pycryptopp/test/test_rsa.pyc
 ${PYSITELIB}/pycryptopp/test/test_rsa.pyo
 ${PYSITELIB}/pycryptopp/test/test_sha256.py
 ${PYSITELIB}/pycryptopp/test/test_sha256.pyc
 ${PYSITELIB}/pycryptopp/test/test_sha256.pyo
+${PYSITELIB}/pycryptopp/test/test_startup.py
+${PYSITELIB}/pycryptopp/test/test_startup.pyc
+${PYSITELIB}/pycryptopp/test/test_startup.pyo
 ${PYSITELIB}/pycryptopp/testvectors/KAT_AES/ECBGFSbox128e.txt
 ${PYSITELIB}/pycryptopp/testvectors/KAT_AES/ECBGFSbox256e.txt
 ${PYSITELIB}/pycryptopp/testvectors/KAT_AES/ECBKeySbox128e.txt
diff --git a/security/py-cryptopp/distinfo b/security/py-cryptopp/distinfo
index 7bae81ccc01..90fbe1c1e64 100644
--- a/security/py-cryptopp/distinfo
+++ b/security/py-cryptopp/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2010/09/24 18:10:46 gdt Exp $
+$NetBSD: distinfo,v 1.3 2012/02/18 21:18:02 gls Exp $
 
-SHA1 (pycryptopp-0.5.25.tar.gz) = eba08385397a5a5fd172f8e271a07c9c4e79d52b
-RMD160 (pycryptopp-0.5.25.tar.gz) = 167dcebf24ae0fa3f371cbbddd526a2adda1a631
-Size (pycryptopp-0.5.25.tar.gz) = 1125824 bytes
-SHA1 (patch-aa) = 24090e39c58807588fb5893318d7f92bf13b0af7
+SHA1 (pycryptopp-0.5.29.tar.gz) = 53127f9f9748c159f99700684c86098c2e96573d
+RMD160 (pycryptopp-0.5.29.tar.gz) = 99e081c5c21a735777f093965dbc5638a25f0749
+Size (pycryptopp-0.5.29.tar.gz) = 1114525 bytes
+SHA1 (patch-aa) = 144552faf822cd224e30dd849a35505c70946a47
diff --git a/security/py-cryptopp/patches/patch-aa b/security/py-cryptopp/patches/patch-aa
index f4733df835f..747d0b9ea49 100644
--- a/security/py-cryptopp/patches/patch-aa
+++ b/security/py-cryptopp/patches/patch-aa
@@ -1,16 +1,16 @@
-$NetBSD: patch-aa,v 1.1 2010/09/24 18:10:46 gdt Exp $
+$NetBSD: patch-aa,v 1.2 2012/02/18 21:18:02 gls Exp $
 
 Don't install odd version file in a strange place.
 Reported to tahoe development mailinglist.
 
---- setup.py.orig	2010-09-21 06:59:37.000000000 +0000
+--- setup.py.orig	2011-01-16 04:24:28.000000000 +0000
 +++ setup.py
-@@ -254,7 +254,7 @@ data_files = [(doc_loc, data_fnames)]
+@@ -260,7 +260,7 @@ data_files = [(doc_loc, data_fnames)]
  # Note that due to a bug in distutils we also have to maintain a
- # MANIFEST.in file specifying cryptopp/extraversion.h. This bug was
+ # MANIFEST.in file specifying embeddedcryptopp/extraversion.h. This bug was
  # fixed in Python 2.7
--data_files.append(('cryptopp', ['cryptopp/extraversion.h']))
-+#data_files.append(('cryptopp', ['cryptopp/extraversion.h']))
+-data_files.append((EMBEDDED_CRYPTOPP_DIR, [EMBEDDED_CRYPTOPP_DIR+'/extraversion.h']))
++# data_files.append((EMBEDDED_CRYPTOPP_DIR, [EMBEDDED_CRYPTOPP_DIR+'/extraversion.h']))
  
  if ECDSA:
      long_description='RSA-PSS-SHA256 signatures, ECDSA(1363)/EMSA1(SHA-256) signatures, SHA-256 hashes, and AES-CTR encryption'