CVS commit: pkgsrc/www/moodle

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

Module Name:    pkgsrc
Committed By:   taca
Date:           Mon Nov 13 16:07:02 UTC 2023

Modified Files:
        pkgsrc/www/moodle: Makefile

Log Message:
www/moodle: fix build problem with PHP 8.0 and 8.1

* Use lang/php/json.mk for dependency to php-json.
* Drop dependency to php-xmlrpc since moodle has its own xmlrpc library
  in it.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.97 -r1.98 pkgsrc/www/moodle/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/moodle/Makefile
diff -u pkgsrc/www/moodle/Makefile:1.97 pkgsrc/www/moodle/Makefile:1.98
--- pkgsrc/www/moodle/Makefile:1.97     Sun Jan  8 01:45:43 2023
+++ pkgsrc/www/moodle/Makefile  Mon Nov 13 16:07:01 2023
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.97 2023/01/08 01:45:43 wen Exp $
+# $NetBSD: Makefile,v 1.98 2023/11/13 16:07:01 taca Exp $
 
 DISTNAME=      moodle-4.1
+PKGREVISION=   1
 CATEGORIES=    www
 MASTER_SITES=  https://sourceforge.net/projects/moodle/files/Moodle/stable401/
 EXTRACT_SUFX=  .tgz
@@ -14,9 +15,7 @@ DEPENDS+=     ${PHP_PKG_PREFIX}-gd>=7.3.0:..
 DEPENDS+=      ${PHP_PKG_PREFIX}-iconv>=7.3.0:../../converters/php-iconv
 DEPENDS+=      ${PHP_PKG_PREFIX}-mbstring>=7.3.0:../../converters/php-mbstring
 DEPENDS+=      ${PHP_PKG_PREFIX}-curl>=7.3.0:../../www/php-curl
-DEPENDS+=      ${PHP_PKG_PREFIX}-xmlrpc>=7.3.0:../../net/php-xmlrpc
 DEPENDS+=      ${PHP_PKG_PREFIX}-soap>=7.3.0:../../net/php-soap
-DEPENDS+=      ${PHP_PKG_PREFIX}-json>=7.3.0:../../textproc/php-json
 DEPENDS+=      ${PHP_PKG_PREFIX}-intl>=7.3.0:../../textproc/php-intl
 DEPENDS+=      ${PHP_PKG_PREFIX}-zip>=7.3.0:../../archivers/php-zip
 DEPENDS+=      ${PHP_PKG_PREFIX}-zlib>=7.3.0:../../archivers/php-zlib
@@ -88,5 +87,6 @@ post-install:
        ${INSTALL_DATA_DIR} ${DESTDIR}${MOODLEDATADIR}
        ${CHOWN} ${APACHE_USER}:${APACHE_GROUP} ${DESTDIR}${MOODLEDATADIR}
 
+.include "../../lang/php/json.mk"
 .include "../../lang/php/phpversion.mk"
 .include "../../mk/bsd.pkg.mk"