Index: head/devel/py-setuptools/Makefile =================================================================== --- head/devel/py-setuptools/Makefile (revision 377418) +++ head/devel/py-setuptools/Makefile (revision 377419) @@ -1,50 +1,52 @@ # $FreeBSD$ PORTNAME= setuptools PORTVERSION= 5.5.1 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DIST_SUBDIR= python MAINTAINER= python@FreeBSD.org COMMENT= Python packages installer LICENSE= PSFL -# This creates a dependency loop +# This creates a dependency loop in Redports (tinderbox) #TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:${PORTSDIR}/devel/py-pytest CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}distribute-[0-9]* PLIST_SUB= PYVER=${PYTHON_VER} VERSION=${PORTVERSION} \ EASYINSTALL_PTH=${PYTHON_SITELIBDIR}/easy-install.pth USES= python USE_PYTHON= autoplist distutils + PYDISTUTILS_SETUP= ${PYSETUP} SUB_LIST= IF_DEFAULT=${IF_DEFAULT} .include .if ${PYTHON_VERSION} != ${PYTHON_DEFAULT_VERSION} SUB_FILES+= pkg-message .endif post-patch: .if ${PYTHON_VERSION} != ${PYTHON_DEFAULT_VERSION} @${REINPLACE_CMD} 's,.*yield "easy_install =.*,,' ${WRKSRC}/setup.py .endif @${REINPLACE_CMD} 's,#!python,#!${PYTHON_CMD},' \ ${WRKSRC}/setuptools/command/easy_install.py @${REINPLACE_CMD} 's,#!/usr/bin/python,#!${PYTHON_CMD},' \ ${WRKSRC}/setuptools/tests/test_resources.py post-install: ${INSTALL_DATA} ${FILESDIR}/easy-install.pth.dist ${STAGEDIR}${PYTHON_SITELIBDIR}/ #regression-test: build -# @cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test +# @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test .include Index: head/devel/py-setuptools/files/patch-setuptools_command_install_lib.py =================================================================== --- head/devel/py-setuptools/files/patch-setuptools_command_install_lib.py (nonexistent) +++ head/devel/py-setuptools/files/patch-setuptools_command_install_lib.py (revision 377419) @@ -0,0 +1,35 @@ +--- setuptools/command/install_lib.py.orig 2014-07-05 18:05:55.000000000 +0200 ++++ setuptools/command/install_lib.py 2014-07-20 21:06:16.000000000 +0200 +@@ -1,5 +1,5 @@ + import distutils.command.install_lib as orig +-import os ++import os, imp + + + class install_lib(orig.install_lib): +@@ -17,12 +17,24 @@ + nsp = self.distribution.namespace_packages + svem = (nsp and self.get_finalized_command('install') + .single_version_externally_managed) ++ exclude_names = ['__init__.py', '__init__.pyc', '__init__.pyo'] ++ if hasattr(imp, 'get_tag') : ++ exclude_names.extend(( ++ os.path.join( ++ '__pycache__', ++ '__init__.' + imp.get_tag() + '.pyc' ++ ), ++ os.path.join( ++ '__pycache__', ++ '__init__.' + imp.get_tag() + '.pyo' ++ ), ++ )) + if svem: + for pkg in nsp: + parts = pkg.split('.') + while parts: + pkgdir = os.path.join(self.install_dir, *parts) +- for f in '__init__.py', '__init__.pyc', '__init__.pyo': ++ for f in exclude_names : + exclude[os.path.join(pkgdir, f)] = 1 + parts.pop() + return exclude Property changes on: head/devel/py-setuptools/files/patch-setuptools_command_install_lib.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property