From nobody@FreeBSD.org  Sat Aug 31 02:36:34 2002
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 46E9437B400
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 31 Aug 2002 02:36:34 -0700 (PDT)
Received: from www.freebsd.org (www.FreeBSD.org [216.136.204.117])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E3A0E43E6A
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 31 Aug 2002 02:36:33 -0700 (PDT)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.12.4/8.12.4) with ESMTP id g7V9aXOT041304
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 31 Aug 2002 02:36:33 -0700 (PDT)
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.12.4/8.12.4/Submit) id g7V9aXTh041303;
	Sat, 31 Aug 2002 02:36:33 -0700 (PDT)
Message-Id: <200208310936.g7V9aXTh041303@www.freebsd.org>
Date: Sat, 31 Aug 2002 02:36:33 -0700 (PDT)
From: KATO Tsuguru <tkato@prontomail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: Update port: graphics/ImageMagick (fix ports/40897)
X-Send-Pr-Version: www-1.0

>Number:         42241
>Category:       ports
>Synopsis:       Update port: graphics/ImageMagick (fix ports/40897)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Aug 31 02:40:03 PDT 2002
>Closed-Date:    Sat Aug 31 09:54:06 PDT 2002
>Last-Modified:  Sat Aug 31 09:54:06 PDT 2002
>Originator:     KATO Tsuguru
>Release:        4.6.2-RELEASE i386
>Organization:
>Environment:
>Description:
- Add graphics/jasper to LIB_DEPENDS
- Add graphics/hdf to optional LIB_DEPENDS

This PR supersedes following PR.
[2002/07/22] ports/40897  ports    Update port: graphics/ImageMagick

>How-To-Repeat:

>Fix:
diff -urN /usr/ports/graphics/ImageMagick/Makefile graphics/ImageMagick/Makefile
--- /usr/ports/graphics/ImageMagick/Makefile	Tue Jul 23 01:40:21 2002
+++ graphics/ImageMagick/Makefile	Sat Aug 31 02:18:16 2002
@@ -7,6 +7,7 @@
 
 PORTNAME=	ImageMagick
 PORTVERSION=	5.4.7.4
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	http://imagemagick.sourceforge.net/http/ \
 		ftp://ftp.yggdrasil.com/mirrors/site/ftp.simplesystems.org/pub/%SUBDIR%/ \
@@ -32,6 +33,7 @@
 
 BUILD_DEPENDS=	freetype-config:${PORTSDIR}/print/freetype2	# XXX
 LIB_DEPENDS=	fpx.1:${PORTSDIR}/graphics/libfpx \
+		jasper.4:${PORTSDIR}/graphics/jasper \
 		jbig.1:${PORTSDIR}/graphics/jbigkit \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		lcms.1:${PORTSDIR}/graphics/lcms \
@@ -53,7 +55,7 @@
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--enable-shared --with-perl=${PERL5} \
-		--without-gslib --without-hdf --without-jp2
+		--without-gslib
 INSTALLS_SHLIB=	yes
 
 MAN1=		ImageMagick.1 Magick++-config.1 Magick-config.1 \
@@ -89,13 +91,17 @@
 # Loadable coders, smaller executable, but PerlMagick not really works
 # ('make test' there works)
 .if defined(WITH_IMAGEMAGICK_MODULES)
-LIB_DEPENDS+=	ltdl.1:${PORTSDIR}/devel/libtool
 CONFIGURE_ARGS+=	--with-modules
 PLIST_SUB+=	MODULES=''
 .else
 PLIST_SUB+=	MODULES='@comment '
 .endif
 
+.if defined(WITH_HDF)
+LIB_DEPENDS=	df.1:${PORTSDIR}/graphics/hdf
+CONFIGURE_ARGS+=	--with-hdf
+.endif
+
 .if defined(WITHOUT_X11)
 PKGNAMESUFFIX+=	-nox11
 BUILD_DEPENDS+=	gs:${PORTSDIR}/print/ghostscript-gnu-nox11
@@ -121,15 +127,11 @@
 post-patch:
 # Do not use PTHREAD_LIBS here
 	@${REINPLACE_CMD} -e 's|-lpthread|-lc_r|g ; \
-		s|^tagnames=|#tagnames=|g ; \
-		s|LIBLTDL=.*$$|LIBLTDL="-lltdl"|g ; \
-		s|INCLTDL=.*$$|INCLTDL=|g ; \
-		s|lcms/lcms.h|lcms.h|g ; \
-		s|lcms_lcms_h|lcms_h|g' ${WRKSRC}/configure
+		 s|^tagnames=|#tagnames=|g ; \
+		 s|lcms/lcms.h|lcms.h|g ; \
+		 s|lcms_lcms_h|lcms_h|g' ${WRKSRC}/configure
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|top_builddir)/ltdl/libltdlc.la|LIBLTDL)|g ; \
-		s|ltdl magick|magick|g ; \
-		 s|pkgdocdir =.*$$|pkgdocdir = ${DOCSDIR}/|g ; \
+		's|pkgdocdir =.*$$|pkgdocdir = ${DOCSDIR}/|g ; \
 		 s| install-data-html||g'
 	@${REINPLACE_CMD} -e 's|lcms/lcms.h|lcms.h|g' ${WRKSRC}/magick/transform.c
 	@${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|g' ${WRKSRC}/ltdl/ltdl.c

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: dwcjr 
State-Changed-When: Sat Aug 31 09:53:56 PDT 2002 
State-Changed-Why:  
Committed, thanks! 

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