sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

graphics/pecl-imagick: Update/bump consumers

Browse source 
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)
This commit is contained in:
Miroslav Lachman 2023-07-04 21:00:00 +00:00 • committed by Felix Palmen
parent b8e72f7c31
commit a47ec034b7
3 changed files with 6 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
www/nextcloud/Makefile
View file

@ -1,5 +1,6 @@
PORTNAME= nextcloud PORTNAME= nextcloud
PORTVERSION= 27.0.0 PORTVERSION= 27.0.0
PORTREVISION= 1
CATEGORIES= www CATEGORIES= www
MASTER_SITES= https://download.nextcloud.com/server/releases/ MASTER_SITES= https://download.nextcloud.com/server/releases/
PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX} 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} APCU_RUN_DEPENDS= ${PECL_PKGNAMEPREFIX}APCu>0:devel/pecl-APCu@${PHP_FLAVOR}
EXIF_USE= PHP=exif 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 INTL_USE= PHP=intl
LDAP_USE= PHP=ldap LDAP_USE= PHP=ldap
MYSQL_USE= PHP=pdo_mysql MYSQL_USE= PHP=pdo_mysql
@ -62,14 +63,6 @@ SYSVSEM_USE= PHP=sysvsem
.include <bsd.port.options.mk> .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: post-extract:
@${MV} ${WRKSRC}/config/config.sample.php ${WRKSRC}/config/config.documented.php @${MV} ${WRKSRC}/config/config.sample.php ${WRKSRC}/config/config.documented.php
@${MV} ${WRKSRC}/.htaccess ${WRKSRC}/.htaccess.dist @${MV} ${WRKSRC}/.htaccess ${WRKSRC}/.htaccess.dist

10
www/piwigo/Makefile
View file

@ -1,6 +1,6 @@
PORTNAME= piwigo PORTNAME= piwigo
DISTVERSION= 13.8.0 DISTVERSION= 13.8.0
PORTREVISION= 0 PORTREVISION= 1
PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX} PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX}
CATEGORIES= www CATEGORIES= www
MASTER_SITES= https://piwigo.org/download/dlcounter.php?code=${PORTVERSION}&/ 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 EXIFTOOL_RUN_DEPENDS= exiftool:graphics/p5-Image-ExifTool
FFMPEG_RUN_DEPENDS= ffmpeg:multimedia/ffmpeg 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 MEDIAINFO_RUN_DEPENDS= mediainfo:multimedia/mediainfo
.include <bsd.port.pre.mk> .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: pre-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}/ @${MKDIR} ${STAGEDIR}${DOCSDIR}/
@cd ${WRKSRC}/doc/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/ @cd ${WRKSRC}/doc/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/

11
www/wordpress/Makefile
View file

@ -1,5 +1,6 @@
PORTNAME= wordpress PORTNAME= wordpress
DISTVERSION= 6.2.2 DISTVERSION= 6.2.2
PORTREVISION?= 1
.ifndef WORDPRESS_LANG .ifndef WORDPRESS_LANG
PORTEPOCH= 1 PORTEPOCH= 1
MASTER_SITES= https://wordpress.org/ MASTER_SITES= https://wordpress.org/
@ -17,7 +18,7 @@ WWW= ${MASTER_SITES}
LICENSE= GPLv2+ LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/license.txt 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 USES= cpe php:web
.if ${DISTVERSION:N*.*.*} .if ${DISTVERSION:N*.*.*}
@ -41,14 +42,6 @@ OPTIONS_DEFINE= DOCS
.include <bsd.port.options.mk> .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:: pre-everything::
@${ECHO_CMD} "If you want to upgrade, you must read upgrade document." @${ECHO_CMD} "If you want to upgrade, you must read upgrade document."
@${ECHO_CMD} "" @${ECHO_CMD} ""