Re: CVS commit: pkgsrc/www

[Juraj Lutter <otis%NetBSD.org@localhost>]

This is weird:

I’ve added php-phalcon4 but this seems to commit into php-phalcon.
Please, what did I screwed up?

Thanks.

> On 21 Nov 2020, at 14:57, Juraj Lutter <otis%netbsd.org@localhost> wrote:
> 
> Module Name:	pkgsrc
> Committed By:	otis
> Date:		Sat Nov 21 13:57:21 UTC 2020
> 
> Modified Files:
> 	pkgsrc/www: Makefile
> 	pkgsrc/www/php-phalcon: Makefile distinfo
> Added Files:
> 	pkgsrc/www/php-phalcon: buildlink3.mk
> 
> Log Message:
> php-phalcon4: Add php-phalcon4 4.1.0
> 
> Phalcon is a full stack PHP framework offering low resource consumption and
> high performance.
> 
> See https://pecl.php.net/package/phalcon
> 
> 
> To generate a diff of this commit:
> cvs rdiff -u -r1.1494 -r1.1495 pkgsrc/www/Makefile
> cvs rdiff -u -r1.5 -r1.6 pkgsrc/www/php-phalcon/Makefile
> cvs rdiff -u -r0 -r1.1 pkgsrc/www/php-phalcon/buildlink3.mk
> cvs rdiff -u -r1.4 -r1.5 pkgsrc/www/php-phalcon/distinfo
> 
> Please note that diffs are not public domain; they are subject to the
> copyright notices on the relevant files.
> 
> Modified files:
> 
> Index: pkgsrc/www/Makefile
> diff -u pkgsrc/www/Makefile:1.1494 pkgsrc/www/Makefile:1.1495
> --- pkgsrc/www/Makefile:1.1494	Wed Nov 18 14:01:05 2020
> +++ pkgsrc/www/Makefile	Sat Nov 21 13:57:21 2020
> @@ -1,4 +1,4 @@
> -# $NetBSD: Makefile,v 1.1494 2020/11/18 14:01:05 nikita Exp $
> +# $NetBSD: Makefile,v 1.1495 2020/11/21 13:57:21 otis Exp $
> #
> 
> COMMENT=	Packages related to the World Wide Web
> @@ -605,6 +605,7 @@ SUBDIR+=	php-ja-wordpress
> SUBDIR+=	php-nextcloud
> SUBDIR+=	php-owncloud
> SUBDIR+=	php-phalcon
> +SUBDIR+=	php-phalcon4
> SUBDIR+=	php-phrasea2
> SUBDIR+=	php-piwigo
> SUBDIR+=	php-propro
> 
> Index: pkgsrc/www/php-phalcon/Makefile
> diff -u pkgsrc/www/php-phalcon/Makefile:1.5 pkgsrc/www/php-phalcon/Makefile:1.6
> --- pkgsrc/www/php-phalcon/Makefile:1.5	Fri Jul 10 10:11:02 2020
> +++ pkgsrc/www/php-phalcon/Makefile	Sat Nov 21 13:57:21 2020
> @@ -1,8 +1,8 @@
> -# $NetBSD: Makefile,v 1.5 2020/07/10 10:11:02 plunky Exp $
> +# $NetBSD: Makefile,v 1.6 2020/11/21 13:57:21 otis Exp $
> #
> 
> MODNAME=		phalcon
> -PECL_VERSION=		3.4.5
> +PECL_VERSION=		4.1.0
> PKGNAME=		${PHP_PKG_PREFIX}-${DISTNAME}
> CATEGORIES=		www
> MASTER_SITES=		${MASTER_SITE_GITHUB:=phalcon/}
> @@ -12,6 +12,10 @@ HOMEPAGE=		https://phalconphp.com/
> COMMENT=		Web framework implemented as a C extension offering high performance
> LICENSE=		php
> 
> +CONFLICTS=		php-phalcon-[0-9]*
> +
> +PHP_VERSIONS_ACCEPTED=  72 73 74
> +
> GITHUB_PROJECT=		cphalcon
> GITHUB_TAG=		v${PKGVERSION_NOREV}
> 
> @@ -19,12 +23,12 @@ USE_LANGUAGES=		c c++
> USE_TOOLS+=		gmake pkg-config
> 
> BUILD_DEPENDS+=		re2c>=0.15.3:../../devel/re2c
> -DEPENDS+=		${PHP_PKG_PREFIX}-curl>=5.6.0:../../www/php-curl
> -DEPENDS+=		${PHP_PKG_PREFIX}-gd>=5.6.0:../../graphics/php-gd
> -DEPENDS+=		${PHP_PKG_PREFIX}-json>=5.6.0:../../textproc/php-json
> -DEPENDS+=		${PHP_PKG_PREFIX}-mbstring>=5.6.0:../../converters/php-mbstring
> -DEPENDS+=		${PHP_PKG_PREFIX}-pdo>=5.6.0:../../databases/php-pdo
> -DEPENDS+=		${PHP_PKG_PREFIX}-pdo_mysql>=5.6.0:../../databases/php-pdo_mysql
> +DEPENDS+=		${PHP_PKG_PREFIX}-curl>=7.2.0:../../www/php-curl
> +DEPENDS+=		${PHP_PKG_PREFIX}-gettext>=7.2.0:../../devel/php-gettext
> +DEPENDS+=		${PHP_PKG_PREFIX}-json>=7.2.0:../../textproc/php-json
> +DEPENDS+=		${PHP_PKG_PREFIX}-mbstring>=7.2.0:../../converters/php-mbstring
> +DEPENDS+=		${PHP_PKG_PREFIX}-pdo>=7.2.0:../../databases/php-pdo
> +DEPENDS+=		${PHP_PKG_PREFIX}-psr>=1.0.0:../../devel/php-psr
> 
> .include "../../lang/php/phpversion.mk"
> 
> 
> Index: pkgsrc/www/php-phalcon/distinfo
> diff -u pkgsrc/www/php-phalcon/distinfo:1.4 pkgsrc/www/php-phalcon/distinfo:1.5
> --- pkgsrc/www/php-phalcon/distinfo:1.4	Fri Jul 10 10:11:02 2020
> +++ pkgsrc/www/php-phalcon/distinfo	Sat Nov 21 13:57:21 2020
> @@ -1,6 +1,6 @@
> -$NetBSD: distinfo,v 1.4 2020/07/10 10:11:02 plunky Exp $
> +$NetBSD: distinfo,v 1.5 2020/11/21 13:57:21 otis Exp $
> 
> -SHA1 (php-phalcon/phalcon-3.4.5.tar.gz) = 6ab8623a12b7a4c3b012ed8842c889a826f21a77
> -RMD160 (php-phalcon/phalcon-3.4.5.tar.gz) = 8dc7fb1c7eea9218d280804ddb79e09e1b4f3023
> -SHA512 (php-phalcon/phalcon-3.4.5.tar.gz) = b91cd00e2d82ccf87d56cd35f9281c24feaa8dafb02e3c591f31c56ceb3d7d057358a9b4f9f8160119151f4594a62588660dc3cdecf6ba5c7e9b3db878190890
> -Size (php-phalcon/phalcon-3.4.5.tar.gz) = 6707873 bytes
> +SHA1 (php-phalcon/phalcon-4.1.0.tar.gz) = d10cb5958e8f050dfdd7a5b83e6146abd2f2d8ba
> +RMD160 (php-phalcon/phalcon-4.1.0.tar.gz) = 023f767bcc8099a108ee3c3cc0760ddb8fce27f0
> +SHA512 (php-phalcon/phalcon-4.1.0.tar.gz) = 2e4f8b1502a0c2f850a0e24f4981859cecc7dd262a517510be02c04b6d6b8ef082e574063706db75837762bda8fdc3f5aee9a6a06ad742c8f72f9eb30dc7f1c2
> +Size (php-phalcon/phalcon-4.1.0.tar.gz) = 7083394 bytes
> 
> Added files:
> 
> Index: pkgsrc/www/php-phalcon/buildlink3.mk
> diff -u /dev/null pkgsrc/www/php-phalcon/buildlink3.mk:1.1
> --- /dev/null	Sat Nov 21 13:57:21 2020
> +++ pkgsrc/www/php-phalcon/buildlink3.mk	Sat Nov 21 13:57:21 2020
> @@ -0,0 +1,12 @@
> +# $NetBSD: buildlink3.mk,v 1.1 2020/11/21 13:57:21 otis Exp $
> +
> +BUILDLINK_TREE+=	php-phalcon4
> +
> +.if !defined(PHP_PHALCON4_BUILDLINK3_MK)
> +PHP_PHALCON4_BUILDLINK3_MK:=
> +
> +BUILDLINK_API_DEPENDS.php-phalcon4+=	php-phalcon4>=1.0.0
> +BUILDLINK_PKGSRCDIR.php-phalcon4?=	../../www/php-phalcon4
> +.endif	# PHP_PHALCON4_BUILDLINK3_MK
> +
> +BUILDLINK_TREE+=	-php-phalcon4
>