3 files changed, 35 insertions, 45 deletions

diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index fbd9c7ed003f..08381e658748 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -7,21 +7,21 @@
 
 PORTNAME=	ImageMagick
 PORTVERSION=	5.2.9
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	ftp://ftp.yggdrasil.com/mirrors/site/ftp.simplesystems.org/pub/ImageMagick/ \
-		ftp://ftp.cdrom.com/pub/ImageMagick/ \
+		ftp://gd.tuwien.ac.at/pub/graphics/ImageMagick/ \
+		ftp://ftp.sunet.se/pub/multimedia/graphics/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.simplesystems.org/pub/ImageMagick/ \
 		${MASTER_SITE_RINGSERVER}
 MASTER_SITE_SUBDIR=	graphics/ImageMagick
 
 MAINTAINER=	ports@FreeBSD.org
 
-RUN_DEPENDS=	${BUILD_DEPENDS}
 LIB_DEPENDS=	bz2.1:${PORTSDIR}/archivers/bzip2 \
-		ltdl.1:${PORTSDIR}/devel/libtool \
+		fpx.1:${PORTSDIR}/graphics/libfpx \
 		df.1:${PORTSDIR}/graphics/hdf \
 		jbig.1:${PORTSDIR}/graphics/jbigkit \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
@@ -30,44 +30,22 @@ LIB_DEPENDS=	bz2.1:${PORTSDIR}/archivers/bzip2 \
 		tiff.4:${PORTSDIR}/graphics/tiff \
 		freetype.6:${PORTSDIR}/print/freetype2 \
 		xml2.5:${PORTSDIR}/textproc/libxml2
-BUILD_DEPENDS=	picttoppm:${PORTSDIR}/graphics/netpbm
-
-.ifndef NO_X
-BUILD_DEPENDS+=	mpeg2decode:${PORTSDIR}/graphics/mpeg2codec \
-		gs:${PORTSDIR}/print/ghostscript6 \
-		fig2dev:${PORTSDIR}/print/transfig
-LIB_DEPENDS+=	wmf.1:${PORTSDIR}/graphics/libwmf
-USE_XLIB=	yes
-.else
-BUILD_DEPENDS+=	gs:${PORTSDIR}/print/ghostscript6-nox11
-PKGNAMESUFFIX=	-nox11
-.endif
 
 USE_PERL5=	yes
 USE_LIBTOOL=	yes
-LIBTOOLFLAGS=	# empty
 USE_AUTOCONF=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--enable-shared \
-		--with-perl=${PERL5}
-
-.ifdef WITH_MODULES
-CONFIGURE_ARGS+=--with-modules
-PLIST_SUB+=	MODULES=''
-.else
-PLIST_SUB+=	MODULES='@comment '
-.endif
-
-.ifdef NO_X
-CONFIGURE_ARGS+=--without-x
-PLIST_SUB+=	X11='@comment '
-.else
-PLIST_SUB+=	X11=''
-.endif
-
+CONFIGURE_ARGS=	--enable-shared --with-perl=${PERL5}
 INSTALLS_SHLIB=	yes
 
+MAN1=		ImageMagick.1 Magick++-config.1 Magick-config.1 \
+		combine.1 convert.1 identify.1 mogrify.1 montage.1
+MAN3=		Image::Magick.3
+MAN4=		miff.4
+MAN5=		quantize.5
+MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
+
 .if defined(PERL_THREADED) && ${PERL_THREADED} == "true"
 CONFIGURE_ARGS+=	--with-threads
 .else
@@ -84,18 +62,30 @@ CONFIGURE_ARGS+=	--disable-16bit-pixel
 CONFIGURE_ARGS+=	--enable-lzw
 .endif
 
-MAN1=		ImageMagick.1 Magick++-config.1 Magick-config.1 \
-		combine.1 convert.1 identify.1 mogrify.1 montage.1
-MAN3=		Image::Magick.3
-MAN4=		miff.4
-MAN5=		quantize.5
+.if defined(WITH_MODULES)
+LIB_DEPENDS+=	ltdl.1:${PORTSDIR}/devel/libtool
+LIBTOOLFLAGS=	# none
+CONFIGURE_ARGS+=	--with-modules
+PLIST_SUB+=	MODULES=''
+.else
+PLIST_SUB+=	MODULES='@comment '
+.endif
 
-.ifndef NO_X
+.if defined(NO_X)
+PKGNAMESUFFIX=	-nox11
+BUILD_DEPENDS+=	gs:${PORTSDIR}/print/ghostscript6-nox11
+RUN_DEPENDS+=	gs:${PORTSDIR}/print/ghostscript6-nox11
+CONFIGURE_ARGS+=	--without-x --without-wmf
+PLIST_SUB+=	X11='@comment '
+.else
+LIB_DEPENDS+=	wmf.1:${PORTSDIR}/graphics/libwmf
+BUILD_DEPENDS+=	gs:${PORTSDIR}/print/ghostscript6
+RUN_DEPENDS+=	gs:${PORTSDIR}/print/ghostscript6
+USE_XLIB=	yes
 MAN1+=		animate.1 display.1 import.1
+PLIST_SUB+=	X11=''
 .endif
 
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
-
 pre-patch:
 	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
 		's|\$$\(top_builddir\)/ltdl/libltdlc.la|\$$\(LIBLTDL\)|g'
diff --git a/graphics/ImageMagick/pkg-descr b/graphics/ImageMagick/pkg-descr
index 56b70c7cb8e8..d96b68d439cf 100644
--- a/graphics/ImageMagick/pkg-descr
+++ b/graphics/ImageMagick/pkg-descr
@@ -4,7 +4,7 @@ compositing, animation, and creating  montages. ImageMagick can read and
 write many of the more popular image formats (e.g. JPEG, TIFF, PNM, XPM,
 Photo CD, etc.).
 
-The package can  be built _without_ the  GUI (X11) support at  all -- it
+The package can be built _without_ the GUI (X11) support at all -- it
 will not have the display, import, and animate functionality, but remain
 extremely useful for image manipulation.
 
diff --git a/graphics/ImageMagick/pkg-plist b/graphics/ImageMagick/pkg-plist
index e2cfa268ab3e..2dfb051fee0e 100644
--- a/graphics/ImageMagick/pkg-plist
+++ b/graphics/ImageMagick/pkg-plist
@@ -211,11 +211,11 @@ lib/ImageMagick/delegates.mgk
 %%MODULES%%lib/ImageMagick/modules/coders/yuv.la
 %%MODULES%%lib/ImageMagick/modules/coders/yuv.so
 lib/libMagick++.a
-lib/libMagick++.la
+%%MODULES%%lib/libMagick++.la
 lib/libMagick++.so
 lib/libMagick++.so.5
 lib/libMagick.a
-lib/libMagick.la
+%%MODULES%%lib/libMagick.la
 lib/libMagick.so
 lib/libMagick.so.5
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Image/Magick.pm