From nobody Sun Mar 30 06:00:14 2025 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZQNsC2W6Sz5rZBb; Sun, 30 Mar 2025 06:00:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZQNsB6mb3z4DYn; Sun, 30 Mar 2025 06:00:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743314415; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/B3qGF4ProClON0oXf+0x+hGYkM/OmFwIs8GoUC3nE8=; b=I5y1joOCF8KIgb9H+4g5uBYLmd42It9cSQE2vamdRopS1mP/rhR/hRWy620ZmWGn/QdwL9 yWe87rhSUkZarig32F2rkRm5suQmIcp+Y4hr8Ylq2G+taiLmjKhcQjnhcPtTg+J0R1eF2K 4dnTAHlWVGANxmS1ZaRQA8hDv/CHHqXzxXrEzTYrTJ8t/wUmZPEZFkuO/zUDBTGl7ROFfJ 8iDkz2fMGviOhHMfyMc4JLpIKECwueUA6yI9UL1TSjygPqdsftjZOXHhiOJULuYVvmSzKl iMTe9ZiZUCI6RmjAZZ0sCqmnWdhp7SSRBC5Zl31+ohDEFt1636p8aDNmYABJ4g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743314415; a=rsa-sha256; cv=none; b=NKplpKlusYbjYGT8iZfKZS6TCLLgpa1txNlpjSmu7owOb1DebgZzGl3mZh0yvjCCzMB1cu O+t1KbW0O0hpcHy6fdXR/z1t9D3awt2EYqAHOJQvVmct7DVoIdanF/fWfXsj9/8+X8qROY A/z4tc7C3TYeUmpl+HmYhuBXUyqRyLa7Jd9oeDTUh4F4BUBmRFlAfT35aTtuq1DUnp7f0G VP4wkQsGtOMbQAiDD5/AoFDeL9ArKSWzUxlbZfYaK49oN0HfQqKdYAhcAQ+RwhWTyPrzTk eS/p5V4pj72QFa7ulSnmEK4JZ8GUKFSvwkVJkmmyOxrk+jCt/JMIM9s2v0znGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743314415; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/B3qGF4ProClON0oXf+0x+hGYkM/OmFwIs8GoUC3nE8=; b=aarZR98l+nTN4NRdBEm95uwceGAPsf85mGvCO7cYeopywQ5LBGigZJvxLXYE7upeR5i162 e9IjVqftViUpcZ0OEDTkD5sy9UiZBZ27PWFPeLPYvazcG9Y7nvEqVUbTFI0dkElFFYEDlw aHxFUorwkVq8CMNjP7iEkm+UPf0ZHwJVkCXPckHEUpxzFrhjAnPi7KxG1BtzkUKgp5SoyM gSpnN5ah+qYEc+Js2r5q1bC5mXYZH4zpb+5wryBWbE2FJ5MMP+DCELrFZIuVEoJ1TKKoKu L96jAYWYo0+cfA+i9Z73R41prWflOdTFUw9frnMcSdIsd/rZ7rNOM+4uFR+ReA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZQNsB6Bb8z12VC; Sun, 30 Mar 2025 06:00:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52U60Edi040782; Sun, 30 Mar 2025 06:00:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52U60EjP040771; Sun, 30 Mar 2025 06:00:14 GMT (envelope-from git) Date: Sun, 30 Mar 2025 06:00:14 GMT Message-Id: <202503300600.52U60EjP040771@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Lo=C3=AFc?= Bartoletti Subject: git: 2e94a04c97d7 - main - graphics/ImageMagick*: Udpate ports List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lbartoletti X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2e94a04c97d7f9fbe799736350262fce3f615af2 Auto-Submitted: auto-generated The branch main has been updated by lbartoletti: URL: https://cgit.FreeBSD.org/ports/commit/?id=2e94a04c97d7f9fbe799736350262fce3f615af2 commit 2e94a04c97d7f9fbe799736350262fce3f615af2 Author: Loïc Bartoletti AuthorDate: 2025-03-17 20:28:48 +0000 Commit: Loïc Bartoletti 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 @@ - - - -+ -+ -+ -+ -+ - - - - 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