Index: head/graphics/pecl-imagick/files/patch-php__imagick.h =================================================================== --- head/graphics/pecl-imagick/files/patch-php__imagick.h (revision 553257) +++ head/graphics/pecl-imagick/files/patch-php__imagick.h (nonexistent) @@ -1,23 +0,0 @@ ---- php_imagick.h.orig 2019-05-02 15:26:00 UTC -+++ php_imagick.h -@@ -47,5 +47,20 @@ - extern zend_module_entry imagick_module_entry; - #define phpext_imagick_ptr &imagick_module_entry - -+#if PHP_VERSION_ID >= 80000 -+#ifndef TSRMLS_C -+#define TSRMLS_C -+#endif -+#ifndef TSRMLS_CC -+#define TSRMLS_CC -+#endif -+#ifndef TSRMLS_D -+#define TSRMLS_D -+#endif -+#ifndef TSRMLS_DC -+#define TSRMLS_DC -+#endif -+#endif -+ - #endif /* PHP_IMAGICK_H */ - Property changes on: head/graphics/pecl-imagick/files/patch-php__imagick.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/graphics/pecl-imagick/files/patch-php__imagick__defs.h =================================================================== --- head/graphics/pecl-imagick/files/patch-php__imagick__defs.h (revision 553257) +++ head/graphics/pecl-imagick/files/patch-php__imagick__defs.h (nonexistent) @@ -1,13 +0,0 @@ ---- php_imagick_defs.h.orig 2020-10-25 08:13:09 UTC -+++ php_imagick_defs.h -@@ -20,6 +20,10 @@ - #ifndef PHP_IMAGICK_DEFS_H /* PHP_IMAGICK_DEFS_H */ - # define PHP_IMAGICK_DEFS_H - -+#ifndef HAVE_LOCALE_H -+#define HAVE_LOCALE_H -+#endif -+ - /* Include magic wand header */ - #if defined (IM_MAGICKWAND_HEADER_STYLE_SEVEN) - # include Property changes on: head/graphics/pecl-imagick/files/patch-php__imagick__defs.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/graphics/pecl-imagick/files/patch-imagick__class.c =================================================================== --- head/graphics/pecl-imagick/files/patch-imagick__class.c (revision 553257) +++ head/graphics/pecl-imagick/files/patch-imagick__class.c (nonexistent) @@ -1,12 +0,0 @@ ---- imagick_class.c.orig 2020-10-25 08:02:54 UTC -+++ imagick_class.c -@@ -12006,7 +12006,9 @@ PHP_METHOD(imagick, setprogressmonitor) - - callback = (php_imagick_callback *) emalloc(sizeof(php_imagick_callback)); - -+#if PHP_VERSION_ID < 80000 - TSRMLS_SET_CTX(callback->thread_ctx); -+#endif - //We can't free the previous callback as we can't guarantee that - //ImageMagick won't use it at some point. There is no 'unbind' function - //for previously set 'MagickSetImageProgressMonitor' Property changes on: head/graphics/pecl-imagick/files/patch-imagick__class.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/graphics/pecl-imagick/files/patch-imagick__helpers.c =================================================================== --- head/graphics/pecl-imagick/files/patch-imagick__helpers.c (revision 553257) +++ head/graphics/pecl-imagick/files/patch-imagick__helpers.c (nonexistent) @@ -1,12 +0,0 @@ ---- imagick_helpers.c.orig 2020-10-25 08:02:44 UTC -+++ imagick_helpers.c -@@ -113,7 +113,9 @@ MagickBooleanType php_imagick_progress_monitor_callabl - #endif - fci.param_count = 2; - fci.params = zargs; -+#if PHP_VERSION_ID < 80000 - fci.no_separation = 0; -+#endif - #if PHP_VERSION_ID < 70100 - fci.symbol_table = NULL; - #endif Property changes on: head/graphics/pecl-imagick/files/patch-imagick__helpers.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/graphics/pecl-imagick/Makefile =================================================================== --- head/graphics/pecl-imagick/Makefile (revision 553257) +++ head/graphics/pecl-imagick/Makefile (revision 553258) @@ -1,25 +1,30 @@ # Created by: Andrey Slusar # $FreeBSD$ PORTNAME= imagick PORTVERSION= 3.4.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics + +PATCH_SITES= https://github.com/Imagick/imagick/commit/ +PATCHFILES+= e1a8d8a99f8eeab13574fcba20c85660a210e350.diff:-p1 \ + ef46023bfba719183a8dcf880c1aa14cf77c006c.diff:-p1 \ + 6160bd9617f6c4fc59b7db4ab77460ec085d3169.diff:-p1 MAINTAINER= mm@FreeBSD.org COMMENT?= PHP wrapper to the ImageMagick/GraphicsMagick library version 6 LICENSE= PHP301 USES= php:pecl pkgconfig localbase CONFLICTS_INSTALL?= ${PKGNAMEPREFIX}${PORTNAME}-im7-[0-9]* OPTIONS_DEFINE= X11 X11_LIB_DEPENDS?= libMagickWand-6.so:graphics/ImageMagick6 X11_LIB_DEPENDS_OFF?= libMagickWand-6.so:graphics/ImageMagick6-nox11 CONFIGURE_ARGS= --with-imagick=${LOCALBASE} .include Index: head/graphics/pecl-imagick/distinfo =================================================================== --- head/graphics/pecl-imagick/distinfo (revision 553257) +++ head/graphics/pecl-imagick/distinfo (revision 553258) @@ -1,3 +1,9 @@ -TIMESTAMP = 1560062706 +TIMESTAMP = 1603625525 SHA256 (PECL/imagick-3.4.4.tgz) = 8dd5aa16465c218651fc8993e1faecd982e6a597870fd4b937e9ece02d567077 SIZE (PECL/imagick-3.4.4.tgz) = 253434 +SHA256 (PECL/e1a8d8a99f8eeab13574fcba20c85660a210e350.diff) = f3f6ce0b0c11925c29664c2f4944b77ea800c61987906dcb73c488e75e445a15 +SIZE (PECL/e1a8d8a99f8eeab13574fcba20c85660a210e350.diff) = 10010 +SHA256 (PECL/ef46023bfba719183a8dcf880c1aa14cf77c006c.diff) = 3deedb123ae262275ce8b7dbc00c30932c503b502de79e78d38930a3ad7e4299 +SIZE (PECL/ef46023bfba719183a8dcf880c1aa14cf77c006c.diff) = 406 +SHA256 (PECL/6160bd9617f6c4fc59b7db4ab77460ec085d3169.diff) = 80101cd5240a0e530d7c436ec74685a3eb4b78adae00b8ca276e7f0215a3016e +SIZE (PECL/6160bd9617f6c4fc59b7db4ab77460ec085d3169.diff) = 469