From nobody Tue Dec 27 18:19:44 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NhNGn1Bv5z2ktVN; Tue, 27 Dec 2022 18:19:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NhNGn0h7Dz44Sk; Tue, 27 Dec 2022 18:19:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672165185; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0GFm64KbRrK34jGoEB9NbTh+SlSYbE7fjVWBZvwkON8=; b=rHNmwbC33h1R4kmHtrvlIn2jHU7PkFblU15Ts843a7hl7HHmOMikZFQxlEw+9riH5yAgeb ZZlNQG89Jgqc2ZZH+e0o+aEfJa/C3ktj+GqpBn55QSacgOQsP4z/LfJ8xh4+Tj/d/olKaY Ugt8rs6s3bOXfzzEtUuskYSq6hkMW4Ar7EGpTg3AtpgW09pIpTSfW2CPXjTfU+CTHOYFpz ubHiBOaNc3NC8G0zfzLGIC16ZSBYaWM/8//eW7tuUsrSpvfr1mV19slupk20dEFdr90ktO GJ+TOxb06GXF4/j3pVFP0CX7OXePsLbrRnKbp+7GJdALjPr6lpXQATtvqTOoww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672165185; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0GFm64KbRrK34jGoEB9NbTh+SlSYbE7fjVWBZvwkON8=; b=X1zB3ICquMVR3z4n+Ub2SWRO7hv9QQXrbAlnAxE/w81VaXaLSz2ThtqyKcNxvLuLLHchS0 +lTrR7d7Xq5F7IO6B7f6UOcwWzXLiqdCNE7LfZEsVtF9ioCK1o9pL7S0x7gKtXu/3rdaeW 74Z4nBxf9WHXyT0+WiANt6DPK5Eszzp2g6hgcKDrH2GXsAJIqYeu5DRmY78aM/PvXafSaf QirVBOIPqZ5YrlAmY7MQ3IBKzET9L8E9rPdOrR3CNCy3CBMz83X0v9KLPqSoXAqpkQ2Mk6 VZ/ZZgN/jILU/fVcAm7OCpvi1t5a7P6VkZ44Pd/W3PfQGOw91h9Fj2/XI+TE3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672165185; a=rsa-sha256; cv=none; b=D/dFfzZhSYmd6KVhKkZu9Po7+CRuK9UU31/94+Em+DXM41uT/YFtZ0eNZ9TiLNFfn6wBy4 dwwjcVKY9UuwEdWypOVc1lEirTfZOfhtJvVV4DSdw52pN5Aw+5+knJliBkGhfhzfkWRaN7 edpBvH7y6DY1kvw6KpOfbG6fv++rQTKSfc4iDHnFcv6CsBUdD5FRfe8x39TB1Yvw9b11/9 lAYWt/e4L/Rt9iPyLkDZbTvX0bcvElIPe/1ucB6f1UBneIbn93yMFApeAOjLJdyxvzfnDs 2Lv+DodB4N0qSxAy55INR9IAl8AFxRqfYeIaHke6kfxfBUqFGucO508KqxqAYA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NhNGm6sfFzL0v; Tue, 27 Dec 2022 18:19:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2BRIJiDQ082842; Tue, 27 Dec 2022 18:19:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BRIJibx082841; Tue, 27 Dec 2022 18:19:44 GMT (envelope-from git) Date: Tue, 27 Dec 2022 18:19:44 GMT Message-Id: <202212271819.2BRIJibx082841@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: 42ba01425dab - main - Mk/bsd.sites.mk: rename CHEESESHOP to PYPI List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 42ba01425dab904bc40c97a3f28e1b6b57dc3d3f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=42ba01425dab904bc40c97a3f28e1b6b57dc3d3f commit 42ba01425dab904bc40c97a3f28e1b6b57dc3d3f Author: Dmitry Marakasov AuthorDate: 2022-11-28 13:18:15 +0000 Commit: Dmitry Marakasov 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} \