Sun Sep 15 17:30:50 2013 UTC ()
Update to 1.1.5, and comment post-install rule.

-----
1.1.5
-----

* Issue #69: Second attempt at fix (logic was reversed).


(wiz)
diff -r1.32 -r1.33 pkgsrc/devel/py-setuptools/Makefile
diff -r1.14 -r1.15 pkgsrc/devel/py-setuptools/distinfo

cvs diff -r1.32 -r1.33 pkgsrc/devel/py-setuptools/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/py-setuptools/Makefile 2013/09/09 20:37:42 1.32
+++ pkgsrc/devel/py-setuptools/Makefile 2013/09/15 17:30:50 1.33
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.32 2013/09/09 20:37:42 wiz Exp $ 1# $NetBSD: Makefile,v 1.33 2013/09/15 17:30:50 wiz Exp $
2 2
3EGG_VERSION= 1.1.4 3EGG_VERSION= 1.1.5
4DISTNAME= setuptools-${EGG_VERSION} 4DISTNAME= setuptools-${EGG_VERSION}
5EGG_NAME= setuptools-${EGG_VERSION} 5EGG_NAME= setuptools-${EGG_VERSION}
6PKGNAME= ${PYPKGPREFIX}-setuptools-${EGG_VERSION} 6PKGNAME= ${PYPKGPREFIX}-setuptools-${EGG_VERSION}
7CATEGORIES= devel python 7CATEGORIES= devel python
8MASTER_SITES= http://pypi.python.org/packages/source/s/setuptools/ 8MASTER_SITES= http://pypi.python.org/packages/source/s/setuptools/
9 9
10MAINTAINER= joerg@NetBSD.org 10MAINTAINER= joerg@NetBSD.org
11HOMEPAGE= http://peak.telecommunity.com/DevCenter/setuptools 11HOMEPAGE= http://peak.telecommunity.com/DevCenter/setuptools
12COMMENT= New Python packaging system 12COMMENT= New Python packaging system
13LICENSE= python-software-foundation OR zpl 13LICENSE= python-software-foundation OR zpl
14 14
15PYDISTUTILSPKG= yes 15PYDISTUTILSPKG= yes
16PYTHON_VERSIONS_INCLUDE_3X= yes 16PYTHON_VERSIONS_INCLUDE_3X= yes
@@ -25,21 +25,22 @@ REPLACE_PYTHON= setuptools/command/easy @@ -25,21 +25,22 @@ REPLACE_PYTHON= setuptools/command/easy
25REPLACE_PYTHON+= setuptools/tests/test_resources.py 25REPLACE_PYTHON+= setuptools/tests/test_resources.py
26 26
27.include "../../mk/bsd.fast.prefs.mk" 27.include "../../mk/bsd.fast.prefs.mk"
28 28
29PYSETUPINSTALLARGS= --single-version-externally-managed 29PYSETUPINSTALLARGS= --single-version-externally-managed
30.if ${_USE_DESTDIR} == "no" 30.if ${_USE_DESTDIR} == "no"
31PYSETUPINSTALLARGS+= --root=/ 31PYSETUPINSTALLARGS+= --root=/
32.endif 32.endif
33 33
34.if ${OPSYS} == "Darwin" 34.if ${OPSYS} == "Darwin"
35DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat 35DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
36.endif 36.endif
37 37
 38# upstream often forgets deleting files, and packages on Windows,
 39# so permissions are usually wrong
38post-install: 40post-install:
39 ${RM} -f ${DESTDIR}${PREFIX}/${PYSITELIB}/${EGG_NAME}-py${PYVERSSUFFIX}.egg-info/entry_points.txt.orig 41 ${RM} -f ${DESTDIR}${PREFIX}/${PYSITELIB}/${EGG_NAME}-py${PYVERSSUFFIX}.egg-info/*.orig
40 ${RM} -f ${DESTDIR}${PREFIX}/${PYSITELIB}/${EGG_NAME}-py${PYVERSSUFFIX}.egg-info/requires.txt.orig 
41 ${CHMOD} ${SHAREMODE} ${DESTDIR}${PREFIX}/${PYSITELIB}/${EGG_NAME}-py${PYVERSSUFFIX}.egg-info/* 42 ${CHMOD} ${SHAREMODE} ${DESTDIR}${PREFIX}/${PYSITELIB}/${EGG_NAME}-py${PYVERSSUFFIX}.egg-info/*
42 43
43.include "../../lang/python/application.mk" 44.include "../../lang/python/application.mk"
44.include "../../lang/python/extension.mk" 45.include "../../lang/python/extension.mk"
45.include "../../mk/bsd.pkg.mk" 46.include "../../mk/bsd.pkg.mk"

cvs diff -r1.14 -r1.15 pkgsrc/devel/py-setuptools/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/py-setuptools/distinfo 2013/09/09 20:37:42 1.14
+++ pkgsrc/devel/py-setuptools/distinfo 2013/09/15 17:30:50 1.15
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.14 2013/09/09 20:37:42 wiz Exp $ 1$NetBSD: distinfo,v 1.15 2013/09/15 17:30:50 wiz Exp $
2 2
3SHA1 (setuptools-1.1.4.tar.gz) = b8bf9c2b8a114045598f0e16681d6a63a4d6cdf9 3SHA1 (setuptools-1.1.5.tar.gz) = 51936e633e3bc368eddee6d68bc7d5ba2d23b9dc
4RMD160 (setuptools-1.1.4.tar.gz) = cbbff51fc3ceca01ebdec1fba27ac6992780efcd 4RMD160 (setuptools-1.1.5.tar.gz) = b1a1d539d5be4487db7b42a18b435baa6f3cc300
5Size (setuptools-1.1.4.tar.gz) = 681658 bytes 5Size (setuptools-1.1.5.tar.gz) = 681773 bytes
6SHA1 (patch-setup.py) = 8072ebce17d029f7efc1c05528d1e5c0d0f40800 6SHA1 (patch-setup.py) = 8072ebce17d029f7efc1c05528d1e5c0d0f40800