ports/67628: Update graphics/ImageMagick to 6.0.2

[Arjan van Leeuwen]

>Number:         67628
>Category:       ports
>Synopsis:       Update graphics/ImageMagick to 6.0.2
>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:   Sun Jun 06 07:20:12 PDT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Arjan van Leeuwen
>Release:        FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:


System: FreeBSD 5.2-CURRENT #2: Fri Jun  4 09:34:37 CEST 2004
    root at vincent.piwebs.com:/usr/obj/usr/src/sys/AMD760



>Description:


- Update graphics/ImageMagick to 6.0.2
    Changelog: http://www.imagemagick.org/www/Changelog.html
- Remove SourceForge from MASTER_SITES, as they don't have the new version yet


>How-To-Repeat:





>Fix:


--- ImageMagick.diff begins here ---
diff -urN /usr/ports/graphics/ImageMagick/Makefile ImageMagick/Makefile
--- /usr/ports/graphics/ImageMagick/Makefile	Tue Jun  1 20:02:38 2004
+++ ImageMagick/Makefile	Sun Jun  6 16:13:04 2004
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	ImageMagick
-PORTVERSION=	6.0.1.3
+PORTVERSION=	6.0.2
 CATEGORIES=	graphics perl5
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
-		ftp://gd.tuwien.ac.at/pub/graphics/%SUBDIR%/ \
+MASTER_SITES=	ftp://gd.tuwien.ac.at/pub/graphics/%SUBDIR%/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/ImageMagick,} \
 		ftp://ftp.crc.ca/pub/packages/graphics/imagemagick/ \
 		ftp://ftp.imagemagick.org/pub/%SUBDIR%/ \
@@ -23,13 +22,10 @@
 		ftp://ftp.fifi.org/pub/%SUBDIR%/ \
 		ftp://ftp.simplesystems.org/pub/%SUBDIR%/
 MASTER_SITE_SUBDIR=	${PORTNAME:L} ${PORTNAME}
-DISTNAME=	${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E}
 
 MAINTAINER=	avleeuwen at piwebs.com
 COMMENT=	Image processing tools
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
-
 USE_PERL5=	yes
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack gnometarget pkgconfig
@@ -47,6 +43,8 @@
 
 CPPFLAGS=	-I${LOCALBASE}/include
 LDFLAGS=	-L${LOCALBASE}/lib
+
+PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
 .if !defined(WITHOUT_IMAGEMAGICK_PERL)
 CONFIGURE_ARGS+=	--with-perl=${PERL5}
diff -urN /usr/ports/graphics/ImageMagick/distinfo ImageMagick/distinfo
--- /usr/ports/graphics/ImageMagick/distinfo	Fri May 21 12:05:57 2004
+++ ImageMagick/distinfo	Sun Jun  6 15:50:46 2004
@@ -1,2 +1,2 @@
-MD5 (ImageMagick-6.0.1-3.tar.bz2) = 56d61961951f76fd875fcf656e81b8df
-SIZE (ImageMagick-6.0.1-3.tar.bz2) = 5606799
+MD5 (ImageMagick-6.0.2.tar.bz2) = 6509acd0cb88f1958d1c8d17edec1489
+SIZE (ImageMagick-6.0.2.tar.bz2) = 5613394
diff -urN /usr/ports/graphics/ImageMagick/pkg-plist ImageMagick/pkg-plist
--- /usr/ports/graphics/ImageMagick/pkg-plist	Tue Jun  1 20:02:38 2004
+++ ImageMagick/pkg-plist	Sun Jun  6 16:09:05 2004
@@ -489,11 +489,12 @@
 share/ImageMagick/config/coder.mgk
 share/ImageMagick/config/log.mgk
 share/ImageMagick/config/magic.mgk
-share/ImageMagick-6.0.1/LICENSE
-share/ImageMagick-6.0.1/Magick.pdf
-share/ImageMagick-6.0.1/NOTICE
-share/ImageMagick-6.0.1/QuickStart.txt
+share/ImageMagick-%%PORTVERSION%%/LICENSE
+share/ImageMagick-%%PORTVERSION%%/Magick.pdf
+share/ImageMagick-%%PORTVERSION%%/NOTICE
+share/ImageMagick-%%PORTVERSION%%/QuickStart.txt
 %%PORTDOCS%%share/doc/ImageMagick/images/background.gif
+%%PORTDOCS%%share/doc/ImageMagick/images/devlib.gif
 %%PORTDOCS%%share/doc/ImageMagick/images/dogwaffle.png
 %%PORTDOCS%%share/doc/ImageMagick/images/examples.jpg
 %%PORTDOCS%%share/doc/ImageMagick/images/granite.png
@@ -694,7 +695,7 @@
 %%PORTDOCS%%@dirrm share/doc/ImageMagick/images/patterns
 %%PORTDOCS%%@dirrm share/doc/ImageMagick/images
 %%PORTDOCS%%@dirrm share/doc/ImageMagick
- at dirrm share/ImageMagick-6.0.1
+ at dirrm share/ImageMagick-%%PORTVERSION%%
 @dirrm share/ImageMagick/config
 @dirrm share/ImageMagick
 %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Magick
--- ImageMagick.diff ends here ---



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