svn commit: r420003 - in head/graphics/ImageMagick: . files

[Koop Mast]

Author: kwm
Date: Wed Aug 10 10:02:06 2016
New Revision: 420003
URL: https://svnweb.freebsd.org/changeset/ports/420003

Log:
  Update ImageMagick to 6.9.5-5.
  
  Register indirect dependancies.
  Allow slave port to overwrite PORTSCOUT.

Added:
  head/graphics/ImageMagick/files/patch-tests_validate.c   (contents, props changed)
Modified:
  head/graphics/ImageMagick/Makefile
  head/graphics/ImageMagick/distinfo
  head/graphics/ImageMagick/pkg-plist

Modified: head/graphics/ImageMagick/Makefile
==============================================================================
--- head/graphics/ImageMagick/Makefile	Wed Aug 10 10:00:41 2016	(r420002)
+++ head/graphics/ImageMagick/Makefile	Wed Aug 10 10:02:06 2016	(r420003)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	ImageMagick
-DISTVERSION=	6.9.4-3
+DISTVERSION=	6.9.5-5
 PORTEPOCH=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	http://www.imagemagick.org/download/ \
@@ -36,13 +36,13 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libltdl.so:devel/libltdl
 
-PORTSCOUT=      limit:6.*$$
+PORTSCOUT?=	limit:6.*$$
 
 CONFLICTS_INSTALL=	execline-[0-9]* # bin/import
 
 # This port uses .la files, keep libtool:keepla! (magick/module.c)
-USES=		cpe gmake libtool:keepla localbase pathfix perl5 \
-		pkgconfig:both shebangfix tar:xz
+USES=		cpe gettext-runtime gmake gnome libtool:keepla \
+		localbase pathfix perl5 pkgconfig:both shebangfix tar:xz
 CPE_PRODUCT=	imagemagick
 CPE_VENDOR=	imagemagick
 SHEBANG_FILES=	www/source/examples.pl
@@ -50,7 +50,8 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	MAKE=${MAKE_CMD}
 CONFIGURE_ARGS=	--without-dps
 USE_LDCONFIG=	yes
-USE_GNOME=	libxml2
+USE_GNOME=	glib20 libxml2
+USE_XORG=	sm ice x11
 
 SAMPLE_FILES=	coder.xml colors.xml delegates.xml log.xml magic.xml mime.xml \
 		policy.xml quantization-table.xml thresholds.xml type-apple.xml \
@@ -338,6 +339,7 @@ PLIST_SUB+=		WMF="@comment "
 # SVG (Scalable Vector Graphics) requires both libxml2 and X11
 .if ${PORT_OPTIONS:MSVG} && ${PORT_OPTIONS:MX11}
 LIB_DEPENDS+=		librsvg-2.so:graphics/librsvg2
+USE_GNOME+=		cairo gdkpixbuf2
 CONFIGURE_ARGS+=	--with-rsvg
 .else
 CONFIGURE_ARGS+=	--without-rsvg
@@ -370,7 +372,7 @@ PKGNAMESUFFIX=		-nox11
 CONFLICTS_INSTALL+=	ImageMagick-nox11-6*
 CONFLICTS+=		display-[0-9]*
 CONFIGURE_ARGS+=	--with-x
-USE_XORG=		xext xt
+USE_XORG+=		xext xt
 PLIST_SUB+=		X11=''
 .endif
 

Modified: head/graphics/ImageMagick/distinfo
==============================================================================
--- head/graphics/ImageMagick/distinfo	Wed Aug 10 10:00:41 2016	(r420002)
+++ head/graphics/ImageMagick/distinfo	Wed Aug 10 10:02:06 2016	(r420003)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1463647427
-SHA256 (ImageMagick-6.9.4-3.tar.xz) = 567a658fab95d63f550817e5ec1bc83b5b0b150a52eed1d59f5de88b62e96d7a
-SIZE (ImageMagick-6.9.4-3.tar.xz) = 8783424
+TIMESTAMP = 1470820107
+SHA256 (ImageMagick-6.9.5-5.tar.xz) = b3b5cc1989a53b8847ffdc3b5ed740ba0c9c4e9b103cbbac7d0a78e5b7d2936f
+SIZE (ImageMagick-6.9.5-5.tar.xz) = 8784240

Added: head/graphics/ImageMagick/files/patch-tests_validate.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/ImageMagick/files/patch-tests_validate.c	Wed Aug 10 10:02:06 2016	(r420003)
@@ -0,0 +1,11 @@
+--- tests/validate.c.orig	2016-08-10 11:23:44.131844000 +0200
++++ tests/validate.c	2016-08-10 11:24:56.257698000 +0200
+@@ -2394,7 +2394,7 @@
+       else
+         {
+           (void) FormatLocaleFile(stdout,"Version: %s\n",
+-            GetMagickHomeURL();
++            GetMagickVersion((size_t *) NULL));
+           (void) FormatLocaleFile(stdout,"Copyright: %s\n\n",
+             GetMagickCopyright());
+           (void) FormatLocaleFile(stdout,

Modified: head/graphics/ImageMagick/pkg-plist
==============================================================================
--- head/graphics/ImageMagick/pkg-plist	Wed Aug 10 10:00:41 2016	(r420002)
+++ head/graphics/ImageMagick/pkg-plist	Wed Aug 10 10:02:06 2016	(r420003)
@@ -1454,6 +1454,7 @@ man/man1/stream.1.gz
 %%PORTDOCS%%%%DOCSDIR%%-6/www/quantize.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/resources.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/search.html
+%%PORTDOCS%%%%DOCSDIR%%-6/www/security-policy.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/sitemap.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/source/analyze.c
 %%PORTDOCS%%%%DOCSDIR%%-6/www/source/coder.xml