svn commit: r383424 - head/graphics/ImageMagick

[Koop Mast]

Author: kwm
Date: Mon Apr  6 13:53:50 2015
New Revision: 383424
URL: https://svnweb.freebsd.org/changeset/ports/383424

Log:
  Update ImageMagick to 6.9.1-1.
  
  Remove FONTCONFIG_CFLAGS/_LIBS pkg-config manual overwrites.
  Add comment why CPPFLAGS/LDFLAGS are different than usual.
  Add CPE data [1]
  
  PR:		199040 [1]
  Submitted by:	shun <shun.fbsd.pr at dropcut.net> [1]

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

Modified: head/graphics/ImageMagick/Makefile
==============================================================================
--- head/graphics/ImageMagick/Makefile	Mon Apr  6 13:29:29 2015	(r383423)
+++ head/graphics/ImageMagick/Makefile	Mon Apr  6 13:53:50 2015	(r383424)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	ImageMagick
-DISTVERSION=	6.9.0-10
+DISTVERSION=	6.9.1-1
 PORTEPOCH=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	http://www.imagemagick.org/download/ \
@@ -39,7 +39,9 @@ LIB_DEPENDS=	libltdl.so:${PORTSDIR}/deve
 CONFLICTS_INSTALL=	execline-[0-9]* # bin/import
 
 # This port uses .la files, keep libtool:keepla! (magick/module.c)
-USES=		gmake libtool:keepla pathfix perl5 pkgconfig:both shebangfix tar:xz
+USES=		cpe gmake libtool:keepla pathfix perl5 pkgconfig:both shebangfix tar:xz
+CPE_PRODUCT=	imagemagick
+CPE_VENDOR=	imagemagick
 SHEBANG_FILES=	www/source/examples.pl
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	MAKE=${MAKE_CMD}
@@ -48,6 +50,8 @@ 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
 
@@ -312,9 +316,6 @@ PLIST_SUB+=		WEBP="@comment "
 .if ${PORT_OPTIONS:MFONTCONFIG}
 LIB_DEPENDS+=		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
 CONFIGURE_ARGS+=	--with-fontconfig
-CONFIGURE_ENV+=		FONTCONFIG_CFLAGS="-I${LOCALBASE}/include" \
-			FONTCONFIG_LIBS="-L${LOCALBASE}/lib"
-MAKE_ENV+=		FONTCONFIG_CFLAGS="-I${LOCALBASE}/include"
 .else
 CONFIGURE_ARGS+=	--without-fontconfig
 .endif

Modified: head/graphics/ImageMagick/distinfo
==============================================================================
--- head/graphics/ImageMagick/distinfo	Mon Apr  6 13:29:29 2015	(r383423)
+++ head/graphics/ImageMagick/distinfo	Mon Apr  6 13:53:50 2015	(r383424)
@@ -1,2 +1,2 @@
-SHA256 (ImageMagick-6.9.0-10.tar.xz) = d1f5dcd32a93130feb9e980a8a97517d3a2c814a8b608d139d4756516548748c
-SIZE (ImageMagick-6.9.0-10.tar.xz) = 7906216
+SHA256 (ImageMagick-6.9.1-1.tar.xz) = 8f6ebeb1a1321fd7b7d3161a66461743ea5bbc352e4339c792b3bab52c379378
+SIZE (ImageMagick-6.9.1-1.tar.xz) = 7906164