Update converters/zbase32 to 1.1.3.

pkgsrc changes:
- /usr/bin/env python is no longer valid as an interpreter.

upstream changes:

Unknown.

3 files changed, 23 insertions, 18 deletions

diff --git a/converters/py-zbase32/Makefile b/converters/py-zbase32/Makefile
index 60454ccdf98..4520494e76c 100644
--- a/converters/py-zbase32/Makefile
+++ b/converters/py-zbase32/Makefile
@@ -1,19 +1,22 @@
-# $NetBSD: Makefile,v 1.3 2010/11/27 14:15:29 gdt Exp $
+# $NetBSD: Makefile,v 1.4 2012/02/12 20:02:53 gls Exp $
 #
 
-DISTNAME=	zbase32-1.1.2
+DISTNAME=	zbase32-1.1.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=	1
 CATEGORIES=	converters
 MASTER_SITES=	http://pypi.python.org/packages/source/z/zbase32/
 
 MAINTAINER=	gdt@ir.bbn.com
 HOMEPAGE=	http://pypi.python.org/pypi/zbase32/
-#HOMEPAGE=	http://tahoe-lafs.org/trac/zbase32
 COMMENT=	Alternate base32 encoder (not RFC 3548 compliant)
 LICENSE=	modified-bsd
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+REPLACE_INTERPRETER+=	python
+REPLACE.python.old=	/usr/bin/env python
+REPLACE.python.new=	${PYTHONBIN}
+REPLACE_FILES.python=	zbase32/zbase32.py zbase32/test/test_zbase32.py
+
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/converters/py-zbase32/distinfo b/converters/py-zbase32/distinfo
index 8c7f52d9fe2..9fa9b86e0b4 100644
--- a/converters/py-zbase32/distinfo
+++ b/converters/py-zbase32/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2010/11/27 14:15:29 gdt Exp $
+$NetBSD: distinfo,v 1.3 2012/02/12 20:02:53 gls Exp $
 
-SHA1 (zbase32-1.1.2.tar.gz) = 1535ccc3df1c6cfd70358b45d2a7615c35702451
-RMD160 (zbase32-1.1.2.tar.gz) = 6b57478da03c2f67fa006bad92193fe1ce0b3a17
-Size (zbase32-1.1.2.tar.gz) = 21541 bytes
-SHA1 (patch-aa) = 62d92be8605fc3e2930731de88d78146cfe22fd5
+SHA1 (zbase32-1.1.3.tar.gz) = f670104ca3baec60530151951116eb9cd7ef3542
+RMD160 (zbase32-1.1.3.tar.gz) = 7e009b5a2c35d75eb21a2a78284e4e557e027c04
+Size (zbase32-1.1.3.tar.gz) = 21241 bytes
+SHA1 (patch-aa) = de191fe27ff8d6c8472bca38d5e368daa8cc3496
diff --git a/converters/py-zbase32/patches/patch-aa b/converters/py-zbase32/patches/patch-aa
index 0315a7546b7..f029fb45abc 100644
--- a/converters/py-zbase32/patches/patch-aa
+++ b/converters/py-zbase32/patches/patch-aa
@@ -1,15 +1,17 @@
-$NetBSD: patch-aa,v 1.1 2010/11/27 14:15:29 gdt Exp $
+$NetBSD: patch-aa,v 1.2 2012/02/12 20:02:53 gls Exp $
 
 http://tahoe-lafs.org/trac/zfec/ticket/11#comment:2
 
---- setup.py.orig	2010-06-09 01:06:41.000000000 +0000
+--- setup.py.orig	2010-12-21 23:28:56.000000000 +0000
 +++ setup.py
-@@ -63,7 +63,7 @@ if 'darcsver' in sys.argv[1:]:
- # "sdist" or "bdist_egg"), unless there is a pyutil.egg-info/SOURCE.txt file
- # present which contains a complete list of files that should be included.
- # http://pypi.python.org/pypi/setuptools_darcs
--setup_requires.append('setuptools_darcs >= 1.1.0')
-+#setup_requires.append('setuptools_darcs >= 1.1.0')
+@@ -68,8 +68,8 @@ if 'darcsver' in sys.argv[1:]:
+ # Lucid, so for now you have to manually install it before building
+ # sdists or eggs:
+ # http://bitbucket.org/tarek/distribute/issue/55/revision-control-plugin-automatically-installed-as-a-build-dependency-is-not-present-when-another-build-dependency-is-being
+-if False:
+-    setup_requires.append('setuptools_darcs >= 1.1.0')
++#if False:
++#    setup_requires.append('setuptools_darcs >= 1.1.0')
+ 
  
  setup(name=PKG,
-       version=verstr,