pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/www/php-dotclear php-dotclear: Fix unresolved dependen...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/0c80da235f42
branches:  trunk
changeset: 454972:0c80da235f42
user:      triaxx <triaxx%pkgsrc.org@localhost>
date:      Thu Jun 24 19:35:17 2021 +0000

description:
php-dotclear: Fix unresolved dependency on textproc/php-json

This commit fixes the unresolved dependency on textproc/php-json during
a bulk build.
Thanks to tnn@

diffstat:

 www/php-dotclear/Makefile |  7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diffs (33 lines):

diff -r 27f8fc187ef0 -r 0c80da235f42 www/php-dotclear/Makefile
--- a/www/php-dotclear/Makefile Thu Jun 24 19:00:32 2021 +0000
+++ b/www/php-dotclear/Makefile Thu Jun 24 19:35:17 2021 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2021/06/24 02:32:27 triaxx Exp $
+# $NetBSD: Makefile,v 1.2 2021/06/24 19:35:17 triaxx Exp $
 
 DISTNAME=      dotclear-2.18.1
+PKGREVISION=   1
 PKGNAME=       ${PHP_PKG_PREFIX}-${DISTNAME}
 CATEGORIES=    www
 MASTER_SITES=  https://download.dotclear.org/latest/ \
@@ -11,9 +12,12 @@
 COMMENT=       Open-source web publising software
 LICENSE=       gnu-gpl-v2
 
+.include "../../lang/php/phpversion.mk"
 DEPENDS+=      ${PHP_PKG_PREFIX}-mbstring>=${PHP_BASE_VERS}:../../converters/php-mbstring
 DEPENDS+=      ${PHP_PKG_PREFIX}-iconv>=${PHP_BASE_VERS}:../../converters/php-iconv
+.if ${PKG_PHP_MAJOR_VERS} < 8  
 DEPENDS+=      ${PHP_PKG_PREFIX}-json>=${PHP_BASE_VERS}:../../textproc/php-json
+.endif
 DEPENDS+=      ${PHP_PKG_PREFIX}-zlib>=${PHP_BASE_VERS}:../../archivers/php-zlib
 
 NO_BUILD=      yes
@@ -21,7 +25,6 @@
 WRKSRC=                ${WRKDIR}/dotclear
 BUILD_DEFS+=   PKG_SYSCONFBASE VARBASE
 
-.include "../../lang/php/phpversion.mk"
 .include "options.mk"
 
 PHP_VERSIONS_ACCEPTED= 74 73 56



Home | Main Index | Thread Index | Old Index