CVS commit: pkgsrc/devel/php-composer

["Takahiro Kambe" <taca%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   taca
Date:           Sat Feb  8 03:39:10 UTC 2025

Modified Files:
        pkgsrc/devel/php-composer: Makefile PLIST
        pkgsrc/devel/php-composer/files: composer

Log Message:
devel/php-composer: multiple PHP support

* Use PHP_BASE_VERS in DEPENDS if required.
* Use INSTALLATION_DIRS instead of AUTO_MKDIRS.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 pkgsrc/devel/php-composer/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/php-composer/PLIST
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/php-composer/files/composer

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/php-composer/Makefile
diff -u pkgsrc/devel/php-composer/Makefile:1.30 pkgsrc/devel/php-composer/Makefile:1.31
--- pkgsrc/devel/php-composer/Makefile:1.30     Tue Aug 23 15:10:36 2022
+++ pkgsrc/devel/php-composer/Makefile  Sat Feb  8 03:39:10 2025
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.30 2022/08/23 15:10:36 tpaul Exp $
+# $NetBSD: Makefile,v 1.31 2025/02/08 03:39:10 taca Exp $
 
 VERSION=       2.2.18
 PKGNAME=       ${PHP_PKG_PREFIX}-composer-${VERSION}
+PKGREVISION=   1
 DISTNAME=      composer
 CATEGORIES=    devel
 MASTER_SITES=  https://getcomposer.org/download/${VERSION}/
@@ -13,26 +14,27 @@ HOMEPAGE=   https://getcomposer.org/
 COMMENT=       Dependency Manager for PHP
 LICENSE=       mit
 
+DEPENDS+=      ${PHP_PKG_PREFIX}-mbstring>=${PHP_BASE_VERS}:../../converters/php-mbstring
+DEPENDS+=      ${PHP_PKG_PREFIX}-zip>=${PHP_BASE_VERS}:../../archivers/php-zip
+
 NO_BUILD=      yes
-AUTO_MKDIRS=   yes
 
-DEPENDS+=      ${PHP_PKG_PREFIX}-mbstring-[0-9]*:../../converters/php-mbstring
-DEPENDS+=      ${PHP_PKG_PREFIX}-zip-[0-9]*:../../archivers/php-zip
+INSTALLATION_DIRS+=    bin ${PHP_SHAREDIR}
+
+SUBST_CLASSES+=                        fix-paths
+SUBST_STAGE.fix-paths=         post-extract
+SUBST_MESSAGE.fix-paths=       Fixing absolute paths.
+SUBST_FILES.fix-paths=         composer${PHP_VER}
+SUBST_VARS.fix-paths=          PREFIX PHP_VER PHP_SHAREDIR
 
 do-extract:
        ${MKDIR} -m 0755 ${WRKSRC}
-       ${INSTALL} -m 0644 ${FILESDIR}/composer ${WRKSRC}/composer
+       ${INSTALL} -m 0644 ${FILESDIR}/composer ${WRKSRC}/composer${PHP_VER}
 
 do-install:
-       ${INSTALL} -m 0755 ${WRKSRC}/composer ${DESTDIR}${PREFIX}/bin/composer
+       ${INSTALL} -m 0755 ${WRKSRC}/composer${PHP_VER} ${DESTDIR}${PREFIX}/bin
        ${INSTALL} -m 0644 ${DISTDIR}/${DIST_SUBDIR}/composer.phar \
-               ${DESTDIR}${PREFIX}/share/php/composer.phar
-
-SUBST_CLASSES+=                        fix-paths
-SUBST_STAGE.fix-paths=         post-extract
-SUBST_MESSAGE.fix-paths=       Fixing absolute paths.
-SUBST_FILES.fix-paths=         composer
-SUBST_VARS.fix-paths=          PREFIX
+               ${DESTDIR}${PREFIX}/${PHP_SHAREDIR}
 
 .include "../../lang/php/json.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/php-composer/PLIST
diff -u pkgsrc/devel/php-composer/PLIST:1.1 pkgsrc/devel/php-composer/PLIST:1.2
--- pkgsrc/devel/php-composer/PLIST:1.1 Sat Mar 14 04:26:39 2020
+++ pkgsrc/devel/php-composer/PLIST     Sat Feb  8 03:39:10 2025
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2020/03/14 04:26:39 tpaul Exp $
-bin/composer
-share/php/composer.phar
+@comment $NetBSD: PLIST,v 1.2 2025/02/08 03:39:10 taca Exp $
+bin/composer${PHP_VER}
+${PHP_SHAREDIR}/composer.phar

Index: pkgsrc/devel/php-composer/files/composer
diff -u pkgsrc/devel/php-composer/files/composer:1.1 pkgsrc/devel/php-composer/files/composer:1.2
--- pkgsrc/devel/php-composer/files/composer:1.1        Sat Mar 14 04:26:39 2020
+++ pkgsrc/devel/php-composer/files/composer    Sat Feb  8 03:39:10 2025
@@ -2,6 +2,6 @@
 
 PREFIX="@PREFIX@"
 BINDIR="$PREFIX/bin"
-DATADIR="$PREFIX/share"
+DATADIR="$PREFIX/@PHP_SHAREDIR@"
 
-"$BINDIR/php" "$DATADIR/php/composer.phar" $@
+"$BINDIR/php@PHP_VER@" "$DATADIR/composer.phar" $@