From nobody Wed Jul 19 11:09:23 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4R5Y440RK0z4ns3j; Wed, 19 Jul 2023 11:09:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R5Y4359rcz3Llq; Wed, 19 Jul 2023 11:09:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689764963; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BmK8bPlFEX3duJOB3Jsi+y5mo7Y3Jk9E/EcMbkhgSOk=; b=YFtjm58bqBJtwolhEoBZUUbGlHgPilkGDA705myNXswQDUru4mF56KYlMx3z4MXu3dlnV8 x1I8MCUkorPqcv+hbw9xdazTILDlK5+sxMkUlhZ81jhmGV36kPjMFNisyorfe65E32WFHF 8eLqpVNrtwQFrJVUQlwb2cUeO8E/iHAUcfcXSQ93rf9FMyBFjG2kJcK1OL49t4LZeruSL9 M7RmbZNDffRuu6tXDmIOUTQXYqGVWE3Rrth/DpGTmT90U4VBACRa2vcGjQX06IpcYpDQTe BFhVHl0IYjO/xtIJ61wh3b5Ks1F+ku25FSamWUnX4osmXO16/I7frx/guPKgtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689764963; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BmK8bPlFEX3duJOB3Jsi+y5mo7Y3Jk9E/EcMbkhgSOk=; b=XNn9mVer0+HBGkswrMX++P4fv4YKvJPfb41GbGxLqNCu8iiUjfXalx8NtuUE57Nr1kruXB T05yIChRzbwMEZ878NcCzSNOnY0GHALL5rF7CxbO7Om41D3IZeQ0nzT0tdA8u7n6Vpshd6 nEijlccVAgUxIJtfkgDHIne3FE31OCsKFBZjd2QWfwbdwwkgzrda+TGmn8tRlCgLy95Cor XJ0b7mrRtpuJQ211HJgqUdiE69gW04nQcIidvyyyO1dvHwX64hkAhLu3Fw0nJO1gmhd1Ss H1+7KnO3KZRnRuY8IeiJwrTlfDBWJ48CiSmEqWvzTx4/HjD/TWHBMvZS7i2C2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689764963; a=rsa-sha256; cv=none; b=I3Jk4G3TEFiqh/Pud7ZI0jPU+LU0XxpwTPKi76xxHJgNHvo0sV8UFYv8aXNFDzEtqMFjG6 4cQszxEBKrWzwzzZuEWCOW20J3jORlb9q1THY0j3QEU+j92Khu7cYoi4XNwaZkbnu72T1L HvUCdkPTw+UAHQWXO9gOOec2gURTujc6G1TWiy3y3nSwddK0pW16+LfTeFMsYTBWFMlR7X LEplR909q+anoR9XNUmyvIWZGMsdHxGkij3S1ePlhtIqbVCfSvGadbOn2kG6BOVd9RgGB5 RcdQBThzeLP9JXCsxq6zFI5M8WF+Jlwsz0JKu/3TBbPjf9VnFNZwLcn95AYWeg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R5Y434BVDzl3R; Wed, 19 Jul 2023 11:09:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36JB9Nie087092; Wed, 19 Jul 2023 11:09:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36JB9NCs087091; Wed, 19 Jul 2023 11:09:23 GMT (envelope-from git) Date: Wed, 19 Jul 2023 11:09:23 GMT Message-Id: <202307191109.36JB9NCs087091@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Felix Palmen Subject: git: a47ec034b754 - main - graphics/pecl-imagick: Update/bump consumers List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zirias X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a47ec034b7549d2959e45048071d58eff989b29d Auto-Submitted: auto-generated The branch main has been updated by zirias: URL: https://cgit.FreeBSD.org/ports/commit/?id=a47ec034b7549d2959e45048071d58eff989b29d commit a47ec034b7549d2959e45048071d58eff989b29d Author: Miroslav Lachman <000.fbsd@quip.cz> AuthorDate: 2023-07-04 21:00:00 +0000 Commit: Felix Palmen CommitDate: 2023-07-19 11:05:22 +0000 graphics/pecl-imagick: Update/bump consumers www/nextcloud, www/piwigo and www/wordpress had some custom logic to select the pecl-imagick port based on the default ImageMagick version. This is now obsolete with the removal of pecl-imagick-im7 and must be removed. As this changes dependencies, also bump PORTREVISION in these ports. Other consumers of pecl-imagick don't need a bump because they only use ImageMagick through the PHP API, they don't directly link any shared libs. PR: 268833 Approved by: portmgr (blanket) --- www/nextcloud/Makefile | 11 ++--------- www/piwigo/Makefile | 10 ++-------- www/wordpress/Makefile | 11 ++--------- 3 files changed, 6 insertions(+), 26 deletions(-) diff --git a/www/nextcloud/Makefile b/www/nextcloud/Makefile index 0ac3d87d80ab..5739b54b88ba 100644 --- a/www/nextcloud/Makefile +++ b/www/nextcloud/Makefile @@ -1,5 +1,6 @@ PORTNAME= nextcloud PORTVERSION= 27.0.0 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= https://download.nextcloud.com/server/releases/ PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX} @@ -48,7 +49,7 @@ SYSVSEM_DESC= Enable System V semaphore support (recommended) APCU_RUN_DEPENDS= ${PECL_PKGNAMEPREFIX}APCu>0:devel/pecl-APCu@${PHP_FLAVOR} EXIF_USE= PHP=exif -IMAGICK_RUN_DEPENDS= ${IMAGEMAGICK_DEPENDS} +IMAGICK_RUN_DEPENDS= ${PECL_PKGNAMEPREFIX}imagick>=2.2.2:graphics/pecl-imagick@${PHP_FLAVOR} INTL_USE= PHP=intl LDAP_USE= PHP=ldap MYSQL_USE= PHP=pdo_mysql @@ -62,14 +63,6 @@ SYSVSEM_USE= PHP=sysvsem .include -.if !empty(IMAGEMAGICK_DEFAULT:M6) || !empty(IMAGEMAGICK_DEFAULT:M6-*) -IMAGEMAGICK_DEPENDS= ${PECL_PKGNAMEPREFIX}imagick>=2.2.2:graphics/pecl-imagick@${PHP_FLAVOR} -.elif !empty(IMAGEMAGICK_DEFAULT:M7) || !empty(IMAGEMAGICK_DEFAULT:M7-*) -IMAGEMAGICK_DEPENDS= ${PECL_PKGNAMEPREFIX}imagick-im7>=2.2.2:graphics/pecl-imagick-im7@${PHP_FLAVOR} -.else -# notreached -.endif - post-extract: @${MV} ${WRKSRC}/config/config.sample.php ${WRKSRC}/config/config.documented.php @${MV} ${WRKSRC}/.htaccess ${WRKSRC}/.htaccess.dist diff --git a/www/piwigo/Makefile b/www/piwigo/Makefile index ca1418de6f9b..b827ae504611 100644 --- a/www/piwigo/Makefile +++ b/www/piwigo/Makefile @@ -1,6 +1,6 @@ PORTNAME= piwigo DISTVERSION= 13.8.0 -PORTREVISION= 0 +PORTREVISION= 1 PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX} CATEGORIES= www MASTER_SITES= https://piwigo.org/download/dlcounter.php?code=${PORTVERSION}&/ @@ -48,17 +48,11 @@ OPT_DESC= Optional dependencies EXIFTOOL_RUN_DEPENDS= exiftool:graphics/p5-Image-ExifTool FFMPEG_RUN_DEPENDS= ffmpeg:multimedia/ffmpeg -IMAGICK_RUN_DEPENDS= ${IMAGEMAGICK_DEPENDS} +IMAGICK_RUN_DEPENDS= ${PECL_PKGNAMEPREFIX}imagick>=2.2.2:graphics/pecl-imagick@${PHP_FLAVOR} MEDIAINFO_RUN_DEPENDS= mediainfo:multimedia/mediainfo .include -.if !empty(IMAGEMAGICK_DEFAULT:M6) || !empty(IMAGEMAGICK_DEFAULT:M6-*) -IMAGEMAGICK_DEPENDS= ${PECL_PKGNAMEPREFIX}imagick>=2.2.2:graphics/pecl-imagick@${PHP_FLAVOR} -.elif !empty(IMAGEMAGICK_DEFAULT:M7) || !empty(IMAGEMAGICK_DEFAULT:M7-*) -IMAGEMAGICK_DEPENDS= ${PECL_PKGNAMEPREFIX}imagick-im7>=2.2.2:graphics/pecl-imagick-im7@${PHP_FLAVOR} -.endif - pre-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR}/ @cd ${WRKSRC}/doc/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/ diff --git a/www/wordpress/Makefile b/www/wordpress/Makefile index da689ff888b7..1cb2f488f968 100644 --- a/www/wordpress/Makefile +++ b/www/wordpress/Makefile @@ -1,5 +1,6 @@ PORTNAME= wordpress DISTVERSION= 6.2.2 +PORTREVISION?= 1 .ifndef WORDPRESS_LANG PORTEPOCH= 1 MASTER_SITES= https://wordpress.org/ @@ -17,7 +18,7 @@ WWW= ${MASTER_SITES} LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/license.txt -RUN_DEPENDS= ${IMAGEMAGICK_DEPENDS} +RUN_DEPENDS= ${PECL_PKGNAMEPREFIX}imagick>=2.2.2:graphics/pecl-imagick@${PHP_FLAVOR} USES= cpe php:web .if ${DISTVERSION:N*.*.*} @@ -41,14 +42,6 @@ OPTIONS_DEFINE= DOCS .include -.if !empty(IMAGEMAGICK_DEFAULT:M6) || !empty(IMAGEMAGICK_DEFAULT:M6-*) -IMAGEMAGICK_DEPENDS= ${PECL_PKGNAMEPREFIX}imagick>=2.2.2:graphics/pecl-imagick@${PHP_FLAVOR} -.elif !empty(IMAGEMAGICK_DEFAULT:M7) || !empty(IMAGEMAGICK_DEFAULT:M7-*) -IMAGEMAGICK_DEPENDS= ${PECL_PKGNAMEPREFIX}imagick-im7>=2.2.2:graphics/pecl-imagick-im7@${PHP_FLAVOR} -.else -# notreached -.endif - pre-everything:: @${ECHO_CMD} "If you want to upgrade, you must read upgrade document." @${ECHO_CMD} ""