From nobody@FreeBSD.org  Mon Dec 18 12:00:48 2000
Return-Path: <nobody@FreeBSD.org>
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id 06CA137B400
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 18 Dec 2000 12:00:48 -0800 (PST)
Received: (from nobody@localhost)
	by freefall.freebsd.org (8.11.1/8.11.1) id eBIK0lF27567;
	Mon, 18 Dec 2000 12:00:47 -0800 (PST)
	(envelope-from nobody)
Message-Id: <200012182000.eBIK0lF27567@freefall.freebsd.org>
Date: Mon, 18 Dec 2000 12:00:47 -0800 (PST)
From: tkato@prontomail.ne.jp
Sender: nobody@FreeBSD.org
To: freebsd-gnats-submit@FreeBSD.org
Subject: Update port: graphics/ImageMagick to 5.2.6 (fix ports/23273)
X-Send-Pr-Version: www-1.0

>Number:         23623
>Category:       ports
>Synopsis:       Update port: graphics/ImageMagick to 5.2.6 (fix ports/23273)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    jseger
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Dec 18 12:10:01 PST 2000
>Closed-Date:    Wed Jan 10 21:17:52 PST 2001
>Last-Modified:  Wed Jan 10 21:18:14 PST 2001
>Originator:     KATO Tsuguru
>Release:        4.2-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to version 5.2.6

This PR supersedes ports/23273.

No response from maintainer.

>How-To-Repeat:

>Fix:
diff -urN /usr/ports/graphics/ImageMagick/Makefile graphics/ImageMagick/Makefile
--- /usr/ports/graphics/ImageMagick/Makefile	Tue Oct  3 22:48:57 2000
+++ graphics/ImageMagick/Makefile	Mon Dec 11 23:28:40 2000
@@ -6,16 +6,15 @@
 #
 
 PORTNAME=	ImageMagick
-PORTVERSION=	5.2.3
+PORTVERSION=	5.2.6
 CATEGORIES=	graphics perl5
-MASTER_SITES=	${MASTER_SITE_LOCAL} \
-		ftp://ftp.wizards.dupont.com/pub/ImageMagick/ \
+MASTER_SITES=	ftp://ftp.simplesystems.org/pub/ImageMagick/ \
+		ftp://ftp.cdrom.com/pub/ImageMagick/ \
 		ftp://ftp.u-aizu.ac.jp/pub/graphics/image/ImageMagick/ \
 		ftp://ftp.fifi.org/pub/ImageMagick/ \
 		ftp://gd.tuwien.ac.at/pub/graphics/ImageMagick/ \
 		ftp://ftp.ms.mff.cuni.cz/MIRRORS/ftp.wizards.dupont.com/pub/ImageMagick/ \
 		ftp://ftp.oce.nl/pub/Internet/audio+video/ImageMagick/
-MASTER_SITE_SUBDIR=	jseger
 
 MAINTAINER=	jseger@FreeBSD.org
 
@@ -24,7 +23,8 @@
 		jbig.1:${PORTSDIR}/graphics/jbigkit \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.4:${PORTSDIR}/graphics/png \
-		tiff.4:${PORTSDIR}/graphics/tiff
+		tiff.4:${PORTSDIR}/graphics/tiff \
+		freetype.6:${PORTSDIR}/print/freetype2
 BUILD_DEPENDS=	gs:${PORTSDIR}/print/ghostscript55 \
 		mpeg2decode:${PORTSDIR}/graphics/mpeg2codec \
 		picttoppm:${PORTSDIR}/graphics/netpbm \
@@ -36,14 +36,18 @@
 
 USE_PERL5=	yes
 USE_XLIB=	yes
-USE_FREETYPE=	yes
 USE_LIBTOOL=	yes
 USE_AUTOCONF=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--enable-shared --enable-16bit-pixel --without-modules \
+CONFIGURE_ARGS=	--enable-shared --without-modules \
+		--with-threads --without-magick-plus-plus \
 		--with-perl=${PERL5} --without-xml
 INSTALLS_SHLIB=	yes
+
+.if defined(WITH_16BIT_PIXEL)
+CONFIGURE_ARGS+= --enable-16bit-pixel
+.endif
 
 .if defined(HAVE_UNISYS_LICENSE)
 CONFIGURE_ARGS+= --enable-lzw
diff -urN /usr/ports/graphics/ImageMagick/distinfo graphics/ImageMagick/distinfo
--- /usr/ports/graphics/ImageMagick/distinfo	Thu Aug 24 06:20:20 2000
+++ graphics/ImageMagick/distinfo	Mon Dec 11 20:28:27 2000
@@ -1 +1 @@
-MD5 (ImageMagick-5.2.3.tar.gz) = 98d1a57c155aa017ed67505b6ca36a86
+MD5 (ImageMagick-5.2.6.tar.gz) = 77421faaa1b99c4d832c74fa8492b7c6
diff -urN /usr/ports/graphics/ImageMagick/files/patch-al graphics/ImageMagick/files/patch-al
--- /usr/ports/graphics/ImageMagick/files/patch-al	Thu Jan  1 09:00:00 1970
+++ graphics/ImageMagick/files/patch-al	Tue Dec  5 02:43:22 2000
@@ -0,0 +1,16 @@
+--- configure.in.orig	Fri Dec  1 02:14:22 2000
++++ configure.in	Tue Dec  5 02:43:13 2000
+@@ -471,10 +471,10 @@
+ LIB_THREAD=''
+ if test "$with_threads" != 'no'
+ then
+-  AC_CHECK_LIB(pthread,pthread_attr_init,
++  AC_CHECK_LIB(c_r,pthread_attr_init,
+     [AC_DEFINE(HasPTHREADS,,Define if you have Posix thread methods.)
+-     LIB_THREAD="-lpthread"
+-     DEF_THREAD="-D_REENTRANT"],,)
++     LIB_THREAD="-pthread"
++     DEF_THREAD="-D_THREAD_SAFE"],,)
+   LIBS="$LIB_THREAD $LIBS"
+   CPPFLAGS="$DEF_THREAD $CPPFLAGS"
+ fi
diff -urN /usr/ports/graphics/ImageMagick/pkg-plist graphics/ImageMagick/pkg-plist
--- /usr/ports/graphics/ImageMagick/pkg-plist	Wed Jul 19 22:08:38 2000
+++ graphics/ImageMagick/pkg-plist	Mon Dec 11 23:29:13 2000
@@ -1,10 +1,12 @@
 bin/Magick-config
 bin/animate
+bin/cgimagick
 bin/combine
 bin/convert
 bin/display
 bin/identify
 bin/import
+bin/iptcutil
 bin/mogrify
 bin/montage
 include/magick/PreRvIcccm.h
@@ -17,6 +19,7 @@
 include/magick/compress.h
 include/magick/config.h
 include/magick/delegates.h
+include/magick/draw.h
 include/magick/error.h
 include/magick/gems.h
 include/magick/image.h


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports->jseger 
Responsible-Changed-By: sobomax 
Responsible-Changed-When: Tue Dec 19 00:24:41 PST 2000 
Responsible-Changed-Why:  
Over to maintainer. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=23623 
State-Changed-From-To: open->closed 
State-Changed-By: steve 
State-Changed-When: Wed Jan 10 21:17:52 PST 2001 
State-Changed-Why:  
Superced by ports/24094. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=23623 
>Unformatted:
