ports/74928: Update ImageMagick to 6.1.6-3, fix perllocal.pod problem

[Arjan van Leeuwen]

>Number:         74928
>Category:       ports
>Synopsis:       Update ImageMagick to 6.1.6-3, fix perllocal.pod problem
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Dec 10 20:40:29 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Arjan van Leeuwen
>Release:        FreeBSD 6.0-CURRENT amd64
>Organization:
>Environment:


System: FreeBSD 6.0-CURRENT #0: Tue Dec  7 18:51:10 CET 2004
    root at vincent.piwebs.com:/usr/obj/usr/src/sys/VINCENT



>Description:


- Update ImageMagick to 6.1.6-3
- Add fruitsalad.org mirror to prevent fetch problems in case ImageMagick decides to update again
- Don't install/append to perllocal.pod [1]

[1] reported by Kris


>How-To-Repeat:





>Fix:


--- ImageMagick.diff begins here ---
diff -urN /usr/ports/graphics/ImageMagick/Makefile ImageMagick/Makefile
--- /usr/ports/graphics/ImageMagick/Makefile	Fri Dec 10 20:21:23 2004
+++ ImageMagick/Makefile	Fri Dec 10 21:33:21 2004
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ImageMagick
-PORTVERSION=	6.1.6.0
-PORTREVISION=	2
+PORTVERSION=	6.1.6.3
 CATEGORIES=	graphics perl5
 MASTER_SITES=	ftp://ftp.imagemagick.org/pub/%SUBDIR%/ \
 		ftp://gd.tuwien.ac.at/pub/graphics/%SUBDIR%/ \
@@ -21,8 +20,8 @@
 		ftp://giswitch.sggw.waw.pl/pub/graphics/%SUBDIR%/ \
 		ftp://ftp.fifi.org/pub/%SUBDIR%/ \
 		ftp://ftp.simplesystems.org/pub/%SUBDIR%/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	pav
+		http://people.fruitsalad.org/avleeuwen/distfiles/%SUBDIR%/
+MASTER_SITE_SUBDIR=	${PORTNAME:L} ${PORTNAME}
 DISTNAME=	${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E}
 
 MAINTAINER=	avleeuwen at piwebs.com
diff -urN /usr/ports/graphics/ImageMagick/distinfo ImageMagick/distinfo
--- /usr/ports/graphics/ImageMagick/distinfo	Tue Dec  7 17:42:20 2004
+++ ImageMagick/distinfo	Fri Dec 10 20:34:38 2004
@@ -1,2 +1,2 @@
-MD5 (ImageMagick-6.1.6-0.tar.bz2) = c40549e22bdc7f8b74ed44381bf1fee5
-SIZE (ImageMagick-6.1.6-0.tar.bz2) = 4558525
+MD5 (ImageMagick-6.1.6-3.tar.bz2) = 2b0ece3e362f7c10438e295477fb2fcf
+SIZE (ImageMagick-6.1.6-3.tar.bz2) = 4560625
diff -urN /usr/ports/graphics/ImageMagick/files/patch-Makefile.in ImageMagick/files/patch-Makefile.in
--- /usr/ports/graphics/ImageMagick/files/patch-Makefile.in	Thu Dec  9 01:13:31 2004
+++ ImageMagick/files/patch-Makefile.in	Fri Dec 10 21:19:39 2004
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Thu Dec  9 00:26:37 2004
-+++ Makefile.in	Thu Dec  9 00:26:53 2004
+--- Makefile.in.orig	Fri Dec 10 01:43:10 2004
++++ Makefile.in	Fri Dec 10 21:19:20 2004
 @@ -1885,7 +1885,7 @@
  	$(UTILITIES_EXTRA_DIST) \
  	$(WAND_EXTRA_DIST)
@@ -9,3 +9,12 @@
  
  # Where architecture-independent configuration files get installed
  # (share/ImageMagick-version)
+@@ -9286,7 +9286,7 @@
+ 
+ @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE at install-exec-perl: $(PERLMAKEFILE)
+ @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' && \
+- at WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	$(MAKE) CC='@CC@' install && \
++ at WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	$(MAKE) CC='@CC@' pure_install && \
+ @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	$(MAKE) clean && rm -f  Makefile.old )
+ 
+ @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE at all-perl:
--- ImageMagick.diff ends here ---



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