devel/php-composer: Update to 2.6.4

The main composer port contains old and long EOLed/deprecated version
1.x of the software.

Move the devel/php-composer2 port over, dropping it, and update to
latest version.

Please check UPDATING entry 20230930, to correctly update use
"pkg install phpXX-composer" (replacing XX with the PHP shorthand
version you're using)

PR:		274160
Approved by:	Naram Qashat <cyberbotx@cyberbotx.com> (maintainer)
Security:	33922b84-5f09-11ee-b63d-0897988a1c07

8 files changed, 22 insertions, 59 deletions

diff --git a/MOVED b/MOVED
index 2d72b0c8bac7..543723e52fda 100644
--- a/MOVED
+++ b/MOVED
@@ -7921,3 +7921,4 @@ www/grafana8|www/grafana9|2023-09-30|Has expired: EOLed upstream
 www/mediawiki138|www/mediawiki139|2023-09-30|Has expired: end of life upstream
 www/awffull||2023-09-30|Has expired: Abandonware, last release in 14+ years ago. Consider using www/awstats
 textproc/raptor||2023-09-30|Has expired: No new release in 10+ years and superseded by 2.0-branch, consider using textproc/raptor2
+devel/php-composer2|devel/php-composer|2023-09-30|Port for newer version moved over old EOL version port
diff --git a/UPDATING b/UPDATING
index e784f379d62b..90775bb8953e 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,17 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20230930:
+  AFFECTS: users of devel/php-composer2
+  AUTHOR: madpilot@FreeBSD.org
+
+  The composer2 ports has been moved over the old devel/php-composer
+  port, which was still providing the old EOLed version 1 of the
+  software.
+
+  Please use `pkg install php81-composer` (substitute 81 with the
+  PHP version you're using) to properly upgrade.
+
 20230924:
   AFFECTS: users of XFCE desktop (x11-wm/xfce4)
   AUTHOR: madpilot@FreeBSD.org
diff --git a/devel/Makefile b/devel/Makefile
index da30fba4e60c..e75f7a3f3be5 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -4081,7 +4081,6 @@
     SUBDIR += phasar
     SUBDIR += php-Psr_Log
     SUBDIR += php-composer
-    SUBDIR += php-composer2
     SUBDIR += php-geshi
     SUBDIR += php-ice37
     SUBDIR += php-libawl
diff --git a/devel/php-composer/Makefile b/devel/php-composer/Makefile
index c5046147682f..333bdc2141c6 100644
--- a/devel/php-composer/Makefile
+++ b/devel/php-composer/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	composer
-DISTVERSION=	1.10.26
+DISTVERSION=	2.6.4
 CATEGORIES=	devel
 MASTER_SITES=	https://getcomposer.org/download/${DISTVERSION}/
 PKGNAMEPREFIX=	${PHP_PKGNAMEPREFIX}
@@ -13,8 +13,6 @@ WWW=		https://getcomposer.org/
 
 LICENSE=	MIT
 
-DEPRECATED=	packagist.org is dropping API v1 support, please use newer 2.x version
-
 RUN_DEPENDS=	ca_root_nss>0:security/ca_root_nss
 
 USES=		cpe php:flavors
@@ -30,6 +28,12 @@ NO_WRKSUBDIR=	yes
 PLIST_FILES=	bin/composer \
 		bin/composer.phar
 
+OPTIONS_DEFINE=		CURL
+OPTIONS_DEFAULT=	CURL
+
+CURL_DESC=	Install the cURL extension for faster downloads
+CURL_USE=	PHP=curl
+
 do-extract:
 	${MKDIR} ${WRKSRC}/
 	${CP} ${_DISTDIR}/composer.phar ${WRKSRC}/
diff --git a/devel/php-composer/distinfo b/devel/php-composer/distinfo
index d951936c5b30..75f086efe5d5 100644
--- a/devel/php-composer/distinfo
+++ b/devel/php-composer/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1649864691
-SHA256 (composer-1.10.26/composer.phar) = cbfe1f85276c57abe464d934503d935aa213494ac286275c8dfabfa91e3dbdc4
-SIZE (composer-1.10.26/composer.phar) = 1993462
+TIMESTAMP = 1696023354
+SHA256 (composer-2.6.4/composer.phar) = 5a39f3e2ce5ba391ee3fecb227faf21390f5b7ed5c56f14cab9e1c3048bcf8b8
+SIZE (composer-2.6.4/composer.phar) = 2861074
diff --git a/devel/php-composer2/Makefile b/devel/php-composer2/Makefile
deleted file mode 100644
index c06390b3daf5..000000000000
--- a/devel/php-composer2/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-PORTNAME=	composer
-DISTVERSION=	2.6.3
-CATEGORIES=	devel
-MASTER_SITES=	https://getcomposer.org/download/${DISTVERSION}/
-PKGNAMEPREFIX=	${PHP_PKGNAMEPREFIX}
-PKGNAMESUFFIX=	2
-DISTNAME=	composer
-EXTRACT_SUFX=	.phar
-DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
-
-MAINTAINER=	cyberbotx@cyberbotx.com
-COMMENT=	Dependency Manager for PHP, version 2.x
-WWW=		https://getcomposer.org/
-
-LICENSE=	MIT
-
-RUN_DEPENDS=	ca_root_nss>0:security/ca_root_nss
-
-USES=		cpe php:flavors
-CPE_VENDOR=	getcomposer
-USE_PHP=	ctype filter intl mbstring phar
-
-CONFLICTS_INSTALL=	php*-composer php*-composer2
-
-NO_ARCH=	yes
-NO_BUILD=	yes
-NO_WRKSUBDIR=	yes
-
-PLIST_FILES=	bin/composer \
-		bin/composer.phar
-
-OPTIONS_DEFINE=		CURL
-OPTIONS_DEFAULT=	CURL
-
-CURL_DESC=	Install the cURL extension for faster downloads
-CURL_USE=	PHP=curl
-
-do-extract:
-	${MKDIR} ${WRKSRC}/
-	${CP} ${_DISTDIR}/composer.phar ${WRKSRC}/
-
-do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/composer.phar ${STAGEDIR}${PREFIX}/bin/
-	${LN} -s composer.phar ${STAGEDIR}${PREFIX}/bin/composer
-
-.include <bsd.port.mk>
diff --git a/devel/php-composer2/distinfo b/devel/php-composer2/distinfo
deleted file mode 100644
index 5fea9ac8e2c6..000000000000
--- a/devel/php-composer2/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1694787985
-SHA256 (composer-2.6.3/composer.phar) = e58a390cac0df45ccf5a3d95ae94fa239eded8b7907fa2c8f752f020304fc9b1
-SIZE (composer-2.6.3/composer.phar) = 2859496
diff --git a/devel/php-composer2/pkg-descr b/devel/php-composer2/pkg-descr
deleted file mode 100644
index 2821d610ccf5..000000000000
--- a/devel/php-composer2/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Composer is a tool for dependency management in PHP. It allows you to declare
-the dependent libraries your project needs and it will install them in your
-project for you.