From a47ec034b7549d2959e45048071d58eff989b29d Mon Sep 17 00:00:00 2001
From: Miroslav Lachman <000.fbsd@quip.cz>
Date: Tue, 4 Jul 2023 21:00:00 +0000
Subject: [PATCH] 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 0ac3d87d80ab1..5739b54b88ba9 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 <bsd.port.options.mk>
 
-.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 ca1418de6f9b5..b827ae504611f 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 <bsd.port.pre.mk>
 
-.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 da689ff888b73..1cb2f488f9688 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 <bsd.port.options.mk>
 
-.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} ""