pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc



Module Name:    pkgsrc
Committed By:   taca
Date:           Fri Aug  7 01:41:56 UTC 2026

Modified Files:
        pkgsrc/devel/phabricator: Makefile
        pkgsrc/www/drupal11: Makefile
        pkgsrc/www/moodle: Makefile
        pkgsrc/www/osticket: Makefile
        pkgsrc/www/php-glpi: Makefile

Log Message:
Use lang/php/compat.mk.

Solve the problem of dependency to php-apcu and php-opcache.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/devel/phabricator/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/www/drupal11/Makefile
cvs rdiff -u -r1.111 -r1.112 pkgsrc/www/moodle/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/www/osticket/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/www/php-glpi/Makefile

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

Modified files:

Index: pkgsrc/devel/phabricator/Makefile
diff -u pkgsrc/devel/phabricator/Makefile:1.21 pkgsrc/devel/phabricator/Makefile:1.22
--- pkgsrc/devel/phabricator/Makefile:1.21      Fri Jul 24 15:48:17 2026
+++ pkgsrc/devel/phabricator/Makefile   Fri Aug  7 01:41:55 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2026/07/24 15:48:17 taca Exp $
+# $NetBSD: Makefile,v 1.22 2026/08/07 01:41:55 taca Exp $
 
 DISTNAME=      phabricator-20170609
 PKGREVISION=   5
@@ -24,10 +24,11 @@ DEPENDS+=   ${PHP_PKG_PREFIX}-pcntl>=${PHP
 DEPENDS+=      ${PHP_PKG_PREFIX}-posix>=${PHP_BASE_VERS}:../../devel/php-posix
 DEPENDS+=      ${PHP_PKG_PREFIX}-gd>=${PHP_BASE_VERS}:../../graphics/php-gd
 DEPENDS+=      ${PHP_PKG_PREFIX}-zlib>=${PHP_BASE_VERS}:../../archivers/php-zlib
-DEPENDS+=      ${PHP_PKG_PREFIX}-opcache>=${PHP_BASE_VERS}:../../devel/php-opcache
 DEPENDS+=      libphutil-[0-9]*:../../devel/libphutil
 DEPENDS+=      arcanist-[0-9]*:../../devel/arcanist
 
+PHP_REQUIRE_MODULE=    apcu opcache
+
 REPLACE_PHP=   externals/httpful/build
 REPLACE_PHP+=  externals/restful/build-phar
 REPLACE_PHP+=  scripts/almanac/manage_almanac.php \
@@ -55,13 +56,6 @@ REPLACE_PHP+=        scripts/almanac/manage_alm
 REPLACE_BASH+= scripts/install/install_rhel-derivs.sh \
                scripts/install/install_ubuntu.sh
 
-.include "../../lang/php/phpversion.mk"
-.if ${PHP_VER} < 70
-DEPENDS+=              ${PHP_PKG_PREFIX}-apcu<5:../../www/php-apcu4
-.else
-DEPENDS+=              ${PHP_PKG_PREFIX}-apcu>=5:../../www/php-apcu
-.endif
-
 NO_BUILD=      yes
  
 RCD_SCRIPTS=   phd
@@ -86,4 +80,5 @@ do-install:
        ${PAX} -rw * -s',.*\.orig$$,,' \
                ${DESTDIR}${PREFIX}/${PHABRICATOR_DIR}
 
+.include "../../lang/php/compat.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/drupal11/Makefile
diff -u pkgsrc/www/drupal11/Makefile:1.11 pkgsrc/www/drupal11/Makefile:1.12
--- pkgsrc/www/drupal11/Makefile:1.11   Mon Aug  3 23:38:50 2026
+++ pkgsrc/www/drupal11/Makefile        Fri Aug  7 01:41:55 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2026/08/03 23:38:50 wen Exp $
+# $NetBSD: Makefile,v 1.12 2026/08/07 01:41:55 taca Exp $
 
 DISTNAME=      drupal-11.4.4
 PKGNAME=       ${PHP_PKG_PREFIX}-${DISTNAME}
@@ -11,12 +11,12 @@ COMMENT=    Open source content management 
 LICENSE=       gnu-gpl-v2
 
 DEPENDS+=      ${PHP_PKG_PREFIX}-gd>=${PHP_BASE_VERS}:../../graphics/php-gd
-DEPENDS+=      ${PHP_PKG_PREFIX}-opcache>=${PHP_BASE_VERS}:../../devel/php-opcache
 DEPENDS+=      ${PHP_PKG_PREFIX}-pdo>=${PHP_BASE_VERS}:../../databases/php-pdo
 DEPENDS+=      ${PHP_PKG_PREFIX}-mbstring>=${PHP_BASE_VERS}:../../converters/php-mbstring
 DEPENDS+=      ${PHP_PKG_PREFIX}-zlib>=${PHP_BASE_VERS}:../../archivers/php-zlib
 
 PHP_VERSIONS_ACCEPTED= 83 84 85
+PHP_REQUIRE_MODULE=    opcache
 
 NO_BUILD=      YES
 DRUPAL=                share/drupal
@@ -87,5 +87,5 @@ do-install:
        cd ${WRKSRC} && ${PAX} -rw . ${DESTDIR}${PREFIX}/${DRUPAL}
 
 
-.include "../../lang/php/phpversion.mk"
+.include "../../lang/php/compat.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/moodle/Makefile
diff -u pkgsrc/www/moodle/Makefile:1.111 pkgsrc/www/moodle/Makefile:1.112
--- pkgsrc/www/moodle/Makefile:1.111    Thu Aug  6 14:18:58 2026
+++ pkgsrc/www/moodle/Makefile  Fri Aug  7 01:41:55 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.111 2026/08/06 14:18:58 mef Exp $
+# $NetBSD: Makefile,v 1.112 2026/08/07 01:41:55 taca Exp $
 
 DISTNAME=      moodle-5.2.1
 CATEGORIES=    www
@@ -20,9 +20,10 @@ DEPENDS+=    ${PHP_PKG_PREFIX}-soap>=${PHP_
 DEPENDS+=      ${PHP_PKG_PREFIX}-intl>=${PHP_BASE_VERS}:../../textproc/php-intl
 DEPENDS+=      ${PHP_PKG_PREFIX}-zip>=${PHP_BASE_VERS}:../../archivers/php-zip
 DEPENDS+=      ${PHP_PKG_PREFIX}-zlib>=${PHP_BASE_VERS}:../../archivers/php-zlib
-DEPENDS+=      ${PHP_PKG_PREFIX}-opcache>=${PHP_BASE_VERS}:../../devel/php-opcache
 DEPENDS+=      ${PHP_PKG_PREFIX}-sodium>=${PHP_BASE_VERS}:../../security/php-sodium
 
+PHP_REQUIRE_MODULE=    json opcache
+
 EGDIR=                 share/examples/moodle
 MOODLEDIR=             ${PREFIX}/share/moodle
 MOODLEDATADIR=         ${PREFIX}/moodledata
@@ -85,6 +86,5 @@ 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 "../../lang/php/compat.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/osticket/Makefile
diff -u pkgsrc/www/osticket/Makefile:1.9 pkgsrc/www/osticket/Makefile:1.10
--- pkgsrc/www/osticket/Makefile:1.9    Sat Aug  1 17:28:51 2026
+++ pkgsrc/www/osticket/Makefile        Fri Aug  7 01:41:56 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2026/08/01 17:28:51 hauke Exp $
+# $NetBSD: Makefile,v 1.10 2026/08/07 01:41:56 taca Exp $
 
 DISTNAME=      osticket-v1.18.4
 PKGNAME=       ${DISTNAME:S/-v/-/}
@@ -27,10 +27,9 @@ DEPENDS+=    ${PHP_PKG_PREFIX}-iconv>=${PHP
 DEPENDS+=      ${PHP_PKG_PREFIX}-intl>=${PHP_BASE_VERS}:../../textproc/php-intl
 DEPENDS+=      ${PHP_PKG_PREFIX}-mbstring>=${PHP_BASE_VERS}:../../converters/php-mbstring
 DEPENDS+=      ${PHP_PKG_PREFIX}-mysqli>=${PHP_BASE_VERS}:../../databases/php-mysqli
-DEPENDS+=      ${PHP_PKG_PREFIX}-opcache>=${PHP_BASE_VERS}:../../devel/php-opcache
 DEPENDS+=      ${PHP_PKG_PREFIX}-zip>=${PHP_BASE_VERS}:../../archivers/php-zip
 
-PHP_REQUIRE_MODULE=    imap
+PHP_REQUIRE_MODULE=    imap opcache
 
 PHP_VERSIONS_ACCEPTED= 82 83 84 # does not support 5.6
 

Index: pkgsrc/www/php-glpi/Makefile
diff -u pkgsrc/www/php-glpi/Makefile:1.23 pkgsrc/www/php-glpi/Makefile:1.24
--- pkgsrc/www/php-glpi/Makefile:1.23   Wed Sep 17 00:45:00 2025
+++ pkgsrc/www/php-glpi/Makefile        Fri Aug  7 01:41:56 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2025/09/17 00:45:00 taca Exp $
+# $NetBSD: Makefile,v 1.24 2026/08/07 01:41:56 taca Exp $
 
 DISTNAME=      glpi-${GLPI_VERSION}
 PKGNAME=       ${PHP_PKG_PREFIX}-${DISTNAME}
@@ -24,7 +24,6 @@ DEPENDS+=     ${PHP_PKG_PREFIX}-intl>=${PHP_
 DEPENDS+=      ${PHP_PKG_PREFIX}-ldap>=${PHP_BASE_VERS}:../../databases/php-ldap
 DEPENDS+=      ${PHP_PKG_PREFIX}-mbstring>=${PHP_BASE_VERS}:../../converters/php-mbstring
 DEPENDS+=      ${PHP_PKG_PREFIX}-mysqli>=${PHP_BASE_VERS}:../../databases/php-mysqli
-DEPENDS+=      ${PHP_PKG_PREFIX}-opcache>=${PHP_BASE_VERS}:../../devel/php-opcache
 DEPENDS+=      ${PHP_PKG_PREFIX}-sodium>=${PHP_BASE_VERS}:../../security/php-sodium
 DEPENDS+=      ${PHP_PKG_PREFIX}-zip>=${PHP_BASE_VERS}:../../archivers/php-zip
 DEPENDS+=      ${PHP_PKG_PREFIX}-zlib>=${PHP_BASE_VERS}:../../archivers/php-zlib
@@ -32,6 +31,7 @@ DEPENDS+=     ${PHP_PKG_PREFIX}-zlib>=${PHP_
 DEPENDS+=      freefont-ttf-[0-9]*:../../fonts/freefont-ttf
 
 PHP_VERSIONS_ACCEPTED= 82 83 84
+PHP_REQUIRE_MODULE=    opcache
 
 NO_BUILD=      yes
 USE_LANGUAGES= # none
@@ -102,8 +102,7 @@ do-install:
        cd ${WRKSRC} && rm -r files
        cd ${WRKSRC} && ${PAX} -rw . ${DESTDIR}${PREFIX}/${GLPI_DIR}
 
-.include "../../lang/php/json.mk"
 .include "../../mk/apache.mk"
 .include "../../mk/mysql.buildlink3.mk"
-.include "../../lang/php/phpversion.mk"
+.include "../../lang/php/compat.mk"
 .include "../../mk/bsd.pkg.mk"



Home | Main Index | Thread Index | Old Index