CVS commit: pkgsrc/www/php-matomo

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

Module Name:    pkgsrc
Committed By:   taca
Date:           Fri Mar  7 00:59:39 UTC 2025

Modified Files:
        pkgsrc/www/php-matomo: Makefile

Log Message:
www/php-matomo: a few clean up

* Use lang/php/json.mk instead of conditional DEPENDS line.
* Use REPLACE_PHP.
* Remove duplicated depenency to archivers/php-zlib.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/php-matomo/Makefile

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

Modified files:

Index: pkgsrc/www/php-matomo/Makefile
diff -u pkgsrc/www/php-matomo/Makefile:1.1 pkgsrc/www/php-matomo/Makefile:1.2
--- pkgsrc/www/php-matomo/Makefile:1.1  Thu Mar  6 01:21:38 2025
+++ pkgsrc/www/php-matomo/Makefile      Fri Mar  7 00:59:39 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2025/03/06 01:21:38 manu Exp $
+# $NetBSD: Makefile,v 1.2 2025/03/07 00:59:39 taca Exp $
 
 DISTNAME=      matomo-5.2.2
 PKGNAME=       ${PHP_PKG_PREFIX}-${DISTNAME}
@@ -17,14 +17,10 @@ USE_LANGUAGES=      # none
 USE_TOOLS+=    pax
 NO_BUILD=      yes
 
-.include "../../lang/php/phpversion.mk"
 DEPENDS+=      ${PHP_PKG_PREFIX}-curl-[0-9]*:../../www/php-curl
 DEPENDS+=      ${PHP_PKG_PREFIX}-gd-[0-9]*:../../graphics/php-gd
 DEPENDS+=      ${PHP_PKG_PREFIX}-gmp-[0-9]*:../../devel/php-gmp
 DEPENDS+=      ${PHP_PKG_PREFIX}-intl-[0-9]*:../../textproc/php-intl
-.if ${PKG_PHP_MAJOR_VERS} < 8
-DEPENDS+=      ${PHP_PKG_PREFIX}-json-[0-9]*:../../textproc/php-json
-.endif
 DEPENDS+=      ${PHP_PKG_PREFIX}-ldap-[0-9]*:../../databases/php-ldap
 DEPENDS+=      ${PHP_PKG_PREFIX}-mbstring-[0-9]*:../../converters/php-mbstring
 DEPENDS+=      ${PHP_PKG_PREFIX}-mysqli-[0-9]*:../../databases/php-mysqli
@@ -32,17 +28,13 @@ DEPENDS+=   ${PHP_PKG_PREFIX}-pdo-[0-9]*:.
 DEPENDS+=      ${PHP_PKG_PREFIX}-pdo_mysql-[0-9]*:../../databases/php-pdo_mysql
 DEPENDS+=      ${PHP_PKG_PREFIX}-zip-[0-9]*:../../archivers/php-zip
 DEPENDS+=      ${PHP_PKG_PREFIX}-zlib-[0-9]*:../../archivers/php-zlib
-DEPENDS+=      ${PHP_PKG_PREFIX}-zlib-[0-9]*:../../archivers/php-zlib
 DEPENDS+=      dbip-city-lite-[0-9]*:../../net/dbip-city-lite
 
-REPLACE_INTERPRETER+=  php
-REPLACE.php.old=       /usr/bin/env php
-REPLACE.php.new=       ${PREFIX}/bin/php
-REPLACE_FILES.php+=    console
-REPLACE_FILES.php+=    vendor/symfony/error-handler/Resources/bin/extract-tentative-return-types.php
-REPLACE_FILES.php+=    vendor/symfony/error-handler/Resources/bin/patch-type-declarations
-REPLACE_FILES.php+=    vendor/symfony/var-dumper/Resources/bin/var-dump-server
-REPLACE_FILES.php+=    vendor/wikimedia/less.php/bin/lessc
+REPLACE_PHP+=  console
+REPLACE_PHP+=  vendor/symfony/error-handler/Resources/bin/extract-tentative-return-types.php
+REPLACE_PHP+=  vendor/symfony/error-handler/Resources/bin/patch-type-declarations
+REPLACE_PHP+=  vendor/symfony/var-dumper/Resources/bin/var-dump-server
+REPLACE_PHP+=  vendor/wikimedia/less.php/bin/lessc
 
 REPLACE_PYTHON+=       misc/log-analytics/import_logs.py
 
@@ -63,6 +55,6 @@ do-install:
 
 CHECK_INTERPRETER_SKIP+=       ${MATOMODIR}/vendor/pear/archive_tar/scripts/phptar.in
 
-.include "../../lang/php/phpversion.mk"
+.include "../../lang/php/json.mk"
 .include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"