Re: CVS commit: pkgsrc/www/drupal7

[Thomas Klausner <wiz%NetBSD.org@localhost>]

On Fri, Apr 09, 2021 at 04:59:51PM +0200, Thomas Klausner wrote:
> On Fri, Apr 09, 2021 at 04:53:41PM +0200, Tobias Nygren wrote:
> > Hi,
> > 
> > > Drupal 7.79, 2021-04-07
> > > -----------------------
> > > - Initial support for PHP 8
> > 
> > This depends on php80-json but that is not marked as available for php80
> > so the package fails to build with PHP 8.
> > Please check if textproc/php-json should have 80 in PHP_VERSIONS_ACCEPTED.
> 
> No, it should not.

And here's how this was fixed for another package.
 Thomas

--- Begin Message ---

• To: pkgsrc-changes%NetBSD.org@localhost
• Subject: CVS commit: pkgsrc/databases/php-redis
• From: "Takahiro Kambe" <taca%netbsd.org@localhost>
• Date: Mon, 29 Mar 2021 00:09:36 +0000

Module Name:    pkgsrc
Committed By:   taca
Date:           Mon Mar 29 00:09:36 UTC 2021

Modified Files:
        pkgsrc/databases/php-redis: Makefile

Log Message:
databases/php-redis: fix for php80

php-json is bundled in lang/php80 pacakge.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/databases/php-redis/Makefile

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

Modified files:

Index: pkgsrc/databases/php-redis/Makefile
diff -u pkgsrc/databases/php-redis/Makefile:1.14 pkgsrc/databases/php-redis/Makefile:1.15
--- pkgsrc/databases/php-redis/Makefile:1.14    Sun Mar 28 00:05:47 2021
+++ pkgsrc/databases/php-redis/Makefile Mon Mar 29 00:09:35 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2021/03/28 00:05:47 mef Exp $
+# $NetBSD: Makefile,v 1.15 2021/03/29 00:09:35 taca Exp $
 #
 
 MODNAME=       redis
@@ -24,6 +24,8 @@ WRKSRC=               ${WRKDIR}/${GITHUB_PROJECT}-${P
 CFLAGS+=       -Wno-error=return-type
 .endif
 
-.include "../../textproc/php-json/buildlink3.mk"
 .include "../../lang/php/ext.mk"
+.if ${PKG_PHP_MAJOR_VERS} < 8
+.include "../../textproc/php-json/buildlink3.mk"
+.endif
 .include "../../mk/bsd.pkg.mk"

--- End Message ---