CVS commit: pkgsrc/multimedia

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

Module Name:    pkgsrc
Committed By:   taca
Date:           Mon Mar  3 15:43:45 UTC 2025

Modified Files:
        pkgsrc/multimedia/php-avideo: Makefile
        pkgsrc/multimedia/php-avideo-encoder: Makefile
        pkgsrc/multimedia/php-avideo-encoder-network: Makefile

Log Message:
Fix build on current PHP framework

* PKG_PHP_MAJOR_VERS has gone.
* Use "lang/php/json.mk" for php-json dependency.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/multimedia/php-avideo/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/multimedia/php-avideo-encoder/Makefile
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/multimedia/php-avideo-encoder-network/Makefile

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

Modified files:

Index: pkgsrc/multimedia/php-avideo/Makefile
diff -u pkgsrc/multimedia/php-avideo/Makefile:1.1 pkgsrc/multimedia/php-avideo/Makefile:1.2
--- pkgsrc/multimedia/php-avideo/Makefile:1.1   Mon Mar  3 15:21:04 2025
+++ pkgsrc/multimedia/php-avideo/Makefile       Mon Mar  3 15:43:45 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2025/03/03 15:21:04 manu Exp $
+# $NetBSD: Makefile,v 1.2 2025/03/03 15:43:45 taca Exp $
 
 GITHUB_PROJECT=        AVideo
 GITHUB_TAG=    refs/tags/${DISTNAME}
@@ -23,9 +23,6 @@ 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
-.if ${PKG_PHP_MAJOR_VERS} < 8
-DEPENDS+=      ${PHP_PKG_PREFIX}-json-[0-9]*:../../textproc/php-json
-.endif
 DEPENDS+=      ${PHP_PKG_PREFIX}-mbstring-[0-9]*:../../converters/php-mbstring
 DEPENDS+=      ${PHP_PKG_PREFIX}-mysqli-[0-9]*:../../databases/php-mysqli
 DEPENDS+=      ${PHP_PKG_PREFIX}-zip-[0-9]*:../../archivers/php-zip
@@ -53,5 +50,6 @@ do-install:
            \! -name .gitignore \! -name .gitmodules  -print | \
                 ${PAX} -rw -pmp ${DESTDIR}${PREFIX}/${AVIDEODIR}
 
+.include "../../lang/php/json.mk"
 .include "../../lang/php/phpversion.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/multimedia/php-avideo-encoder/Makefile
diff -u pkgsrc/multimedia/php-avideo-encoder/Makefile:1.1 pkgsrc/multimedia/php-avideo-encoder/Makefile:1.2
--- pkgsrc/multimedia/php-avideo-encoder/Makefile:1.1   Mon Mar  3 15:24:12 2025
+++ pkgsrc/multimedia/php-avideo-encoder/Makefile       Mon Mar  3 15:43:45 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2025/03/03 15:24:12 manu Exp $
+# $NetBSD: Makefile,v 1.2 2025/03/03 15:43:45 taca Exp $
 
 GITHUB_PROJECT=        AVideo-Encoder
 GITHUB_TAG=    refs/tags/${DISTNAME}
@@ -23,9 +23,6 @@ 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
-.if ${PKG_PHP_MAJOR_VERS} < 8
-DEPENDS+=      ${PHP_PKG_PREFIX}-json-[0-9]*:../../textproc/php-json
-.endif
 DEPENDS+=      ${PHP_PKG_PREFIX}-mysqli-[0-9]*:../../databases/php-mysqli
 DEPENDS+=      ${PHP_PKG_PREFIX}-zip-[0-9]*:../../archivers/php-zip
 
@@ -42,5 +39,6 @@ do-install:
                 ${PAX} -rw -pmp ${DESTDIR}${PREFIX}/${AVIDEODIR}
 
 .include "../../multimedia/ffmpeg7/buildlink3.mk"
+.include "../../lang/php/json.mk"
 .include "../../lang/php/phpversion.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/multimedia/php-avideo-encoder-network/Makefile
diff -u pkgsrc/multimedia/php-avideo-encoder-network/Makefile:1.1 pkgsrc/multimedia/php-avideo-encoder-network/Makefile:1.2
--- pkgsrc/multimedia/php-avideo-encoder-network/Makefile:1.1   Mon Mar  3 15:29:15 2025
+++ pkgsrc/multimedia/php-avideo-encoder-network/Makefile       Mon Mar  3 15:43:45 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2025/03/03 15:29:15 manu Exp $
+# $NetBSD: Makefile,v 1.2 2025/03/03 15:43:45 taca Exp $
 
 GITHUB_PROJECT=        AVideo-Encoder-Network
 GITHUB_TAG=    3ac08dfa79fadbd83feb1f8dca3b9370452c8cf5
@@ -23,9 +23,6 @@ NO_BUILD=     yes
 
 .include "../../lang/php/phpversion.mk"
 DEPENDS+=      ${PHP_PKG_PREFIX}-curl-[0-9]*:../../www/php-curl
-.if ${PKG_PHP_MAJOR_VERS} < 8
-DEPENDS+=      ${PHP_PKG_PREFIX}-json-[0-9]*:../../textproc/php-json
-.endif
 DEPENDS+=      ${PHP_PKG_PREFIX}-mysqli-[0-9]*:../../databases/php-mysqli
 
 .include "../../mk/bsd.prefs.mk"
@@ -43,5 +40,6 @@ do-install:
            \! -name .gitignore \! -name .gitmodules  -print | \
                 ${PAX} -rw -pmp ${DESTDIR}${PREFIX}/${AVIDEODIR}
 
+.include "../../lang/php/json.mk"
 .include "../../lang/php/phpversion.mk"
 .include "../../mk/bsd.pkg.mk"