Date: Tue, 27 Dec 2022 18:19:44 GMT From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 42ba01425dab - main - Mk/bsd.sites.mk: rename CHEESESHOP to PYPI Message-ID: <202212271819.2BRIJibx082841@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=42ba01425dab904bc40c97a3f28e1b6b57dc3d3f commit 42ba01425dab904bc40c97a3f28e1b6b57dc3d3f Author: Dmitry Marakasov <amdmi3@FreeBSD.org> AuthorDate: 2022-11-28 13:18:15 +0000 Commit: Dmitry Marakasov <amdmi3@FreeBSD.org> CommitDate: 2022-12-27 17:55:23 +0000 Mk/bsd.sites.mk: rename CHEESESHOP to PYPI PR: 267994 Differential revision: D37518 Approved by: bapt, lwhsu --- Mk/bsd.sites.mk | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/Mk/bsd.sites.mk b/Mk/bsd.sites.mk index e1afd2a93c2a..68656ed790f0 100644 --- a/Mk/bsd.sites.mk +++ b/Mk/bsd.sites.mk @@ -91,12 +91,6 @@ MASTER_SITE_BERLIOS+= \ ${MASTER_SITE_SOURCEFORGE} .endif -.if !defined(IGNORE_MASTER_SITE_CHEESESHOP) -MASTER_SITE_CHEESESHOP+= \ - https://files.pythonhosted.org/packages/%SUBDIR%/ \ - https://pypi.org/packages/%SUBDIR%/ -.endif - .if !defined(IGNORE_MASTER_SITE_COMP_SOURCES) MASTER_SITE_COMP_SOURCES+= \ http://ftp.isc.org/pub/usenet/comp.sources.%SUBDIR%/ \ @@ -851,6 +845,12 @@ MASTER_SITE_PHP+= \ https://raw.githubusercontent.com/php/web-php-distributions/master/ .endif +.if !defined(IGNORE_MASTER_SITE_PYPI) +MASTER_SITE_PYPI+= \ + https://files.pythonhosted.org/packages/%SUBDIR%/ \ + https://pypi.org/packages/%SUBDIR%/ +.endif + .if !defined(IGNORE_MASTER_SITE_PYTHON) MASTER_SITE_PYTHON+= \ https://www.python.org/%SUBDIR%/ @@ -1098,12 +1098,12 @@ MASTER_SITES_ABBREVS= CPAN:PERL_CPAN \ LODEV:LIBREOFFICE_DEV \ NL:NETLIB \ RG:RUBYGEMS \ - SF:SOURCEFORGE + SF:SOURCEFORGE \ + CHEESESHOP:PYPI MASTER_SITES_SUBDIRS= APACHE_COMMONS_BINARIES:${PORTNAME:S,commons-,,} \ APACHE_COMMONS_SOURCE:${PORTNAME:S,commons-,,} \ APACHE_JAKARTA:${PORTNAME:S,-,/,}/source \ BERLIOS:${PORTNAME:tl}.berlios \ - CHEESESHOP:source/${DISTNAME:C/(.).*/\1/}/${DISTNAME:S/-${DISTVERSIONFULL}$//} \ CRATESIO:${PORTNAME}/${DISTVERSIONFULL} \ DEBIAN:pool/main/${PORTNAME:C/^((lib)?.).*$/\1/}/${PORTNAME} \ FARSIGHT:${PORTNAME} \ @@ -1123,6 +1123,7 @@ MASTER_SITES_SUBDIRS= APACHE_COMMONS_BINARIES:${PORTNAME:S,commons-,,} \ MOZDEV:${PORTNAME:tl} \ NETLIB:${PORTNAME} \ PERL_CPAN:${PORTNAME:C/-.*//} \ + PYPI:source/${DISTNAME:C/(.).*/\1/}/${DISTNAME:S/-${DISTVERSIONFULL}$//} \ QT:archive/qt/${PORTVERSION:R} \ SAMBA:${PORTNAME} \ SAVANNAH:${PORTNAME:tl} \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202212271819.2BRIJibx082841>