svn commit: r390178 - in head/graphics: ImageMagick ImageMagick-nox11

[Koop Mast]

Author: kwm
Date: Sat Jun 20 21:30:09 2015
New Revision: 390178
URL: https://svnweb.freebsd.org/changeset/ports/390178

Log:
  Update ImageMagick to 6.9.1-6.
  
  * Remove double --without-lcms.
  * Speed up the test target by running it with multiple jobs.
  * Finaly add back WITHOUT_X11 to the IM-nox11 port, this will select the
    ghostscript-nox11 port instead of the x11 version. The code in
    bsd.port.mk doesn't handle the OPTIONS UNSET/EXCLUDE of X11. [1]
  
  PR:		199268 [1]

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

Modified: head/graphics/ImageMagick-nox11/Makefile
==============================================================================
--- head/graphics/ImageMagick-nox11/Makefile	Sat Jun 20 17:41:36 2015	(r390177)
+++ head/graphics/ImageMagick-nox11/Makefile	Sat Jun 20 21:30:09 2015	(r390178)
@@ -4,6 +4,8 @@
 # the SVG and PANGO plugins need X11
 OPTIONS_EXCLUDE=	X11 SVG PANGO
 PORTSCOUT=	ignore:1
+# workaround until bsd.port.mk code can grok the disabling of the X11 option
+WITHOUT_X11=yes
 
 MASTERDIR=	${.CURDIR}/../ImageMagick
 

Modified: head/graphics/ImageMagick/Makefile
==============================================================================
--- head/graphics/ImageMagick/Makefile	Sat Jun 20 17:41:36 2015	(r390177)
+++ head/graphics/ImageMagick/Makefile	Sat Jun 20 21:30:09 2015	(r390178)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	ImageMagick
-DISTVERSION=	6.9.1-4
+DISTVERSION=	6.9.1-6
 PORTEPOCH=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	http://www.imagemagick.org/download/ \
@@ -45,8 +45,7 @@ CPE_VENDOR=	imagemagick
 SHEBANG_FILES=	www/source/examples.pl
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	MAKE=${MAKE_CMD}
-CONFIGURE_ARGS=	--without-dps \
-		--without-lcms
+CONFIGURE_ARGS=	--without-dps
 USE_LDCONFIG=	yes
 USE_GNOME=	libxml2
 
@@ -291,7 +290,7 @@ CONFIGURE_ARGS+=	--without-lzma
 .if ${PORT_OPTIONS:MLCMS2}
 LIB_DEPENDS+=		liblcms2.so:${PORTSDIR}/graphics/lcms2
 .else
-CONFIGURE_ARGS+=	--without-lcms2
+CONFIGURE_ARGS+=	--without-lcms
 .endif
 
 # Freetype (TrueType Font) support
@@ -414,7 +413,7 @@ post-install: test
 
 test check:
 .if ${PORT_OPTIONS:MTESTS}
-	-cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} limits -m 20m ${MAKE} check
+	-cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} limits -m 20m ${MAKE} ${_MAKE_JOBS} check
 .endif
 
 .include <bsd.port.mk>

Modified: head/graphics/ImageMagick/distinfo
==============================================================================
--- head/graphics/ImageMagick/distinfo	Sat Jun 20 17:41:36 2015	(r390177)
+++ head/graphics/ImageMagick/distinfo	Sat Jun 20 21:30:09 2015	(r390178)
@@ -1,2 +1,2 @@
-SHA256 (ImageMagick-6.9.1-4.tar.xz) = 74973478058069ce44040ff76b61df713d70adcadfd207836cc0622cadf1e4bf
-SIZE (ImageMagick-6.9.1-4.tar.xz) = 7978216
+SHA256 (ImageMagick-6.9.1-6.tar.xz) = 8d83934df129833f9e8696017182d8bbca8189842bbd2705c24729fed8db3358
+SIZE (ImageMagick-6.9.1-6.tar.xz) = 8276660