git: 4afa461bfcdb - main - devel/py-setuptools: Remove outdated CONFLICTS_INSTALL

Po-Chuan Hsieh sunpoet at FreeBSD.org
Tue May 11 21:53:57 UTC 2021


The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=4afa461bfcdb7cab9529cece587526778c68c156

commit 4afa461bfcdb7cab9529cece587526778c68c156
Author:     Po-Chuan Hsieh <sunpoet at FreeBSD.org>
AuthorDate: 2021-05-11 21:20:02 +0000
Commit:     Po-Chuan Hsieh <sunpoet at FreeBSD.org>
CommitDate: 2021-05-11 21:47:31 +0000

    devel/py-setuptools: Remove outdated CONFLICTS_INSTALL
    
    - Cosmetic change
    
    py-distribute was removed 7.5 years ago.
---
 devel/py-setuptools/Makefile | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/devel/py-setuptools/Makefile b/devel/py-setuptools/Makefile
index 40b38a886356..ec9b524298bf 100644
--- a/devel/py-setuptools/Makefile
+++ b/devel/py-setuptools/Makefile
@@ -15,15 +15,13 @@ COMMENT=	Python packages installer
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-NO_ARCH=	yes
 USES=		python:2.7+ zip
 USE_PYTHON=	allflavors autoplist concurrent distutils
 
+MAKE_ENV+=	SETUPTOOLS_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
+NO_ARCH=	yes
 PYDISTUTILS_SETUP=	${PYSETUP}
 
-CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}distribute-[0-9]*
-MAKE_ENV+=		SETUPTOOLS_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
-
 PLIST_FILES=	"@sample %%PYTHON_SITELIBDIR%%/easy-install.pth.dist %%PYTHON_SITELIBDIR%%/easy-install.pth"
 
 .include <bsd.port.pre.mk>


More information about the dev-commits-ports-all mailing list