svn commit: r414519 - head/graphics/ImageMagick

[Koop Mast]

Author: kwm
Date: Tue May  3 08:46:21 2016
New Revision: 414519
URL: https://svnweb.freebsd.org/changeset/ports/414519

Log:
  Update ImageMagick to 6.9.3-9.
  
  * Switch to USES=localbase.
  * Mark this version as legacy version now that ImageMagick7 is released.
    Upstream will continue to support this version.
  * Switch to CONFLICT_INSTALL

Modified:
  head/graphics/ImageMagick/Makefile
  head/graphics/ImageMagick/distinfo

Modified: head/graphics/ImageMagick/Makefile
==============================================================================
--- head/graphics/ImageMagick/Makefile	Tue May  3 08:20:29 2016	(r414518)
+++ head/graphics/ImageMagick/Makefile	Tue May  3 08:46:21 2016	(r414519)
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	ImageMagick
-DISTVERSION=	6.9.3-8
-PORTREVISION=	1
+DISTVERSION=	6.9.3-9
 PORTEPOCH=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	http://www.imagemagick.org/download/ \
@@ -30,7 +29,7 @@ MASTER_SITES=	http://www.imagemagick.org
 		ftp://ftp.fifi.org/pub/ImageMagick/
 
 MAINTAINER=	kwm at FreeBSD.org
-COMMENT=	Image processing tools
+COMMENT=	Image processing tools (legacy version)
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
@@ -40,7 +39,8 @@ LIB_DEPENDS=	libltdl.so:devel/libltdl
 CONFLICTS_INSTALL=	execline-[0-9]* # bin/import
 
 # This port uses .la files, keep libtool:keepla! (magick/module.c)
-USES=		cpe gmake libtool:keepla pathfix perl5 pkgconfig:both shebangfix tar:xz
+USES=		cpe gmake libtool:keepla localbase pathfix perl5 \
+		pkgconfig:both shebangfix tar:xz
 CPE_PRODUCT=	imagemagick
 CPE_VENDOR=	imagemagick
 SHEBANG_FILES=	www/source/examples.pl
@@ -50,11 +50,6 @@ CONFIGURE_ARGS=	--without-dps
 USE_LDCONFIG=	yes
 USE_GNOME=	libxml2
 
-# make sure LOCALBASE is placed at the end of the compiler lookup so the configure
-# script can find openjpeg2 headers before the openjpeg15 headers
-CPPFLAGS+=	-isystem${LOCALBASE}/include
-LDFLAGS+=	-Wl,-Y${LOCALBASE}/lib
-
 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-windows.xml type.xml
@@ -366,11 +361,11 @@ USES+=			ghostscript
 
 .if ! ${PORT_OPTIONS:MX11}
 CONFIGURE_ARGS+=	--without-x
-CONFLICTS+=		ImageMagick-6*
+CONFLICTS_INSTALL+=	ImageMagick-6*
 PLIST_SUB+=		X11='@comment '
 PKGNAMESUFFIX=		-nox11
 .else
-CONFLICTS+=		ImageMagick-nox11-6*
+CONFLICTS_INSTALL+=	ImageMagick-nox11-6*
 CONFLICTS+=		display-[0-9]*
 CONFIGURE_ARGS+=	--with-x
 USE_XORG=		xext xt

Modified: head/graphics/ImageMagick/distinfo
==============================================================================
--- head/graphics/ImageMagick/distinfo	Tue May  3 08:20:29 2016	(r414518)
+++ head/graphics/ImageMagick/distinfo	Tue May  3 08:46:21 2016	(r414519)
@@ -1,2 +1,2 @@
-SHA256 (ImageMagick-6.9.3-8.tar.xz) = 90ac96f51fa62caf8e24d3e169e6ba5f0059b04101e53eb27e70317339233a89
-SIZE (ImageMagick-6.9.3-8.tar.xz) = 8775168
+SHA256 (ImageMagick-6.9.3-9.tar.xz) = cec69db7d14cb1ab2d173381e5676219c678ca27b7af8878c6ffec18ec932960
+SIZE (ImageMagick-6.9.3-9.tar.xz) = 8777400