ports/75065: Update ImageMagick to 6.1.6-7; fix pthreads issue

[Arjan van Leeuwen]

>Number:         75065
>Category:       ports
>Synopsis:       Update ImageMagick to 6.1.6-7; fix pthreads issue
>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:   Tue Dec 14 19:30:30 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Arjan van Leeuwen
>Release:        FreeBSD 6.0-CURRENT amd64
>Organization:
>Environment:


System: FreeBSD 6.0-CURRENT #1: Sun Dec 12 21:29:34 CET 2004
    root at vincent.piwebs.com:/usr/obj/usr/src/sys/VINCENT



>Description:


- Update ImageMagick to version 6.1.6-7
- Fix a problem where ImageMagick would always link with -lc_r if WITH_IMAGEMAGICK_THREADS was defined [1]

[1] Reported by Jacob Meuser <jakemsr at jakemsr.com>


>How-To-Repeat:





>Fix:


--- ImageMagick.diff begins here ---
diff -urN /usr/ports/graphics/ImageMagick/Makefile ImageMagick/Makefile
--- /usr/ports/graphics/ImageMagick/Makefile	Tue Dec 14 19:00:31 2004
+++ ImageMagick/Makefile	Tue Dec 14 20:04:52 2004
@@ -2,11 +2,11 @@
 # Date created:		15 November 1994
 # Whom:			torstenb
 #
-# $FreeBSD: ports/graphics/ImageMagick/Makefile,v 1.200 2004/12/12 23:59:05 pav Exp $
+# $FreeBSD: ports/graphics/ImageMagick/Makefile,v 1.199 2004/12/11 18:12:39 pav Exp $
 #
 
 PORTNAME=	ImageMagick
-PORTVERSION=	6.1.6.6
+PORTVERSION=	6.1.6.7
 CATEGORIES=	graphics perl5
 MASTER_SITES=	ftp://ftp.imagemagick.org/pub/%SUBDIR%/ \
 		ftp://gd.tuwien.ac.at/pub/graphics/%SUBDIR%/ \
@@ -65,8 +65,7 @@
     (!defined(WITHOUT_IMAGEMAGICK_PERL) && \
      defined(PERL_THREADED) && ${PERL_THREADED} == "true")
 CONFIGURE_ARGS+=	--with-threads
-CPPFLAGS+=		${PTHREAD_CFLAGS}
-LDFLAGS+=		${PTHREAD_LIBS}
+CONFIGURE_ENV+=		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" PTHREAD_LIBS="${PTHREAD_LIBS}"
 .else
 CONFIGURE_ARGS+=	--without-threads
 .endif
diff -urN /usr/ports/graphics/ImageMagick/distinfo ImageMagick/distinfo
--- /usr/ports/graphics/ImageMagick/distinfo	Tue Dec 14 19:00:31 2004
+++ ImageMagick/distinfo	Tue Dec 14 20:05:09 2004
@@ -1,2 +1,2 @@
-MD5 (ImageMagick-6.1.6-6.tar.bz2) = b832ecc8658687a67ee79413d169651c
-SIZE (ImageMagick-6.1.6-6.tar.bz2) = 4558859
+MD5 (ImageMagick-6.1.6-7.tar.bz2) = cb88563e9428562515cfdc9285d51812
+SIZE (ImageMagick-6.1.6-7.tar.bz2) = 4558405
--- ImageMagick.diff ends here ---



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