Attachment 243236 Details for Bug 268833 – pecl-imagick full patch to update MOVED and ports depending on pecl-imagick

[patch] pecl-imagick full patch to update MOVED and ports depending on pecl-imagick

pecl-imagick.merged_full.patch (text/plain), 5.19 KB, created by Miroslav Lachman on 2023-07-04 20:59:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Miroslav Lachman

Created: 2023-07-04 20:59:35 UTC

Size: 5.19 KB

patch

obsolete

>diff -u -r ports.orig/MOVED ports/MOVED
>--- ports.orig/MOVED	2023-07-03 23:37:11.850205000 +0200
>+++ ports/MOVED	2023-07-04 00:10:58.386840000 +0200
>@@ -7762,3 +7762,4 @@
> sysutils/cfengine-masterfiles318||2023-07-02|Has expired: Expire one year after cfengine-masterfiles 3.19.0 released
> sysutils/cfengine318||2023-07-02|Has expired: Expire one year after cfengine 3.19.0 released
> devel/linux-c7-dbus-glib||2023-07-02|Merged into devel/linux-c7-dbus-libs
>+graphics/pecl-imagick-im7|graphics/pecl-imagick|2023-07-04|Merged into master port
>diff -u -r ports.orig/graphics/Makefile ports/graphics/Makefile
>--- ports.orig/graphics/Makefile	2023-07-03 23:37:12.165796000 +0200
>+++ ports/graphics/Makefile	2023-07-04 00:01:21.337280000 +0200
>@@ -762,7 +762,6 @@
>     SUBDIR += pear-Image_GraphViz
>     SUBDIR += pear-Image_Transform
>     SUBDIR += pecl-imagick
>-    SUBDIR += pecl-imagick-im7
>     SUBDIR += pecl-qrencode
>     SUBDIR += pecl-vips
>     SUBDIR += pencil2d
>diff -u -r ports.orig/graphics/pecl-imagick/Makefile ports/graphics/pecl-imagick/Makefile
>--- ports.orig/graphics/pecl-imagick/Makefile	2023-05-13 15:29:21.092916000 +0200
>+++ ports/graphics/pecl-imagick/Makefile	2023-07-04 21:59:16.560890000 +0200
>@@ -1,24 +1,17 @@
> PORTNAME=	imagick
> PORTVERSION=	3.7.0
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	graphics
> 
> MAINTAINER=	000.fbsd@quip.cz
>-COMMENT?=	PHP wrapper to the ImageMagick/GraphicsMagick library version 6
>+COMMENT?=	PHP wrapper to the ImageMagick/GraphicsMagick library
> WWW=		https://pecl.php.net/package/imagick
> 
> LICENSE=	PHP301
> 
>-USES=		cpe php:pecl localbase
>+USES=		cpe php:pecl localbase magick
> 
> CPE_VENDOR=	php
>-
>-CONFLICTS_INSTALL?=	${PKGNAMEPREFIX}${PORTNAME}-im7
>-
>-OPTIONS_DEFINE=	X11
>-
>-X11_USES?=		magick:6
>-X11_USES_OFF?=		magick:6,nox11
> 
> CONFIGURE_ARGS=	--with-imagick=${LOCALBASE}
> 
>diff -u -r ports.orig/www/nextcloud/Makefile ports/www/nextcloud/Makefile
>--- ports.orig/www/nextcloud/Makefile	2023-06-15 14:03:34.035411000 +0200
>+++ ports/www/nextcloud/Makefile	2023-07-04 00:05:49.184696000 +0200
>@@ -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 @@
> 
> 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
>@@ -61,14 +62,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
>diff -u -r ports.orig/www/piwigo/Makefile ports/www/piwigo/Makefile
>--- ports.orig/www/piwigo/Makefile	2023-05-13 15:29:21.529302000 +0200
>+++ ports/www/piwigo/Makefile	2023-07-04 00:05:16.690131000 +0200
>@@ -1,6 +1,6 @@
> PORTNAME=	piwigo
> DISTVERSION=	13.7.0
>-PORTREVISION=	1
>+PORTREVISION=	2
> PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
> CATEGORIES=	www
> MASTER_SITES=	https://piwigo.org/download/dlcounter.php?code=${PORTVERSION}&/
>@@ -48,16 +48,10 @@
> 
> 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}/
>diff -u -r ports.orig/www/wordpress/Makefile ports/www/wordpress/Makefile
>--- ports.orig/www/wordpress/Makefile	2023-06-15 14:03:34.079912000 +0200
>+++ ports/www/wordpress/Makefile	2023-07-04 00:07:00.383860000 +0200
>@@ -17,7 +17,7 @@
> 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*.*.*}
>@@ -40,14 +40,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."

Actions: View | Diff

Attachments on bug 268833: 241152 | 241153 | 243224 | 243236 | 243239 | 243240 | 243241