Attachment #245325 for bug #274160

Lines 7860-7862 devel/rubygem-mustache0\|devel/rubygem-mustache\|2023-09-27\|Has expired: Use devel Link Here

(-)b/MOVED (+1 lines)
7860	sysutils/rsfetch\|\|2023-09-27\|Has expired: Upstream unmaintained	7860	sysutils/rsfetch\|\|2023-09-27\|Has expired: Upstream unmaintained
7861	sysutils/sysrc\|\|2023-09-27\|Has expired: Migrated into src	7861	sysutils/sysrc\|\|2023-09-27\|Has expired: Migrated into src
7862	deskutils/budgie-trash-applet\|\|2023-09-29\|Has expired: Merged into newer x11/budgie-desktop >= 10.8	7862	deskutils/budgie-trash-applet\|\|2023-09-29\|Has expired: Merged into newer x11/budgie-desktop >= 10.8
		7863	devel/php-composer2\|devel/php-composer\|2023-09-30\|Port for newer version moved over old EOL version port




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

Lines 4087-4093 Link Here

(-)b/devel/Makefile (-1 lines)
4087	SUBDIR += phasar	4087	SUBDIR += phasar
4088	SUBDIR += php-Psr_Log	4088	SUBDIR += php-Psr_Log
4089	SUBDIR += php-composer	4089	SUBDIR += php-composer
4090	SUBDIR += php-composer2
4091	SUBDIR += php-geshi	4090	SUBDIR += php-geshi
4092	SUBDIR += php-ice37	4091	SUBDIR += php-ice37
4093	SUBDIR += php-libawl	4092	SUBDIR += php-libawl

Lines 1-5 Link Here

(-)b/devel/php-composer/Makefile (-3 / +7 lines)
1	PORTNAME= composer	1	PORTNAME= composer
2	DISTVERSION= 1.10.26	2	DISTVERSION= 2.6.4
3	CATEGORIES= devel	3	CATEGORIES= devel
4	MASTER_SITES= https://getcomposer.org/download/${DISTVERSION}/	4	MASTER_SITES= https://getcomposer.org/download/${DISTVERSION}/
5	PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX}	5	PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX}
Lines 13-20 WWW= https://getcomposer.org/ Link Here
13		13
14	LICENSE= MIT	14	LICENSE= MIT
15		15
16	DEPRECATED= packagist.org is dropping API v1 support, please use newer 2.x version
17
18	RUN_DEPENDS= ca_root_nss>0:security/ca_root_nss	16	RUN_DEPENDS= ca_root_nss>0:security/ca_root_nss
19		17
20	USES= cpe php:flavors	18	USES= cpe php:flavors
Lines 30-35 NO_WRKSUBDIR= yes Link Here
30	PLIST_FILES= bin/composer \	28	PLIST_FILES= bin/composer \
31	bin/composer.phar	29	bin/composer.phar
32		30
		31	OPTIONS_DEFINE= CURL
		32	OPTIONS_DEFAULT= CURL
		33
		34	CURL_DESC= Install the cURL extension for faster downloads
		35	CURL_USE= PHP=curl
		36
33	do-extract:	37	do-extract:
34	${MKDIR} ${WRKSRC}/	38	${MKDIR} ${WRKSRC}/
35	${CP} ${_DISTDIR}/composer.phar ${WRKSRC}/	39	${CP} ${_DISTDIR}/composer.phar ${WRKSRC}/

Lines 1-3 Link Here

(-)b/devel/php-composer/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1649864691	1	TIMESTAMP = 1696023354
2	SHA256 (composer-1.10.26/composer.phar) = cbfe1f85276c57abe464d934503d935aa213494ac286275c8dfabfa91e3dbdc4	2	SHA256 (composer-2.6.4/composer.phar) = 5a39f3e2ce5ba391ee3fecb227faf21390f5b7ed5c56f14cab9e1c3048bcf8b8
3	SIZE (composer-1.10.26/composer.phar) = 1993462	3	SIZE (composer-2.6.4/composer.phar) = 2861074




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>

Removed Link Here

(-)a/devel/php-composer2/distinfo (-3 lines)
1	TIMESTAMP = 1694787985
2	SHA256 (composer-2.6.3/composer.phar) = e58a390cac0df45ccf5a3d95ae94fa239eded8b7907fa2c8f752f020304fc9b1
3	SIZE (composer-2.6.3/composer.phar) = 2859496

Removed Link Here

(-)a/devel/php-composer2/pkg-descr (-3 lines)
1	Composer is a tool for dependency management in PHP. It allows you to declare
2	the dependent libraries your project needs and it will install them in your
3	project for you.

Return to bug 274160

Lines 5-10 they are unavoidable. Link Here

(-)b/UPDATING (+11 lines)
5	You should get into the habit of checking this file for changes each time	5	You should get into the habit of checking this file for changes each time
6	you update your ports collection, before attempting any port upgrades.	6	you update your ports collection, before attempting any port upgrades.
7		7
		8	20230930:
		9	AFFECTS: users of devel/php-composer2
		10	AUTHOR: madpilot@FreeBSD.org
		11
		12	The composer2 ports has been moved over the old devel/php-composer
		13	port, which was still providing the old EOLed version 1 of the
		14	software.
		15
		16	Please use `pkg install php81-composer` (substitute 81 with the
		17	PHP version you're using) to properly upgrade.
		18
8	20230924:	19	20230924:
9	AFFECTS: users of XFCE desktop (x11-wm/xfce4)	20	AFFECTS: users of XFCE desktop (x11-wm/xfce4)
10	AUTHOR: madpilot@FreeBSD.org	21	AUTHOR: madpilot@FreeBSD.org

Removed Link Here

(-)a/devel/php-composer2/Makefile (-46 lines)
1	PORTNAME= composer
2	DISTVERSION= 2.6.3
3	CATEGORIES= devel
4	MASTER_SITES= https://getcomposer.org/download/${DISTVERSION}/
5	PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX}
6	PKGNAMESUFFIX= 2
7	DISTNAME= composer
8	EXTRACT_SUFX= .phar
9	DIST_SUBDIR= ${PORTNAME}-${PORTVERSION}
10
11	MAINTAINER= cyberbotx@cyberbotx.com
12	COMMENT= Dependency Manager for PHP, version 2.x
13	WWW= https://getcomposer.org/
14
15	LICENSE= MIT
16
17	RUN_DEPENDS= ca_root_nss>0:security/ca_root_nss
18
19	USES= cpe php:flavors
20	CPE_VENDOR= getcomposer
21	USE_PHP= ctype filter intl mbstring phar
22
23	CONFLICTS_INSTALL= php-composer php-composer2
24
25	NO_ARCH= yes
26	NO_BUILD= yes
27	NO_WRKSUBDIR= yes
28
29	PLIST_FILES= bin/composer \
30	bin/composer.phar
31
32	OPTIONS_DEFINE= CURL
33	OPTIONS_DEFAULT= CURL
34
35	CURL_DESC= Install the cURL extension for faster downloads
36	CURL_USE= PHP=curl
37
38	do-extract:
39	${MKDIR} ${WRKSRC}/
40	${CP} ${_DISTDIR}/composer.phar ${WRKSRC}/
41
42	do-install:
43	${INSTALL_SCRIPT} ${WRKSRC}/composer.phar ${STAGEDIR}${PREFIX}/bin/
44	${LN} -s composer.phar ${STAGEDIR}${PREFIX}/bin/composer
45
46	.include <bsd.port.mk>