ImageMagick to 6.9.9-15.

* Disable FPX (FlashPix) support by default. This image format is really rare these days coupled with that there are known CVE's in libfpx and it doesn't seem to be maintained these days. It doesn't make sense to keep it enabled by default anymore. [1] * Add new option for RAW support * Fix portscout macro to only show 6.9.x versions Bump other ports for the shared library bumps in IM 6. PR: 222309 [1] Submitted by: Anton Yuzhaninov <citrin+pr@citrin.ru> [1]
svn path=/head/; revision=450852
2017-09-28 15:36:31 +00:00 · 2017-09-28 15:36:31 +00:00 · 704ab44ef9 · 2021-03-31 03:12:20 +00:00
commit 704ab44ef9
parent 3a3ea2b528
36 changed files with 53 additions and 44 deletions
--- a/audio/mp3plot/Makefile
+++ b/audio/mp3plot/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	mp3plot
 DISTVERSION=	0.6.0
-PORTREVISION=	18
+PORTREVISION=	19
 CATEGORIES=	audio
 MASTER_SITES=	http://p.outlyer.net/mp3plot/files/

--- a/devel/synfig/Makefile
+++ b/devel/synfig/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	synfig
 PORTVERSION=	1.0.2
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	devel graphics multimedia
 MASTER_SITES=	SF/${PORTNAME}/releases/${PORTVERSION}/source

--- a/editors/emacs-devel/Makefile
+++ b/editors/emacs-devel/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	emacs
 DISTVERSION=	${EMACS_VER}.${EMACS_REV}
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	editors ipv6
 PKGNAMESUFFIX=	-devel
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	emacs
 PORTVERSION=	${EMACS_VER}
+PORTREVISION=	1
 PORTEPOCH=	3
 CATEGORIES=	editors ipv6
 MASTER_SITES=	GNU
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@ -1,8 +1,7 @@
 # $FreeBSD$

 PORTNAME=	ImageMagick
-DISTVERSION=	6.9.8-9
-PORTREVISION=	1
+DISTVERSION=	6.9.9-15
 PORTEPOCH=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	http://www.imagemagick.org/download/ \
@ -36,7 +35,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE

 LIB_DEPENDS=	libltdl.so:devel/libltdl

-PORTSCOUT?=	limit:6.*$$
+PORTSCOUT?=	limit:^6\.9\.

 CONFLICTS_INSTALL=	execline-[0-9]* # bin/import
 CONFLICTS_INSTALL+=	ImageMagick7 ImageMagick7-nox11 # bin/Magick++-config
@ -62,10 +61,10 @@ PLIST_SUB=	PORTVERSION=${PORTVERSION:R}
 OPTIONS_DEFINE=	BZIP2 DOCS DJVU FFTW FONTCONFIG FPX FREETYPE \
 		GRAPHVIZ GSLIB JPEG2000 JBIG JPEG LCMS2 LZMA LQR MODULES \
 		OPENEXR OPENMP PANGO PDF PERL PNG SVG TESTS TIFF WEBP WMF \
-		THREADS X11 16BIT_PIXEL HDRI
-OPTIONS_DEFAULT=	16BIT_PIXEL BZIP2 FFTW FONTCONFIG FPX FREETYPE \
+		THREADS X11 16BIT_PIXEL HDRI RAW
+OPTIONS_DEFAULT=	16BIT_PIXEL BZIP2 FFTW FONTCONFIG FREETYPE \
 		JPEG2000 JBIG JPEG LCMS2 LZMA LQR MODULES PDF PERL PNG SVG \
-		TIFF WEBP WMF THREADS X11
+		TIFF WEBP WMF THREADS X11 RAW

 16BIT_PIXEL_DESC=	16bit pixel support
 JPEG2000_DESC=		OpenJPEG 2000 support via openjpeg
@ -78,6 +77,12 @@ TESTS_DESC=		Run bundled self-tests after build
 #SIMD_CONFIGURE_WITH=	gcc-arch
 CONFIGURE_ARGS+=	--without-gcc-arch

+# libraw is by default liked to lcms2, whichs also ends up in IM regardless
+# of the IM LCMS option.
+RAW_CONFIGURE_WITH=	raw
+RAW_LIB_DEPENDS=	libraw_r.so:graphics/libraw \
+			liblcms2.so:graphics/lcms2
+
 .include <bsd.port.options.mk>

 .if ${PORT_OPTIONS:MHDRI}
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1496652633
-SHA256 (ImageMagick-6.9.8-9.tar.xz) = f64f1a66d2a3ec4ff2c79527dd2a773c8c71abb4f8da37af71c270b52be32673
-SIZE (ImageMagick-6.9.8-9.tar.xz) = 8777352
+TIMESTAMP = 1506539505
+SHA256 (ImageMagick-6.9.9-15.tar.xz) = cc5411bcd766efbc5c281ae2147f0d154c452e5f0cc72894796afb88036baf2f
+SIZE (ImageMagick-6.9.9-15.tar.xz) = 8792252
--- a/graphics/ImageMagick/pkg-plist
+++ b/graphics/ImageMagick/pkg-plist
@ -416,18 +416,18 @@ lib/ImageMagick-%%PORTVERSION%%/config-%%QBIT%%%%HDRI%%/configure.xml
 lib/libMagick++-6.a
 lib/libMagick++-6.la
 lib/libMagick++-6.so
-lib/libMagick++-6.so.7
-lib/libMagick++-6.so.7.0.0
+lib/libMagick++-6.so.8
+lib/libMagick++-6.so.8.0.0
 lib/libMagickCore-6.a
 lib/libMagickCore-6.la
 lib/libMagickCore-6.so
-lib/libMagickCore-6.so.4
-lib/libMagickCore-6.so.4.0.0
+lib/libMagickCore-6.so.5
+lib/libMagickCore-6.so.5.0.0
 lib/libMagickWand-6.a
 lib/libMagickWand-6.la
 lib/libMagickWand-6.so
-lib/libMagickWand-6.so.4
-lib/libMagickWand-6.so.4.0.0
+lib/libMagickWand-6.so.5
+lib/libMagickWand-6.so.5.0.0
 %%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
--- a/graphics/autotrace/Makefile
+++ b/graphics/autotrace/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	autotrace
 PORTVERSION=	0.31.1
-PORTREVISION=	30
+PORTREVISION=	31
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/AutoTrace/${PORTVERSION}

--- a/graphics/converseen/Makefile
+++ b/graphics/converseen/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	converseen
 PORTVERSION=	0.9.6.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/Converseen/Converseen%20${PORTVERSION:R:R}/

--- a/graphics/dcraw-m/Makefile
+++ b/graphics/dcraw-m/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	dcraw-m
 PORTVERSION=	9.22
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics

 MAINTAINER=	waitman@waitman.net
--- a/graphics/dmtx-utils/Makefile
+++ b/graphics/dmtx-utils/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	dmtx-utils
 PORTVERSION=	0.7.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	SF/libdmtx/libdmtx/${PORTVERSION}

--- a/graphics/fpc-imagemagick/Makefile
+++ b/graphics/fpc-imagemagick/Makefile
@ -1,7 +1,7 @@
 # Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
 # $FreeBSD$

-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics lang
 PKGNAMESUFFIX=	-imagemagick

--- a/graphics/gimp-gmic-plugin/Makefile
+++ b/graphics/gimp-gmic-plugin/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	gmic
 PORTVERSION=	1.6.9
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	graphics
 MASTER_SITES=	http://gmic.eu/files/source/
 PKGNAMEPREFIX=	gimp-
--- a/graphics/gscan2pdf/Makefile
+++ b/graphics/gscan2pdf/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	gscan2pdf
 PORTVERSION=	1.8.2
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	SF

--- a/graphics/hdr_tools/Makefile
+++ b/graphics/hdr_tools/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	hdr_tools
 PORTVERSION=	0.0.2010.11.23	# unspecified by the author, so use the date
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://ttic.uchicago.edu/~cotter/projects/hdr_tools/archives/ \
 		http://freebsd.nsu.ru/distfiles/
--- a/graphics/inkscape/Makefile
+++ b/graphics/inkscape/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	inkscape
 PORTVERSION=	0.92.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	graphics gnome
 MASTER_SITES=	https://launchpadlibrarian.net/306309537/ \
 		LOCAL/kwm
--- a/graphics/kipi-plugin-videoslideshow/Makefile
+++ b/graphics/kipi-plugin-videoslideshow/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	kipi-plugin-${KIPI_PLUGIN}
 PORTVERSION=	${DIGIKAM_VER}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics kde

 MAINTAINER=	kde@FreeBSD.org
--- a/graphics/libboard/Makefile
+++ b/graphics/libboard/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	libboard
 DISTVERSION=	0.9.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics

 MAINTAINER=	thierry@FreeBSD.org
--- a/graphics/libdmtx/Makefile
+++ b/graphics/libdmtx/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	libdmtx
 PORTVERSION=	0.7.4
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	graphics
 MASTER_SITES=	SF

--- a/graphics/npretty/Makefile
+++ b/graphics/npretty/Makefile
@ -4,7 +4,7 @@
 PORTNAME=	npretty
 DISTVERSIONPREFIX=	n
 DISTVERSION=	0.9.3-1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics

 MAINTAINER=	peter@pean.org
--- a/graphics/opendx/Makefile
+++ b/graphics/opendx/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	opendx
 PORTVERSION=	4.4.4
-PORTREVISION=	23
+PORTREVISION=	24
 CATEGORIES=	graphics math java
 MASTER_SITES=	http://www.sfr-fresh.com/unix/misc/
 DISTNAME=	dx-${PORTVERSION}
--- a/graphics/p5-Image-Magick-Iterator/Makefile
+++ b/graphics/p5-Image-Magick-Iterator/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	Image-Magick-Iterator
 PORTVERSION=	0.01
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
--- a/graphics/pecl-imagick/Makefile
+++ b/graphics/pecl-imagick/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	imagick
 PORTVERSION=	3.4.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics

 MAINTAINER=	mm@FreeBSD.org
--- a/graphics/php-magickwand/Makefile
+++ b/graphics/php-magickwand/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	magickwand
 PORTVERSION=	1.0.9
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.magickwand.org/download/php/
 PKGNAMEPREFIX=	php-
--- a/graphics/pstoedit/Makefile
+++ b/graphics/pstoedit/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	pstoedit
 PORTVERSION=	3.70
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	graphics print
 MASTER_SITES=	SF

--- a/graphics/py-wand/Makefile
+++ b/graphics/py-wand/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	Wand
 PORTVERSION=	0.4.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/graphics/reallyslick/Makefile
+++ b/graphics/reallyslick/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	reallyslick
 PORTVERSION=	0.9.1
-PORTREVISION=	18
+PORTREVISION=	19
 CATEGORIES=	graphics
 MASTER_SITES=	SF/rss-glx/rss-glx/${PORTVERSION}
 DISTNAME=	rss-glx_${PORTVERSION}
--- a/graphics/rubygem-rmagick/Makefile
+++ b/graphics/rubygem-rmagick/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	rmagick
 PORTVERSION=	2.16.0
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	graphics rubygems
 MASTER_SITES=	RG

--- a/graphics/timg/Makefile
+++ b/graphics/timg/Makefile
@ -3,7 +3,7 @@
 PORTNAME=	timg
 PORTVERSION=	0.9.5
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics

 MAINTAINER=	uzsolt@uzsolt.hu
--- a/graphics/zbar/Makefile
+++ b/graphics/zbar/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	zbar
 PORTVERSION=	0.10
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	graphics
 MASTER_SITES=	SF

--- a/misc/img2xterm/Makefile
+++ b/misc/img2xterm/Makefile
@ -3,7 +3,7 @@
 PORTNAME=	img2xterm
 PORTVERSION=	1.0.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc

 MAINTAINER=	arved@FreeBSD.org
--- a/multimedia/emby-server/Makefile
+++ b/multimedia/emby-server/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	emby-server
 PORTVERSION=	3.2.32.0
+PORTREVISION=	1
 CATEGORIES=	multimedia

 MAINTAINER=	woodsb02@FreeBSD.org
--- a/security/libfprint/Makefile
+++ b/security/libfprint/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	libfprint
 PORTVERSION=	0.6.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security
 MASTER_SITES=	http://people.freedesktop.org/~hadess/

--- a/www/WebMagick/Makefile
+++ b/www/WebMagick/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	WebMagick
 PORTVERSION=	2.03p29
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	www graphics
 MASTER_SITES=	SF/${PORTNAME:tl}/${PORTNAME:tl}-beta/${DISTVERSION}
--- a/x11-wm/libwraster/Makefile
+++ b/x11-wm/libwraster/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	libwraster
 PORTVERSION=	0.95.7
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-wm windowmaker
 MASTER_SITES=	http://windowmaker.org/pub/source/release/
 DISTNAME=	WindowMaker-${PORTVERSION}
--- a/x11-wm/windowmaker/Makefile
+++ b/x11-wm/windowmaker/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	windowmaker
 PORTVERSION=	0.95.7
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-wm windowmaker
 MASTER_SITES=	http://windowmaker.org/pub/source/release/
 DISTNAME=	WindowMaker-${PORTVERSION}