Fix packaging for python-3.x by using the same .so name for all

supported python versions (like py-cryptography). They are in
different paths anyway.

While here, sort PLIST and fix CONFLICTS line.

Bump PKGREVISION.

4 files changed, 21 insertions, 5 deletions

diff --git a/security/py-bcrypt/Makefile b/security/py-bcrypt/Makefile
index 872cd0f9781..25a3b02ff92 100644
--- a/security/py-bcrypt/Makefile
+++ b/security/py-bcrypt/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2015/04/19 00:50:02 rodent Exp $
+# $NetBSD: Makefile,v 1.7 2015/04/25 13:48:50 wiz Exp $
 
 DISTNAME=	bcrypt-1.1.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	python security
 MASTER_SITES=	https://pypi.python.org/packages/source/b/bcrypt/
 
@@ -14,7 +15,7 @@ DEPENDS+=	${PYPKGPREFIX}-cffi-[0-9]*:../../devel/py-cffi
 DEPENDS+=	${PYPKGPREFIX}-cparser-[0-9]*:../../devel/py-cparser
 DEPENDS+=	${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 
-CONFLICTS+=	${PYPKGPREFIX}-py-bcrypt-[0-9]*:../../security/py-py-bcrypt
+CONFLICTS+=	${PYPKGPREFIX}-py-bcrypt-[0-9]*
 
 .include "options.mk"
 
diff --git a/security/py-bcrypt/PLIST b/security/py-bcrypt/PLIST
index e6b3b4af22d..9d178425a4d 100644
--- a/security/py-bcrypt/PLIST
+++ b/security/py-bcrypt/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2015/04/04 21:49:17 rodent Exp $
-${PYSITELIB}/_bcrypt_cffi_6b390667x92a686ca.so
+@comment $NetBSD: PLIST,v 1.3 2015/04/25 13:48:50 wiz Exp $
+${PYSITELIB}/_bcrypt_cffi.so
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
diff --git a/security/py-bcrypt/distinfo b/security/py-bcrypt/distinfo
index 23f023b0556..97f4507e657 100644
--- a/security/py-bcrypt/distinfo
+++ b/security/py-bcrypt/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.2 2015/04/04 21:49:17 rodent Exp $
+$NetBSD: distinfo,v 1.3 2015/04/25 13:48:50 wiz Exp $
 
 SHA1 (bcrypt-1.1.1.tar.gz) = 38d9973aeb5f0cea17ce01e457b1b8eafdf85797
 RMD160 (bcrypt-1.1.1.tar.gz) = be0cc2e808392001c183190db5825800da1ea5ee
 Size (bcrypt-1.1.1.tar.gz) = 39714 bytes
+SHA1 (patch-bcrypt_____init____.py) = 7bbcb86c2245164b42ef52d25626943d3c3160f6
diff --git a/security/py-bcrypt/patches/patch-bcrypt_____init____.py b/security/py-bcrypt/patches/patch-bcrypt_____init____.py
new file mode 100644
index 00000000000..1a1294f7049
--- /dev/null
+++ b/security/py-bcrypt/patches/patch-bcrypt_____init____.py
@@ -0,0 +1,14 @@
+$NetBSD: patch-bcrypt_____init____.py,v 1.1 2015/04/25 13:48:50 wiz Exp $
+
+--- bcrypt/__init__.py.orig	2015-03-14 02:18:59.000000000 +0000
++++ bcrypt/__init__.py
+@@ -50,7 +50,8 @@ def _create_modulename(cdef_sources, sou
+     k1 = k1.lstrip('0x').rstrip('L')
+     k2 = hex(binascii.crc32(key[1::2]) & 0xffffffff)
+     k2 = k2.lstrip('0').rstrip('L')
+-    return '_bcrypt_cffi_{0}{1}'.format(k1, k2)
++    #return '_bcrypt_cffi_{0}{1}'.format(k1, k2)
++    return '_bcrypt_cffi'
+ 
+ 
+ def _compile_module(*args, **kwargs):