Attachment 127609 Details for Bug 171456 – file.diff

[patch] file.diff

file.diff (text/plain), 4.49 KB, created by 4721@hushmail.com on 2012-09-08 16:40:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: 4721@hushmail.com

Created: 2012-09-08 16:40:01 UTC

Size: 4.49 KB

patch

obsolete

>Index: graphics/ImageMagick/Makefile
>===================================================================
>--- graphics/ImageMagick/Makefile	(revision 303809)
>+++ graphics/ImageMagick/Makefile	(working copy)
>@@ -1,21 +1,37 @@
>-# New ports collection makefile for:	ImageMagick
>-# Date created:		15 November 1994
>-# Whom:			torstenb
>-#
> # $FreeBSD$
>-#
> 
> PORTNAME=	ImageMagick
>-DISTVERSION=	6.7.8-6
>+DISTVERSION=	6.7.9-3
> CATEGORIES=	graphics perl5
>-MASTER_SITES=	ftp://ftp.imagemagick.org/pub/ImageMagick/ \
>+MASTER_SITES=	http://www.imagemagick.org/download/ \
>+		http://servingzone.com/mirrors/ImageMagick/ \
>+		http://mirror.checkdomain.de/imagemagick/ \
> 		http://image_magick.veidrodis.com/image_magick/ \
>+		http://imagemagick.spd.co.il/ \
>+		http://www.champground.com/imagemagick/ \
>+		http://ftp.surfnet.nl/pub/ImageMagick/ \
>+		http://mirror.searchdaimon.com/ImageMagick/ \
>+		http://mirror.is.co.za/pub/imagemagick/ \
>+		http://imagemagick.mirrorcatalogs.com/ \
>+		ftp://ftp.imagemagick.org/pub/ImageMagick/ \
>+		ftp://mirror.aarnet.edu.au/pub/imagemagick/ \
>+		ftp://mirror.checkdomain.de/imagemagick/ \
>+		ftp://ftp.kddlabs.co.jp/graphics/ImageMagick/ \
>+		ftp://ftp.u-aizu.ac.jp/pub/graphics/image/ImageMagick/imagemagick.org/ \
>+		ftp://ftp.nluug.nl/pub/ImageMagick/ \
>+		ftp://mirror.searchdaimon.com/ImageMagick/ \
>+		ftp://sunsite.icm.edu.pl/packages/ImageMagick/ \
>+		ftp://ftp.tpnet.pl/pub/graphics/ImageMagick/ \
> 		ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ \
>-		ftp://ftp.nluug.nl/pub/ImageMagick/
>+		ftp://ftp.is.co.za/pub/imagemagick/ \
>+		ftp://ftp.fifi.org/pub/ImageMagick/
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Image processing tools
> 
>+LICENSE=	AL2
>+LICENSE_FILE=	${WRKSRC}/LICENSE
>+
> USE_XZ=		yes
> USE_PERL5=	yes
> USE_PKGCONFIG=	yes
>@@ -371,8 +387,6 @@
> 	@${REINPLACE_CMD} -e '/PERL/s|install && \\$$|pure_install \&\& \\|' \
> 		-e 's/install-docDATA install-filters/install-filters/' \
> 		${WRKSRC}/Makefile.in
>-	@${REINPLACE_CMD} -e 's,!/bin/bash,!/bin/sh,g' -e 's,==,=,g' \
>-		${WRKSRC}/tests/validate-colorspace.sh
> # remove the autogenerated Magick.c so it will be regenerated from
> # Magick.xs on _this_ system:
> 	@${RM} -f ${WRKSRC}/PerlMagick/Magick.c
>@@ -413,7 +427,7 @@
> 	@${ECHO_CMD} NOTICE: SVG format support disabled, requires X11
> .endif
> 
>-post-install:
>+post-install: test
> .if ${PORT_OPTIONS:MPERL}
> 	@${RM} -f ${PREFIX}/lib/perl5/${PERL_VERSION}/mach/perllocal.pod
> .endif
>@@ -428,13 +442,8 @@
> .endif
> 
> test check:
>-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} limits -m 20m ${MAKE} check
>-
>-.if !defined(_NO_IMAGEMAGICK_TESTS)
>-regression-test:	test
>-. if !defined(PACKAGE_BUILDING) && ${PORT_OPTIONS:MTESTS}
>-post-build:	regression-test
>-. endif
>+.if (${PORT_OPTIONS:MTESTS} || defined(PACKAGE_BUILDING)) && !defined(_NO_IMAGEMAGICK_TESTS)
>+	-cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} limits -m 20m ${MAKE} check
> .endif
> 
> .include <bsd.port.post.mk>
>Index: graphics/ImageMagick/distinfo
>===================================================================
>--- graphics/ImageMagick/distinfo	(revision 303809)
>+++ graphics/ImageMagick/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (ImageMagick-6.7.8-6.tar.xz) = cb7817516b891dd0c02c7370fff8dd873e75b6e20e5022834d24d35cde46a040
>-SIZE (ImageMagick-6.7.8-6.tar.xz) = 7820384
>+SHA256 (ImageMagick-6.7.9-3.tar.xz) = a33b56084e900656e62f1918fe421eea56c126a4920c8901617c001c5e40af57
>+SIZE (ImageMagick-6.7.9-3.tar.xz) = 7842804
>Index: graphics/ImageMagick/pkg-plist
>===================================================================
>--- graphics/ImageMagick/pkg-plist	(revision 303809)
>+++ graphics/ImageMagick/pkg-plist	(working copy)
>@@ -103,6 +103,7 @@
> include/ImageMagick/magick/option.h
> include/ImageMagick/magick/paint.h
> include/ImageMagick/magick/pixel.h
>+include/ImageMagick/magick/pixel-accessor.h
> include/ImageMagick/magick/policy.h
> include/ImageMagick/magick/prepress.h
> include/ImageMagick/magick/profile.h
>@@ -232,6 +233,8 @@
> %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/ipl.so
> %%JBIG%%%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/jbig.la
> %%JBIG%%%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/jbig.so
>+%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/jnx.la
>+%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/jnx.so
> %%JPEG2000%%%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/jp2.la
> %%JPEG2000%%%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/jp2.so
> %%JPEG%%%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/jpeg.la

Actions: View | Diff

Attachments on bug 171456: 127609