Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 10 Dec 2012 08:18:07 +0000 (UTC)
From:      Beech Rintoul <beech@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r308591 - head/graphics/ImageMagick
Message-ID:  <201212100818.qBA8I7b4061897@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: beech
Date: Mon Dec 10 08:18:07 2012
New Revision: 308591
URL: http://svnweb.freebsd.org/changeset/ports/308591

Log:
  - Update to 6.8.0-7
  - Take maintainership
  
  PR:		ports/174267
  Submitted by:	Chris Petrik <c.petrik.sosa@gmail.com>

Modified:
  head/graphics/ImageMagick/Makefile   (contents, props changed)
  head/graphics/ImageMagick/distinfo   (contents, props changed)
  head/graphics/ImageMagick/pkg-plist   (contents, props changed)

Modified: head/graphics/ImageMagick/Makefile
==============================================================================
--- head/graphics/ImageMagick/Makefile	Mon Dec 10 07:29:50 2012	(r308590)
+++ head/graphics/ImageMagick/Makefile	Mon Dec 10 08:18:07 2012	(r308591)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 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/ \
@@ -26,7 +26,7 @@ MASTER_SITES=	http://www.imagemagick.org
 		ftp://ftp.is.co.za/pub/imagemagick/ \
 		ftp://ftp.fifi.org/pub/ImageMagick/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	beech@FreeBSD.org
 COMMENT=	Image processing tools
 
 LICENSE=	AL2
@@ -211,7 +211,7 @@ CONFIGURE_ARGS+=	--without-gslib
 
 .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
@@ -339,7 +339,7 @@ CONFIGURE_ARGS+=	--without-rsvg --withou
 
 # 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
@@ -371,14 +371,9 @@ 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:
@@ -401,7 +396,7 @@ post-patch:
 	@${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"
@@ -441,7 +436,7 @@ post-install: test
 .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
 

Modified: head/graphics/ImageMagick/distinfo
==============================================================================
--- head/graphics/ImageMagick/distinfo	Mon Dec 10 07:29:50 2012	(r308590)
+++ head/graphics/ImageMagick/distinfo	Mon Dec 10 08:18:07 2012	(r308591)
@@ -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

Modified: head/graphics/ImageMagick/pkg-plist
==============================================================================
--- head/graphics/ImageMagick/pkg-plist	Mon Dec 10 07:29:50 2012	(r308590)
+++ head/graphics/ImageMagick/pkg-plist	Mon Dec 10 08:18:07 2012	(r308591)
@@ -397,15 +397,15 @@ lib/ImageMagick-%%PORTVERSION%%/config/c
 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
@@ -529,6 +529,7 @@ libdata/pkgconfig/Wand.pc
 %%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
@@ -1343,6 +1344,7 @@ libdata/pkgconfig/Wand.pc
 %%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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212100818.qBA8I7b4061897>