ports/174267: [PATCH] update graphics/ImageMagick to 6.8.0-7

[Chris Petrik]

>Number:         174267
>Category:       ports
>Synopsis:       [PATCH] update graphics/ImageMagick to 6.8.0-7
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Dec 07 20:50:01 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Chris Petrik
>Release:        
>Organization:
na
>Environment:
>Description:
update to 6.8.0-7
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: ImageMagick/Makefile
==================================================================
--- ImageMagick/Makefile
+++ ImageMagick/Makefile
@@ -1,9 +1,9 @@
 # $FreeBSD: Makefile 307750 2012-11-25 16:38:24Z crees $
 
 PORTNAME=	ImageMagick
-DISTVERSION=	6.7.9-4
+DISTVERSION=	6.8.0-7
 CATEGORIES=	graphics perl5
 MASTER_SITES=	http://www.imagemagick.org/download/ \
 		http://servingzone.com/mirrors/ImageMagick/ \
 		http://mirror.checkdomain.de/imagemagick/ \
 		http://image_magick.veidrodis.com/image_magick/ \
@@ -209,11 +209,11 @@
 CONFIGURE_ARGS+=	--without-gslib
 .endif
 
 .if ${PORT_OPTIONS:MLQR}
 CONFIGURE_ARGS+=	--with-lqr
-LIB_DEPENDS+=		lqr-1.3:${PORTSDIR}/graphics/liblqr-1
+LIB_DEPENDS+=		lqr-1:${PORTSDIR}/graphics/liblqr-1
 .else
 CONFIGURE_ARGS+=	--without-lqr
 .endif
 
 .if ${PORT_OPTIONS:MFFTW}
@@ -337,11 +337,11 @@
 CONFIGURE_ARGS+=	--without-rsvg --without-xml
 .endif
 
 # Pango support
 .if ${PORT_OPTIONS:MPANGO} && !defined(WITHOUT_X11)
-LIB_DEPENDS+=		pangocairo-1\.0.0:${PORTSDIR}/x11-toolkits/pango
+LIB_DEPENDS+=		pangocairo-1\.0:${PORTSDIR}/x11-toolkits/pango
 PLIST_SUB+=		PANGO=""
 .else
 CONFIGURE_ARGS+=	--without-pango
 PLIST_SUB+=		PANGO="@comment "
 .endif
@@ -369,18 +369,13 @@
 .else
 INSTALL_TARGET=	install
 .endif
 
 # Test suite, requires installed ghostscript to pass
-.if ${ARCH} == sparc64
-_NO_IMAGEMAGICK_TESTS=yes
-.endif
 
 .if defined(PACKAGE_BUILDING) || ${PORT_OPTIONS:MTESTS}
-. if !defined(_NO_IMAGEMAGICK_TESTS)
 USE_GHOSTSCRIPT_BUILD=yes
-. endif
 .endif
 
 post-patch:
 # prevent perllocal.pod from being written
 	@${REINPLACE_CMD} -e '/PERL/s|install && \\$$|pure_install \&\& \\|' \
@@ -399,11 +394,11 @@
 		 s| install-data-html||g'
 # do not version lib directories
 	@${PERL} -pi -e 's|^(MagickLibSubdir).*$$|\1="ImageMagick"|' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 	@${PERL} -pi -e 's|lcms/lcms.h|lcms.h|g' ${WRKSRC}/magick/transform.c
-	@${PERL} -pi -e 's|<malloc.h>|<stdlib.h>|g' ${WRKSRC}/ltdl/ltdl.c
+#	@${PERL} -pi -e 's|<malloc.h>|<stdlib.h>|g' ${WRKSRC}/ltdl/ltdl.c
 	@${PERL} -pi -e 's|timestamp: %ld|timestamp: %d|g' \
 		${WRKSRC}/magick/xwindow.c
 .if ${_IMAGEMAGICK_THREADS} == "yes"
 . for i in Magick++/lib/ImageMagick++.pc.in wand/Wand.pc.in magick/ImageMagick.pc.in
 	@${PERL} -pi -e 's|^(Libs.+)$$|\1 ${PTHREAD_LIBS}|; \
@@ -439,10 +434,10 @@
 	@${TOUCH} ${PREFIX}/lib/ImageMagick-${PORTVERSION:R}/modules-Q8/filters/.keep
 . endif
 .endif
 
 test check:
-.if (${PORT_OPTIONS:MTESTS} || defined(PACKAGE_BUILDING)) && !defined(_NO_IMAGEMAGICK_TESTS)
+.if (${PORT_OPTIONS:MTESTS} || defined(PACKAGE_BUILDING))
 	-cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} limits -m 20m ${MAKE} check
 .endif
 
 .include <bsd.port.post.mk>

Index: ImageMagick/distinfo
==================================================================
--- ImageMagick/distinfo
+++ ImageMagick/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ImageMagick-6.7.9-4.tar.xz) = b8f8abfb2899f219ce1010b863f6ee58695b5689180cb9857a44f61aa3e5bc81
-SIZE (ImageMagick-6.7.9-4.tar.xz) = 8368976
+SHA256 (ImageMagick-6.8.0-7.tar.xz) = e15672c8c11148bcfcd95885e1cd7a5575d4a6984bdf0a3a1c718a2a6ad37435
+SIZE (ImageMagick-6.8.0-7.tar.xz) = 8245624

Index: ImageMagick/pkg-plist
==================================================================
--- ImageMagick/pkg-plist
+++ ImageMagick/pkg-plist
@@ -395,19 +395,19 @@
 %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/filters/analyze.la
 %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/filters/analyze.so
 lib/libMagick++.a
 lib/libMagick++.la
 lib/libMagick++.so
-lib/libMagick++.so.5
+lib/libMagick++.so.6
 lib/libMagickCore.a
 lib/libMagickCore.la
 lib/libMagickCore.so
-lib/libMagickCore.so.5
+lib/libMagickCore.so.6
 lib/libMagickWand.a
 lib/libMagickWand.la
 lib/libMagickWand.so
-lib/libMagickWand.so.5
+lib/libMagickWand.so.6
 libdata/pkgconfig/ImageMagick++.pc
 libdata/pkgconfig/Magick++.pc
 libdata/pkgconfig/ImageMagick.pc
 libdata/pkgconfig/MagickCore.pc
 libdata/pkgconfig/MagickWand.pc
@@ -527,10 +527,11 @@
 %%PORTDOCS%%%%DOCSDIR%%/images/wand.ico
 %%PORTDOCS%%%%DOCSDIR%%/images/wand.png
 %%PORTDOCS%%%%DOCSDIR%%/images/white-highlight.png
 %%PORTDOCS%%%%DOCSDIR%%/images/wizard.jpg
 %%PORTDOCS%%%%DOCSDIR%%/images/wizard.png
+%%PORTDOCS%%%%DOCSDIR%%/images/ImageMagick.ico
 %%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%%%DOCSDIR%%/www/ImageMagickObject.html
 %%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Blob.html
 %%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Cache.fig
 %%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Cache.png
@@ -1341,10 +1342,11 @@
 %%PORTDOCS%%%%DOCSDIR%%/www/api/statistic.html
 %%PORTDOCS%%%%DOCSDIR%%/www/api/stream.html
 %%PORTDOCS%%%%DOCSDIR%%/www/api/transform.html
 %%PORTDOCS%%%%DOCSDIR%%/www/api/version.html
 %%PORTDOCS%%%%DOCSDIR%%/www/api/wand-view.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/magick++-classes.html
 %%PORTDOCS%%%%DOCSDIR%%/www/architecture.html
 %%PORTDOCS%%%%DOCSDIR%%/www/binary-releases.html
 %%PORTDOCS%%%%DOCSDIR%%/www/changelog.html
 %%PORTDOCS%%%%DOCSDIR%%/www/channel.html
 %%PORTDOCS%%%%DOCSDIR%%/www/cipher.html



>Release-Note:
>Audit-Trail:
>Unformatted: