update to ImageMagick-6.9.12-60

graphics/ImageMagick/Makefile

@@ -3,21 +3,21 @@ BROKEN-arm=	libm functions (cabs etc) not detected, fallback code is broken
 COMMENT=		image processing tools
 
 VER=			6.9.12
-DASHVER=		46
+DASHVER=		60
 DISTNAME=		ImageMagick-${VER}-${DASHVER}
 PKGNAME=		ImageMagick-${VER}.${DASHVER}
-PORTROACH=		site:https://imagemagick.org/download/ limit:6.*
+PORTROACH=		site:https://imagemagick.org/archive/releases/ limit:6.*
 EXTRACT_SUFX=		.tar.xz
 
-SHARED_LIBS +=	MagickCore-6.Q16     8.0      # 6.0
-SHARED_LIBS +=	MagickWand-6.Q16     4.2      # 6.0
-SHARED_LIBS +=	Magick++-6.Q16       5.2      # 8.0
+SHARED_LIBS +=	MagickCore-6.Q16     8.1      # 7.0
+SHARED_LIBS +=	MagickWand-6.Q16     4.2      # 7.0
+SHARED_LIBS +=	Magick++-6.Q16       5.2      # 9.0
 
 CATEGORIES=		graphics
 
 HOMEPAGE=		https://imagemagick.org/
 
-MASTER_SITES=		https://imagemagick.org/download/releases/ \
+MASTER_SITES=		https://imagemagick.org/archive/releases/ \
 			https://ftp.acc.umu.se/mirror/imagemagick.org/ftp/ \
 			ftp://sunsite.icm.edu.pl/packages/ImageMagick/
 
@@ -25,7 +25,7 @@ MASTER_SITES=		https://imagemagick.org/download/releases/ \
 PERMIT_PACKAGE=	Yes
 
 WANTLIB += ${COMPILER_LIBCXX} ICE SM X11 Xau Xdmcp Xext Xt aom
-WANTLIB += bz2 c dav1d de265 djvulibre expat fftw3 fontconfig
+WANTLIB += bz2 c dav1d de265 djvulibre expat fontconfig
 WANTLIB += freetype heif iconv jasper jbig jpeg lcms2 lzma m openjp2
 WANTLIB += perl png raw_r tiff webp webpdemux webpmux x265 xcb
 WANTLIB += xml2 z zstd
@@ -44,7 +44,6 @@ LIB_DEPENDS =		archivers/bzip2 \
 			graphics/openjp2 \
 			graphics/png \
 			graphics/tiff \
-			math/fftw3 \
 			multimedia/aom \
 			multimedia/dav1d \
 			multimedia/libde265 \
@@ -57,7 +56,7 @@ ALL_TARGET=		all perl-build
 
 CONFIGURE_STYLE=	autoconf
 LIBTOOL_FLAGS=		--tag=disable-static
-AUTOCONF_VERSION=	2.69
+AUTOCONF_VERSION=	2.71
 USE_GMAKE=		Yes
 CONFIGURE_ARGS+=	--without-gcc-arch \
 			--with-gs-font-dir=${LOCALBASE}/share/fonts/ghostscript \

graphics/ImageMagick/distinfo

@@ -1,2 +1,2 @@
-SHA256 (ImageMagick-6.9.12-46.tar.xz) = 45c+PTftkIO6cE3rcGS9jIH7gRPsm7H0hfepQ+cuBhQ=
-SIZE (ImageMagick-6.9.12-46.tar.xz) = 9179484
+SHA256 (ImageMagick-6.9.12-60.tar.xz) = myOHCi1hFr4EW2eIxdiOxmaQo6g5ziO43YnVR7s6WzE=
+SIZE (ImageMagick-6.9.12-60.tar.xz) = 9164816

graphics/ImageMagick/patches/patch-configure_ac

@@ -6,19 +6,19 @@ Index: configure.ac
  m4_define([magick_git_revision],
            m4_esyscmd([
 -            h=$(git rev-parse --short HEAD)
--            d=$(git log -1 --format=:%cd --date=format:%Y%m%d || date -u +%Y%m%d -r ./ChangeLog.md)
+-            d=$(git log -1 --format=:%cd --date=format:%Y%m%d || date -u +%Y%m%d -r ./m4/version.m4)
 -            printf %s "$h$d"
-+            d=$(stat -t %Y%m%d -f %Sm ./ChangeLog.md)
++            d=$(stat -t %Y%m%d -f %Sm ./m4/version.m4)
 +            printf %s "$d"
            ]))
  m4_define([magick_release_date],
            m4_esyscmd([
--            d=$(git log -1 --format=%cd --date=format:%Y-%m-%d || date -u +%F -r ./ChangeLog.md)
-+            d=$(stat -t %Y-%m-%d -f %Sm ./ChangeLog.md)
+-            d=$(git log -1 --format=%cd --date=format:%Y-%m-%d || date -u +%F -r ./m4/version.m4)
++            d=$(stat -t %Y-%m-%d -f %Sm ./m4/version.m4)
              printf %s "$d"
            ]))
  
-@@ -1179,7 +1178,7 @@ fi
+@@ -1165,7 +1164,7 @@ fi
  
  # Assume that delegate headers reside under same directory as ImageMagick
  # installation prefix.
@@ -27,7 +27,7 @@ Index: configure.ac
  
  #
  # Find the X11 RGB database
-@@ -2929,7 +2928,7 @@ AC_SUBST([PERLMAINCC])
+@@ -2914,7 +2913,7 @@ AC_SUBST([PERLMAINCC])
  #
  
  # Path to ImageMagick header files
@@ -36,7 +36,7 @@ Index: configure.ac
  INCLUDE_PATH="${INCLUDE_DIR}/${INCLUDE_RELATIVE_PATH}"
  DEFINE_INCLUDE_PATH="${INCLUDE_DIR}/${INCLUDE_RELATIVE_PATH}/"
  case "${build_os}" in
-@@ -2952,7 +2951,7 @@ AC_DEFINE_UNQUOTED([INCLUDEARCH_PATH],["$DEFINE_INCLUD
+@@ -2937,7 +2936,7 @@ AC_DEFINE_UNQUOTED([INCLUDEARCH_PATH],["$DEFINE_INCLUD
  AC_SUBST([INCLUDEARCH_PATH])
  
  # Subdirectory under lib to place ImageMagick lib files
@@ -45,7 +45,7 @@ Index: configure.ac
  AC_DEFINE_UNQUOTED([LIBRARY_RELATIVE_PATH],["$LIBRARY_RELATIVE_PATH"],[Subdirectory of lib where ImageMagick architecture dependent files are installed.])
  
  # Path to ImageMagick bin directory
-@@ -3043,7 +3042,7 @@ AC_SUBST([FILTER_PATH])
+@@ -3028,7 +3027,7 @@ AC_SUBST([FILTER_PATH])
  
  #
  # Path to ImageMagick documentation files
@@ -54,7 +54,7 @@ Index: configure.ac
  DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}"
  DEFINE_DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}/"
  case "${build_os}" in
-@@ -3063,7 +3062,7 @@ AC_ARG_ENABLE([docs],
+@@ -3048,7 +3047,7 @@ AC_ARG_ENABLE([docs],
  AM_CONDITIONAL([INSTALL_DOC],[test "$wantdocs" = "yes"])
  
  # Subdirectory to place architecture-dependent configuration files
@@ -63,7 +63,7 @@ Index: configure.ac
  AC_DEFINE_UNQUOTED([CONFIGURE_RELATIVE_PATH],"$CONFIGURE_RELATIVE_PATH",[Subdirectory of lib where architecture-dependent configuration files live.])
  CONFIGURE_PATH="${SYSCONF_DIR}/${CONFIGURE_RELATIVE_PATH}/"
  DEFINE_CONFIGURE_PATH="${SYSCONF_DIR}/${CONFIGURE_RELATIVE_PATH}/"
-@@ -3076,7 +3075,7 @@ AC_DEFINE_UNQUOTED([CONFIGURE_PATH],"$DEFINE_CONFIGURE
+@@ -3061,7 +3060,7 @@ AC_DEFINE_UNQUOTED([CONFIGURE_PATH],"$DEFINE_CONFIGURE
  AC_SUBST([CONFIGURE_PATH])
  
  # Subdirectory to place architecture-independent configuration files

graphics/ImageMagick/pkg/PLIST

@@ -213,7 +213,6 @@ share/ImageMagick/english.xml
 share/ImageMagick/francais.xml
 share/ImageMagick/locale.xml
 share/doc/ImageMagick/
-share/doc/ImageMagick/ChangeLog.md
 share/doc/ImageMagick/LICENSE
 share/doc/ImageMagick/NEWS.txt
 share/doc/ImageMagick/images/