git: 2e94a04c97d7 - main - graphics/ImageMagick*: Udpate ports
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 30 Mar 2025 06:00:14 UTC
The branch main has been updated by lbartoletti:
URL: https://cgit.FreeBSD.org/ports/commit/?id=2e94a04c97d7f9fbe799736350262fce3f615af2
commit 2e94a04c97d7f9fbe799736350262fce3f615af2
Author: Loïc Bartoletti <lbartoletti@FreeBSD.org>
AuthorDate: 2025-03-17 20:28:48 +0000
Commit: Loïc Bartoletti <lbartoletti@FreeBSD.org>
CommitDate: 2025-03-30 05:58:40 +0000
graphics/ImageMagick*: Udpate ports
PR: 285511
Exp-run by: antoine
---
graphics/ImageMagick6/Makefile | 5 ++---
graphics/ImageMagick6/distinfo | 6 +++---
graphics/ImageMagick6/files/patch-config_policy.xml | 17 -----------------
graphics/ImageMagick6/pkg-plist | 8 ++++++--
graphics/ImageMagick7/Makefile | 6 +++---
graphics/ImageMagick7/distinfo | 6 +++---
graphics/ImageMagick7/pkg-plist | 13 +++++++------
7 files changed, 24 insertions(+), 37 deletions(-)
diff --git a/graphics/ImageMagick6/Makefile b/graphics/ImageMagick6/Makefile
index 2b822aa8c9a3..1b4f0af5c599 100644
--- a/graphics/ImageMagick6/Makefile
+++ b/graphics/ImageMagick6/Makefile
@@ -1,6 +1,5 @@
PORTNAME= ImageMagick
-DISTVERSION= 6.9.12-77
-PORTREVISION= 10
+DISTVERSION= 6.9.13-23
PORTEPOCH= 1
CATEGORIES= graphics perl5
MASTER_SITES= https://ftp.acc.umu.se/mirror/imagemagick.org/ftp/releases/ \
@@ -49,7 +48,7 @@ USE_GNOME= libxml2
SAMPLE_FILES= coder.xml colors.xml delegates.xml log.xml magic.xml mime.xml \
policy.xml quantization-table.xml thresholds.xml type-apple.xml \
type-dejavu.xml type-ghostscript.xml type-urw-base35.xml \
- type-windows.xml type.xml
+ type-urw-base35-type1.xml type-windows.xml type.xml
PLIST_SUB= PORTVERSION=${PORTVERSION:R}
diff --git a/graphics/ImageMagick6/distinfo b/graphics/ImageMagick6/distinfo
index 1012d018ff97..41abc81bdc71 100644
--- a/graphics/ImageMagick6/distinfo
+++ b/graphics/ImageMagick6/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1676736813
-SHA256 (ImageMagick-6.9.12-77.tar.xz) = 3cde0149018098599610e7afaa28b9f8561f5fa428755fdeb87986b5fe012103
-SIZE (ImageMagick-6.9.12-77.tar.xz) = 9220608
+TIMESTAMP = 1742232943
+SHA256 (ImageMagick-6.9.13-23.tar.xz) = d076d60a76448923c2054ed9c01eee4dd5f3d5efe41ca96b8249e2887fc0aa48
+SIZE (ImageMagick-6.9.13-23.tar.xz) = 9616068
diff --git a/graphics/ImageMagick6/files/patch-config_policy.xml b/graphics/ImageMagick6/files/patch-config_policy.xml
deleted file mode 100644
index c2ea29d9fa35..000000000000
--- a/graphics/ImageMagick6/files/patch-config_policy.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-Upstream doesn't disable these by default.
-
---- config/policy.xml.orig 2017-09-23 12:22:04 UTC
-+++ config/policy.xml
-@@ -64,6 +64,11 @@
- <!-- <policy domain="resource" name="map" value="4GiB"/> -->
- <!-- <policy domain="resource" name="width" value="10KP"/> -->
- <!-- <policy domain="resource" name="height" value="10KP"/> -->
-+ <policy domain="coder" rights="none" pattern="EPHEMERAL" />
-+ <policy domain="coder" rights="none" pattern="URL" />
-+ <policy domain="coder" rights="none" pattern="HTTPS" />
-+ <policy domain="coder" rights="none" pattern="MVG" />
-+ <policy domain="coder" rights="none" pattern="MSL" />
- <!-- <policy domain="resource" name="list-length" value="128"/> -->
- <!-- <policy domain="resource" name="area" value="100MP"/> -->
- <!-- <policy domain="resource" name="disk" value="16EiB"/> -->
- <!-- <policy domain="resource" name="file" value="768"/> -->
diff --git a/graphics/ImageMagick6/pkg-plist b/graphics/ImageMagick6/pkg-plist
index e0ef0a8cbfd6..9933c936f7a7 100644
--- a/graphics/ImageMagick6/pkg-plist
+++ b/graphics/ImageMagick6/pkg-plist
@@ -27,6 +27,7 @@ bin/stream
@sample %%ETCDIR%%-6/type-dejavu.xml.sample
@sample %%ETCDIR%%-6/type-ghostscript.xml.sample
@sample %%ETCDIR%%-6/type-urw-base35.xml.sample
+@sample %%ETCDIR%%-6/type-urw-base35-type1.xml.sample
@sample %%ETCDIR%%-6/type-windows.xml.sample
@sample %%ETCDIR%%-6/type.xml.sample
include/ImageMagick-6/Magick++.h
@@ -614,6 +615,7 @@ share/man/man1/stream.1.gz
%%PORTDOCS%%%%DOCSDIR%%-6/www/Magick++/STL.html
%%PORTDOCS%%%%DOCSDIR%%-6/www/Magick++/TypeMetric.html
%%PORTDOCS%%%%DOCSDIR%%-6/www/Magick++/index.html
+%%PORTDOCS%%%%DOCSDIR%%-6/www/Magick++/logo.png
%%PORTDOCS%%%%DOCSDIR%%-6/www/Magick++/magick.css
%%PORTDOCS%%%%DOCSDIR%%-6/www/Magick++/montage-sample-framed.jpg
%%PORTDOCS%%%%DOCSDIR%%-6/www/Magick++/right_triangle.png
@@ -690,8 +692,9 @@ share/man/man1/stream.1.gz
%%PORTDOCS%%%%DOCSDIR%%-6/www/api/version.html
%%PORTDOCS%%%%DOCSDIR%%-6/www/api/wand-view.html
%%PORTDOCS%%%%DOCSDIR%%-6/www/architecture.html
-%%PORTDOCS%%%%DOCSDIR%%-6/www/assets/magick.css
-%%PORTDOCS%%%%DOCSDIR%%-6/www/assets/magick.js
+%%PORTDOCS%%%%DOCSDIR%%-6/www/assets/bootstrap.bundle.min.js
+%%PORTDOCS%%%%DOCSDIR%%-6/www/assets/bootstrap.min.css
+%%PORTDOCS%%%%DOCSDIR%%-6/www/assets/color-modes.js
%%PORTDOCS%%%%DOCSDIR%%-6/www/changelog.html
%%PORTDOCS%%%%DOCSDIR%%-6/www/cipher.html
%%PORTDOCS%%%%DOCSDIR%%-6/www/cite.html
@@ -745,6 +748,7 @@ share/man/man1/stream.1.gz
%%PORTDOCS%%%%DOCSDIR%%-6/www/openmp.html
%%PORTDOCS%%%%DOCSDIR%%-6/www/perl-magick.html
%%PORTDOCS%%%%DOCSDIR%%-6/www/porting.html
+%%PORTDOCS%%%%DOCSDIR%%-6/www/privacy-policy.html
%%PORTDOCS%%%%DOCSDIR%%-6/www/quantize.html
%%PORTDOCS%%%%DOCSDIR%%-6/www/resources.html
%%PORTDOCS%%%%DOCSDIR%%-6/www/search.html
diff --git a/graphics/ImageMagick7/Makefile b/graphics/ImageMagick7/Makefile
index 8fa7e997af83..57852920ad2c 100644
--- a/graphics/ImageMagick7/Makefile
+++ b/graphics/ImageMagick7/Makefile
@@ -1,6 +1,5 @@
PORTNAME= ImageMagick
-DISTVERSION= 7.1.1-26
-PORTREVISION= 6
+DISTVERSION= 7.1.1-45
CATEGORIES= graphics perl5
MASTER_SITES= https://ftp.acc.umu.se/mirror/imagemagick.org/ftp/releases/ \
https://mirror.dogado.de/imagemagick/releases/ \
@@ -47,7 +46,7 @@ USE_GNOME= libxml2
SAMPLE_FILES= colors.xml delegates.xml log.xml mime.xml policy.xml \
quantization-table.xml thresholds.xml type-apple.xml \
type-dejavu.xml type-ghostscript.xml type-urw-base35.xml \
- type-windows.xml type.xml
+ type-urw-base35-type1.xml type-windows.xml type.xml
PLIST_SUB= PORTVERSION=${PORTVERSION:R}
@@ -70,6 +69,7 @@ CONFIGURE_ARGS+= --with-x
USES+= xorg
USE_XORG= ice sm x11 xext xt
.else
+OPTIONS_EXCLUDE= PANGO RAQM SVG
CONFIGURE_ARGS+= --without-x
.endif
diff --git a/graphics/ImageMagick7/distinfo b/graphics/ImageMagick7/distinfo
index eced02353ad6..2f0d1959ccda 100644
--- a/graphics/ImageMagick7/distinfo
+++ b/graphics/ImageMagick7/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1704746486
-SHA256 (ImageMagick-7.1.1-26.tar.xz) = 6c7eb871fd97a5925fe03386bfab84c7ef6373371ae5e4666902aeafcea917ec
-SIZE (ImageMagick-7.1.1-26.tar.xz) = 10554692
+TIMESTAMP = 1742232974
+SHA256 (ImageMagick-7.1.1-45.tar.xz) = a02466ef5bbc0ed2a25975da72d1274f1b4818b359decec0995a387453115c7d
+SIZE (ImageMagick-7.1.1-45.tar.xz) = 10774672
diff --git a/graphics/ImageMagick7/pkg-plist b/graphics/ImageMagick7/pkg-plist
index 7b1485ef286d..189498c006e7 100644
--- a/graphics/ImageMagick7/pkg-plist
+++ b/graphics/ImageMagick7/pkg-plist
@@ -25,6 +25,7 @@ bin/stream
@sample %%ETCDIR%%-7/type-dejavu.xml.sample
@sample %%ETCDIR%%-7/type-ghostscript.xml.sample
@sample %%ETCDIR%%-7/type-urw-base35.xml.sample
+@sample %%ETCDIR%%-7/type-urw-base35-type1.xml.sample
@sample %%ETCDIR%%-7/type-windows.xml.sample
@sample %%ETCDIR%%-7/type.xml.sample
include/ImageMagick-7/Magick++.h
@@ -146,7 +147,6 @@ include/ImageMagick-7/MagickWand/animate.h
include/ImageMagick-7/MagickWand/compare.h
include/ImageMagick-7/MagickWand/composite.h
include/ImageMagick-7/MagickWand/conjure.h
-include/ImageMagick-7/MagickWand/convert.h
include/ImageMagick-7/MagickWand/deprecate.h
include/ImageMagick-7/MagickWand/display.h
include/ImageMagick-7/MagickWand/drawing-wand.h
@@ -448,12 +448,12 @@ lib/libMagickCore-7.a
lib/libMagickCore-7.la
lib/libMagickCore-7.so
lib/libMagickCore-7.so.10
-lib/libMagickCore-7.so.10.0.1
+lib/libMagickCore-7.so.10.0.2
lib/libMagickWand-7.a
lib/libMagickWand-7.la
lib/libMagickWand-7.so
lib/libMagickWand-7.so.10
-lib/libMagickWand-7.so.10.0.1
+lib/libMagickWand-7.so.10.0.2
%%WITH_PERL%%%%SITE_ARCH%%/Image/Magick.pm
%%WITH_PERL%%%%SITE_ARCH%%/Image/Magick/%%QBIT%%%%HDRI%%.pm
%%WITH_PERL%%%%SITE_ARCH%%/auto/Image/Magick/%%QBIT%%%%HDRI%%/%%QBIT%%%%HDRI%%.so
@@ -489,7 +489,6 @@ share/man/man1/stream.1.gz
%%DATADIR%%-7/francais.xml
%%DATADIR%%-7/locale.xml
%%PORTDOCS%%%%DOCSDIR%%-7/LICENSE
-%%PORTDOCS%%%%DOCSDIR%%-7/NEWS.txt
%%PORTDOCS%%%%DOCSDIR%%-7/images/ImageMagick.ico
%%PORTDOCS%%%%DOCSDIR%%-7/images/affine.png
%%PORTDOCS%%%%DOCSDIR%%-7/images/annotate.png
@@ -724,8 +723,9 @@ share/man/man1/stream.1.gz
%%PORTDOCS%%%%DOCSDIR%%-7/www/api/vision.html
%%PORTDOCS%%%%DOCSDIR%%-7/www/api/wand-view.html
%%PORTDOCS%%%%DOCSDIR%%-7/www/architecture.html
-%%PORTDOCS%%%%DOCSDIR%%-7/www/assets/magick.css
-%%PORTDOCS%%%%DOCSDIR%%-7/www/assets/magick.js
+%%PORTDOCS%%%%DOCSDIR%%-7/www/assets/bootstrap.bundle.min.js
+%%PORTDOCS%%%%DOCSDIR%%-7/www/assets/bootstrap.min.css
+%%PORTDOCS%%%%DOCSDIR%%-7/www/assets/color-modes.js
%%PORTDOCS%%%%DOCSDIR%%-7/www/changelog.html
%%PORTDOCS%%%%DOCSDIR%%-7/www/cipher.html
%%PORTDOCS%%%%DOCSDIR%%-7/www/cite.html
@@ -784,6 +784,7 @@ share/man/man1/stream.1.gz
%%PORTDOCS%%%%DOCSDIR%%-7/www/openmp.html
%%PORTDOCS%%%%DOCSDIR%%-7/www/perl-magick.html
%%PORTDOCS%%%%DOCSDIR%%-7/www/porting.html
+%%PORTDOCS%%%%DOCSDIR%%-7/www/privacy-policy.html
%%PORTDOCS%%%%DOCSDIR%%-7/www/quantize.html
%%PORTDOCS%%%%DOCSDIR%%-7/www/resources.html
%%PORTDOCS%%%%DOCSDIR%%-7/www/search.html