From nobody Tue Jul 26 18:43:54 2022 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 4Lsm5k4W0Pz4WpGy; Tue, 26 Jul 2022 18:43:54 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Lsm5k3ljxz3t3H; Tue, 26 Jul 2022 18:43:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658861034; 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=q/xwI93xAWtnENurclh+92NYGFRVzixgVlFYIbP+oec=; b=RUxPn4TTUPLxBeASpJMJmHptDUBciW1RRyNf6SbwEBKMv8pI990S+p9hIRvAMhlri8GeGs Tjh6QnpXO1evGzlqKwu2S/3aOAtTWulJj0PO0FFpD+/po6coLGjB5cQxMiHMsLf3A4jPa+ Fex6po63WqljfndTiqWgTbHLDNz9eln+e2Ox8nJuNptsNP4EMz7d5vwoTp75QnEzjU9UE3 o8V9ZG7JVH02WD3WTUJFUOZPfzF8CGUS+qi2/jQ7YPNU7eGrNgGUQjyZFEaf1MxAX08qi0 D9zZJ01nY6WXSA3tEY6eY0EYzey70RDzeMHYBD6Gm0VhKWv8gd1AARzqr+rJyw== 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 4Lsm5k2m8FznG0; Tue, 26 Jul 2022 18:43:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 26QIhso8063927; Tue, 26 Jul 2022 18:43:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26QIhsSd063926; Tue, 26 Jul 2022 18:43:54 GMT (envelope-from git) Date: Tue, 26 Jul 2022 18:43:54 GMT Message-Id: <202207261843.26QIhsSd063926@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: 822a2eb7994c - main - graphics/ImageMagick*: Use release archives 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 822a2eb7994ccf5c4936561977728cb1d212a579 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658861034; 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=q/xwI93xAWtnENurclh+92NYGFRVzixgVlFYIbP+oec=; b=YUikUIvWmmk2No6Vg86PN8D89l5Fk3WCyBSX7QD4FZJGf+UfobgeeWPn26ZlHW8+xonhdB iLSPE8PIskjUaz+CnXK+/6Gvj8XhMHuc+rU11OWgI5wsb2jA9ct6gqkZd7dVasK3hlnEEj t+hpr3f5W0vXkTAaRYC31qJnILBh8thO6BF/SKt6zYUkDyiSkZ4uYoBmoNfsOQxr+L5Diz jB+iug34AhxdMD33fY79YnQ0kTUonh0AxvYxeCFcjFHxEKH04/QN/Jo57rHHpGA9fC3rkw dVauJVCzPHTyuAqZ9Q6Qq8TrgPM0HxkKq2hYE1SEuaNRv0hR8fyQuKU50LQeEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658861034; a=rsa-sha256; cv=none; b=WZNEg50JMzsHWRZ4ShxiK4KAyKPQP0DsqYPV0QBVKCED5Mh3oVAPpSo4n7RhJyFa8vuF5C 8lXbtSvHMj3QHydRO3+NqoK7rXupZFi6o8Mr0ACcQtVXiQ3m4trr9EVPpcAFuWyTVj57nU j5CYY8+bhG83nTcZnEnaWKKL8Vr1IFQdIjvluzNzA59pxzYZqNIR2tquzcCOJJnzj5K7dA laUpFhcRgGmhhDBcHb6nLRvEnj3xeOteZvohPSzW+gv/43iT/3bpM5dZn292BXbBs7HRkA 7D3QrILRHF1rTb8W4pgXqNkVDbgWD8vItvMpyP/3gkJpPecJbhJ84yJAJURPmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=822a2eb7994ccf5c4936561977728cb1d212a579 commit 822a2eb7994ccf5c4936561977728cb1d212a579 Author: Daniel Engberg AuthorDate: 2022-07-26 18:09:14 +0000 Commit: Daniel Engberg CommitDate: 2022-07-26 18:43:47 +0000 graphics/ImageMagick*: Use release archives Upstream's new location was missed by mistake, revert and update URLs to match accordingly Reference: https://imagemagick.org/script/mirror.php Approved by: desktop (tcberner) --- graphics/ImageMagick6/Makefile | 14 +++++++++----- graphics/ImageMagick6/distinfo | 6 +++--- graphics/ImageMagick6/pkg-plist | 2 -- graphics/ImageMagick7/Makefile | 16 ++++++++++------ graphics/ImageMagick7/distinfo | 6 +++--- graphics/ImageMagick7/pkg-plist | 2 -- 6 files changed, 25 insertions(+), 21 deletions(-) diff --git a/graphics/ImageMagick6/Makefile b/graphics/ImageMagick6/Makefile index b63ce2290cb2..c62ffa0938cb 100644 --- a/graphics/ImageMagick6/Makefile +++ b/graphics/ImageMagick6/Makefile @@ -1,7 +1,13 @@ PORTNAME= ImageMagick DISTVERSION= 6.9.12-58 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= graphics perl5 +MASTER_SITES= https://ftp.acc.umu.se/mirror/imagemagick.org/ftp/releases/ \ + https://mirror.dogado.de/imagemagick/releases/ \ + https://mirror.checkdomain.de/imagemagick/releases/ \ + https://ftp.icm.edu.pl/pub/unix/graphics/ImageMagick/releases/ \ + https://imagemagick.org/archive/releases/ PKGNAMESUFFIX= 6 MAINTAINER= desktop@FreeBSD.org @@ -20,7 +26,7 @@ CONFLICTS_INSTALL= ImageMagick7 ImageMagick7-nox11 # bin/Magick++-config # This port uses .la files, keep libtool:keepla! (magick/module.c) USES= compiler:c++11-lang cpe gettext-runtime gmake gnome libtool:keepla \ - localbase pathfix perl5 pkgconfig:both shebangfix + localbase pathfix perl5 pkgconfig:both shebangfix tar:xz CPE_PRODUCT= imagemagick CPE_VENDOR= imagemagick SHEBANG_FILES= www/source/examples.pl @@ -29,8 +35,6 @@ CONFIGURE_ENV= MAKE=${MAKE_CMD} CONFIGURE_ARGS= --without-dps \ --without-flif \ --without-zstd -USE_GITHUB= yes -GH_PROJECT= ImageMagick6 USE_LDCONFIG= yes USE_GNOME= libxml2 @@ -209,10 +213,10 @@ _IMAGEMAGICK_THREADS=no . if ${_IMAGEMAGICK_THREADS} == "no" IGNORE=OpenMP requires threads${_IMAGEMAGICK_THREADS_IGNORE_MSG} . else -CONFIGURE_ARGS+= --enable-openmp +CONFIGURE_ARGS+= --enable-openmp . endif .else -CONFIGURE_ARGS+= --disable-openmp +CONFIGURE_ARGS+= --disable-openmp .endif .if defined(WITH_WINDOWS_FONT_DIR) diff --git a/graphics/ImageMagick6/distinfo b/graphics/ImageMagick6/distinfo index c07eb17370a4..9fab0ae6ee87 100644 --- a/graphics/ImageMagick6/distinfo +++ b/graphics/ImageMagick6/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1658654696 -SHA256 (ImageMagick-ImageMagick6-6.9.12-58_GH0.tar.gz) = 6f7774b5a1bd06a6d67da00252ad88da2197d0d88959c599fff6c4fc81628973 -SIZE (ImageMagick-ImageMagick6-6.9.12-58_GH0.tar.gz) = 13560562 +TIMESTAMP = 1658702986 +SHA256 (ImageMagick-6.9.12-58.tar.xz) = 249a2bdc3d2f579c2b81fd2d4d3d30b8ce9de8d2bdf7ebb6d95c486d90454c0e +SIZE (ImageMagick-6.9.12-58.tar.xz) = 9164316 diff --git a/graphics/ImageMagick6/pkg-plist b/graphics/ImageMagick6/pkg-plist index a5ed8fe32a93..393562124930 100644 --- a/graphics/ImageMagick6/pkg-plist +++ b/graphics/ImageMagick6/pkg-plist @@ -431,10 +431,8 @@ lib/libMagickWand-6.so.7 lib/libMagickWand-6.so.7.0.0 %%WITH_PERL%%%%SITE_ARCH%%/Image/Magick.pm %%WITH_PERL%%%%SITE_ARCH%%/Image/Magick/%%QBIT%%%%HDRI%%.pm -%%SITE_ARCH%%/auto/Image/Magick/Magick.so %%WITH_PERL%%%%SITE_ARCH%%/auto/Image/Magick/%%QBIT%%%%HDRI%%/%%QBIT%%%%HDRI%%.so %%WITH_PERL%%%%SITE_ARCH%%/auto/Image/Magick/%%QBIT%%%%HDRI%%/autosplit.ix -%%SITE_ARCH%%/auto/Image/Magick/autosplit.ix %%WITH_PERL%%%%PERL5_MAN3%%/Image::Magick.3.gz %%WITH_PERL%%%%PERL5_MAN3%%/Image::Magick::%%QBIT%%%%HDRI%%.3.gz libdata/pkgconfig/ImageMagick++-6.pc diff --git a/graphics/ImageMagick7/Makefile b/graphics/ImageMagick7/Makefile index 25e5dd1c4bea..6f06faff17d3 100644 --- a/graphics/ImageMagick7/Makefile +++ b/graphics/ImageMagick7/Makefile @@ -1,7 +1,12 @@ PORTNAME= ImageMagick -DISTVERSION= 7.1.0.43 -PORTREVISION= 1 +DISTVERSION= 7.1.0-43 +PORTREVISION= 2 CATEGORIES= graphics perl5 +MASTER_SITES= https://ftp.acc.umu.se/mirror/imagemagick.org/ftp/releases/ \ + https://mirror.dogado.de/imagemagick/releases/ \ + https://mirror.checkdomain.de/imagemagick/releases/ \ + https://ftp.icm.edu.pl/pub/unix/graphics/ImageMagick/releases/ \ + https://imagemagick.org/archive/releases/ PKGNAMESUFFIX= 7 MAINTAINER= desktop@FreeBSD.org @@ -20,7 +25,7 @@ CONFLICTS_INSTALL= ImageMagick6 ImageMagick6-nox11 # This port uses .la files, keep libtool:keepla! (magick/module.c) USES= cpe gettext-runtime gmake gnome libtool:keepla \ - localbase pathfix perl5 pkgconfig:both shebangfix + localbase pathfix perl5 pkgconfig:both shebangfix tar:xz CPE_PRODUCT= imagemagick CPE_VENDOR= imagemagick SHEBANG_FILES= www/source/examples.pl @@ -29,7 +34,6 @@ CONFIGURE_ENV= MAKE=${MAKE_CMD} CONFIGURE_ARGS= --without-dps \ --without-flif \ --without-zstd -USE_GITHUB= yes USE_LDCONFIG= yes USE_GNOME= libxml2 @@ -210,10 +214,10 @@ _IMAGEMAGICK_THREADS=no . if ${_IMAGEMAGICK_THREADS} == "no" IGNORE=OpenMP requires threads${_IMAGEMAGICK_THREADS_IGNORE_MSG} . else -CONFIGURE_ARGS+= --enable-openmp +CONFIGURE_ARGS+= --enable-openmp . endif .else -CONFIGURE_ARGS+= --disable-openmp +CONFIGURE_ARGS+= --disable-openmp .endif .if defined(WITH_WINDOWS_FONT_DIR) CONFIGURE_ARGS+= --with-windows-font-dir=${WITH_WINDOWS_FONT_DIR} diff --git a/graphics/ImageMagick7/distinfo b/graphics/ImageMagick7/distinfo index 84e4131042db..64806149a917 100644 --- a/graphics/ImageMagick7/distinfo +++ b/graphics/ImageMagick7/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1658654251 -SHA256 (ImageMagick-ImageMagick-7.1.0.43_GH0.tar.gz) = 62eccb3e8c89acc66c2b10a2bea843b6659a2ddce275c7d2ffee8c34af6114fd -SIZE (ImageMagick-ImageMagick-7.1.0.43_GH0.tar.gz) = 15297804 +TIMESTAMP = 1658702958 +SHA256 (ImageMagick-7.1.0-43.tar.xz) = 5d52aaed5496a193176c443052bac32536230b9a73a9b7bd5f0f794ddddafadd +SIZE (ImageMagick-7.1.0-43.tar.xz) = 10355700 diff --git a/graphics/ImageMagick7/pkg-plist b/graphics/ImageMagick7/pkg-plist index fea0e8505f58..2515485ea906 100644 --- a/graphics/ImageMagick7/pkg-plist +++ b/graphics/ImageMagick7/pkg-plist @@ -452,10 +452,8 @@ lib/libMagickWand-7.so.10 lib/libMagickWand-7.so.10.0.0 %%WITH_PERL%%%%SITE_ARCH%%/Image/Magick.pm %%WITH_PERL%%%%SITE_ARCH%%/Image/Magick/%%QBIT%%%%HDRI%%.pm -%%SITE_ARCH%%/auto/Image/Magick/Magick.so %%WITH_PERL%%%%SITE_ARCH%%/auto/Image/Magick/%%QBIT%%%%HDRI%%/%%QBIT%%%%HDRI%%.so %%WITH_PERL%%%%SITE_ARCH%%/auto/Image/Magick/%%QBIT%%%%HDRI%%/autosplit.ix -%%SITE_ARCH%%/auto/Image/Magick/autosplit.ix %%WITH_PERL%%%%PERL5_MAN3%%/Image::Magick.3.gz %%WITH_PERL%%%%PERL5_MAN3%%/Image::Magick::%%QBIT%%%%HDRI%%.3.gz libdata/pkgconfig/ImageMagick-7.pc