From nobody@nwww.freebsd.org  Thu May  2 13:28:24 2002
Return-Path: <nobody@nwww.freebsd.org>
Received: from nwww.freebsd.org (nwww.FreeBSD.org [216.136.204.117])
	by hub.freebsd.org (Postfix) with ESMTP id 9D3DB37BB0A
	for <freebsd-gnats-submit@FreeBSD.org>; Thu,  2 May 2002 13:27:43 -0700 (PDT)
Received: from nwww.freebsd.org (localhost [127.0.0.1])
	by nwww.freebsd.org (8.12.2/8.12.2) with ESMTP id g42KSnhG070461
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 2 May 2002 13:28:49 -0700 (PDT)
	(envelope-from nobody@nwww.freebsd.org)
Received: (from nobody@localhost)
	by nwww.freebsd.org (8.12.2/8.12.2/Submit) id g42KSnXM070460;
	Thu, 2 May 2002 13:28:49 -0700 (PDT)
Message-Id: <200205022028.g42KSnXM070460@nwww.freebsd.org>
Date: Thu, 2 May 2002 13:28:49 -0700 (PDT)
From: KATO Tsuguru <tkato@prontomail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: Update port: graphics/ImageMagick to 5.4.4.5
X-Send-Pr-Version: www-1.0

>Number:         37685
>Category:       ports
>Synopsis:       Update port: graphics/ImageMagick to 5.4.4.5
>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:   Thu May 02 13:30:02 PDT 2002
>Closed-Date:    Thu May 02 15:24:42 PDT 2002
>Last-Modified:  Thu May 02 15:24:42 PDT 2002
>Originator:     KATO Tsuguru
>Release:        4.4-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to version 5.4.4-5

New file:
files/patch-configure

Remove file:
files/patch-an

>How-To-Repeat:

>Fix:
diff -urN /usr/ports/graphics/ImageMagick/Makefile graphics/ImageMagick/Makefile
--- /usr/ports/graphics/ImageMagick/Makefile	Mon Apr 15 19:02:46 2002
+++ graphics/ImageMagick/Makefile	Fri May  3 04:15:30 2002
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ImageMagick
-PORTVERSION=	5.4.4
+PORTVERSION=	5.4.4.5
 CATEGORIES=	graphics perl5
 MASTER_SITES=	http://imagemagick.sourceforge.net/http/ \
 		ftp://ftp.yggdrasil.com/mirrors/site/ftp.simplesystems.org/pub/%SUBDIR%/ \
@@ -26,30 +26,34 @@
 		ftp://ftp.fifi.org/pub/%SUBDIR%/ \
 		ftp://ftp.simplesystems.org/pub/%SUBDIR%/
 MASTER_SITE_SUBDIR=	${PORTNAME}
+DISTNAME=	${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E}
 
 MAINTAINER=	ports@FreeBSD.org
 
 BUILD_DEPENDS=	freetype-config:${PORTSDIR}/print/freetype2	# XXX
-LIB_DEPENDS=	fpx:${PORTSDIR}/graphics/libfpx \
-		jbig:${PORTSDIR}/graphics/jbigkit \
-		jpeg:${PORTSDIR}/graphics/jpeg \
-		lcms:${PORTSDIR}/graphics/lcms \
-		png:${PORTSDIR}/graphics/png \
+LIB_DEPENDS=	fpx.1:${PORTSDIR}/graphics/libfpx \
+		jbig.1:${PORTSDIR}/graphics/jbigkit \
+		jpeg.9:${PORTSDIR}/graphics/jpeg \
+		lcms.1:${PORTSDIR}/graphics/lcms \
+		png.5:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff \
-		freetype:${PORTSDIR}/print/freetype2 \
-		xml2:${PORTSDIR}/textproc/libxml2
+		freetype.9:${PORTSDIR}/print/freetype2 \
+		xml2.5:${PORTSDIR}/textproc/libxml2
 .if !exists(/usr/bin/bzip2)
-LIB_DEPENDS+=	bz2:${PORTSDIR}/archivers/bzip2
+LIB_DEPENDS+=	bz2.1:${PORTSDIR}/archivers/bzip2
 .endif
 
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
+
 USE_GCC295=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+LIBTOOLFLAGS=	# none
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--enable-shared --with-perl=${PERL5} \
-		--without-gslib --without-jp2
+		--without-gslib --without-hdf --without-jp2
 INSTALLS_SHLIB=	yes
 
 MAN1=		ImageMagick.1 Magick++-config.1 Magick-config.1 \
@@ -92,12 +96,6 @@
 PLIST_SUB+=	MODULES='@comment '
 .endif
 
-.if defined(WITH_HDF)
-CONFIGURE_ARGS+=	--with-hdf 
-.else
-CONFIGURE_ARGS+=	--without-hdf 
-.endif
-
 .if defined(WITHOUT_X11)
 PKGNAMESUFFIX+=	-nox11
 BUILD_DEPENDS+=	gs:${PORTSDIR}/print/ghostscript-gnu-nox11
@@ -105,7 +103,7 @@
 CONFIGURE_ARGS+=	--without-x --without-mpeg2 --without-wmf
 PLIST_SUB+=	X11='@comment '
 .else
-LIB_DEPENDS+=	mpeg2:${PORTSDIR}/graphics/libmpeg2 \
+LIB_DEPENDS+=	mpeg2.0:${PORTSDIR}/graphics/libmpeg2 \
 		wmf.2:${PORTSDIR}/graphics/libwmf
 BUILD_DEPENDS+=	gs:${PORTSDIR}/print/ghostscript-gnu
 RUN_DEPENDS+=	gs:${PORTSDIR}/print/ghostscript-gnu
@@ -126,7 +124,7 @@
 		s|INCLTDL=.*$$|INCLTDL=|g ; \
 		s|lcms/lcms.h|lcms.h|g ; \
 		s|lcms_lcms_h|lcms_h|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in" | ${XARGS} ${PERL} -pi -e \
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${PERL} -pi -e \
 		's|top_builddir\)/ltdl/libltdlc.la|LIBLTDL\)|g ; \
 		 s|pkgdocdir =.*$$|pkgdocdir = ${DOCSDIR}/|g ; \
 		 s| install-data-html||g'
diff -urN /usr/ports/graphics/ImageMagick/distinfo graphics/ImageMagick/distinfo
--- /usr/ports/graphics/ImageMagick/distinfo	Fri Mar 29 18:50:31 2002
+++ graphics/ImageMagick/distinfo	Thu May  2 21:33:00 2002
@@ -1 +1 @@
-MD5 (ImageMagick-5.4.4.tar.gz) = 2d9d956f04ebd0f091a12b9470d68b73
+MD5 (ImageMagick-5.4.4-5.tar.gz) = 210158dddeb73d26dec21220ef57ad7c
diff -urN /usr/ports/graphics/ImageMagick/files/patch-an graphics/ImageMagick/files/patch-an
--- /usr/ports/graphics/ImageMagick/files/patch-an	Thu Mar  7 19:25:46 2002
+++ graphics/ImageMagick/files/patch-an	Thu Jan  1 09:00:00 1970
@@ -1,10 +0,0 @@
---- ltmain.sh.orig	Tue Jan 29 22:40:33 2002
-+++ ltmain.sh	Mon Mar  4 18:18:00 2002
-@@ -1140,6 +1140,7 @@
- 	;;
- 
-       -avoid-version)
-+	build_old_libs=no
- 	avoid_version=yes
- 	continue
- 	;;
diff -urN /usr/ports/graphics/ImageMagick/files/patch-configure graphics/ImageMagick/files/patch-configure
--- /usr/ports/graphics/ImageMagick/files/patch-configure	Thu Jan  1 09:00:00 1970
+++ graphics/ImageMagick/files/patch-configure	Fri May  3 04:11:08 2002
@@ -0,0 +1,10 @@
+--- configure.orig	Sat Apr  6 04:06:38 2002
++++ configure	Fri May  3 04:10:56 2002
+@@ -14424,6 +14424,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: pat 
State-Changed-When: Thu May 2 15:24:30 PDT 2002 
State-Changed-Why:  
Committed, Thanks! 

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