Netgate note:

	Cherry-pick 529117f.  Revert this before next upstream sync

Fix fetch for php*

- Primary hosting provider of php has introduced some sort of checking
  which is blocking fetch although curl/wget works perfectly. fetch with
  other --user-agent is also not working at the moment. An issue has been
  opened with the upstream which can be found at:
  php/web-php#483
- Untill this is fixed add php Github distributions URL to MASTER_SITES
- Modify MASTER_SITES for php[73|74|80] and remove SUBDIR as it affects
  DIST_SUBDIR
- Add DIST_SUBDIR as Github is IPv4 only which affects IPv6 only
  builders. In case someone is running IPv6 only builders distcache will
  pickup and serve.
- Although distinfo has been updated as we have added DIST_SUBDIR but
  SHA256 and SIZE are unchanged. In case someone needs to verify those
  are available from https://www.php.net/downloads
- We might have done some drastic changes but we are on the brink of
  quarterly build and we do not want to start a new year and a new
  quarter with BROKEN php and thousands of other ports.

PR: 260699
Reported by: [email protected]
Approved by: portmgr (blanket infrastructure)
Sponsored by: Bounce Experts

Mk/bsd.sites.mk

@@ -970,9 +970,12 @@ MASTER_SITE_PGSQL+= \
 	https://ftp.postgresql.org/pub/%SUBDIR%/
 .endif
 
+# Currently MyraCloud is blocking fetch. Hence add php Github distributions
+# untill it is fixed.
 .if !defined(IGNORE_MASTER_SITE_PHP)
 MASTER_SITE_PHP+= \
-	https://www.php.net/%SUBDIR%/
+	https://www.php.net/distributions/ \
+	https://raw.githubusercontent.com/php/web-php-distributions/master/
 .endif
 
 .if !defined(IGNORE_MASTER_SITE_PYTHON)

lang/php73/Makefile

@@ -2,8 +2,9 @@ PORTNAME=	php73
 DISTVERSION=	7.3.33
 PORTREVISION?=	0
 CATEGORIES?=	lang devel www
-MASTER_SITES=	PHP/distributions
+MASTER_SITES=	PHP
 DISTNAME=	php-${DISTVERSION}
+DIST_SUBDIR=	php
 
 MAINTAINER=	[email protected]
 COMMENT=	PHP Scripting Language

lang/php73/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1637348769
-SHA256 (php-7.3.33.tar.xz) = 166eaccde933381da9516a2b70ad0f447d7cec4b603d07b9a916032b215b90cc
-SIZE (php-7.3.33.tar.xz) = 12143820
+TIMESTAMP = 1640541366
+SHA256 (php/php-7.3.33.tar.xz) = 166eaccde933381da9516a2b70ad0f447d7cec4b603d07b9a916032b215b90cc
+SIZE (php/php-7.3.33.tar.xz) = 12143820

lang/php74/Makefile

@@ -2,8 +2,9 @@ PORTNAME=	php74
 DISTVERSION=	7.4.26
 PORTREVISION?=	0
 CATEGORIES?=	lang devel www
-MASTER_SITES=	PHP/distributions
+MASTER_SITES=	PHP
 DISTNAME=	php-${DISTVERSION}
+DIST_SUBDIR=	php
 
 MAINTAINER=	[email protected]
 COMMENT=	PHP Scripting Language

lang/php74/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1637348951
-SHA256 (php-7.4.26.tar.xz) = e305b3aafdc85fa73a81c53d3ce30578bc94d1633ec376add193a1e85e0f0ef8
-SIZE (php-7.4.26.tar.xz) = 10420236
+TIMESTAMP = 1641318756
+SHA256 (php/php-7.4.26.tar.xz) = e305b3aafdc85fa73a81c53d3ce30578bc94d1633ec376add193a1e85e0f0ef8
+SIZE (php/php-7.4.26.tar.xz) = 10420236

lang/php80/Makefile

@@ -2,8 +2,9 @@ PORTNAME=	php80
 DISTVERSION=	8.0.13
 PORTREVISION?=	0
 CATEGORIES?=	lang devel www
-MASTER_SITES=	PHP/distributions
+MASTER_SITES=	PHP
 DISTNAME=	php-${DISTVERSION}
+DIST_SUBDIR=	php
 
 MAINTAINER=	[email protected]
 COMMENT=	PHP Scripting Language

lang/php80/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1637349092
-SHA256 (php-8.0.13.tar.xz) = cd976805ec2e9198417651027dfe16854ba2c2c388151ab9d4d268513d52ed52
-SIZE (php-8.0.13.tar.xz) = 10854284
+TIMESTAMP = 1640541762
+SHA256 (php/php-8.0.13.tar.xz) = cd976805ec2e9198417651027dfe16854ba2c2c388151ab9d4d268513d52ed52
+SIZE (php/php-8.0.13.tar.xz) = 10854284