Something I wanted to do for a long time -- make this port

build without  X11 support,  for use  on X11-less  servers. Some
dependencies had to be turned off -- until those ports are fixed
to support the NO_X knob as well.

I   did   not   go   as   far   as   creating   a   slave   port
(ImageMagick-nox11).  (BTW, may  be we  want a  new category  --
no-x11 -- for  the slave ports of the stuff  that's available in
both -- x11 and nox11 -- flavors?)

Nothing should change  for the regular (non-NO_X)  case -- hence
PORTREVISION not touched.

3 files changed, 38 insertions, 17 deletions

diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 938a3a9edcb..3c2af59ed56 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -19,25 +19,31 @@ 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 \
 		df.1:${PORTSDIR}/graphics/hdf \
 		jbig.1:${PORTSDIR}/graphics/jbigkit \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		lcms.1:${PORTSDIR}/graphics/lcms \
-		wmf.1:${PORTSDIR}/graphics/libwmf \
 		png.4:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff \
 		freetype.6:${PORTSDIR}/print/freetype2 \
 		xml2.5:${PORTSDIR}/textproc/libxml2
-BUILD_DEPENDS=	gs:${PORTSDIR}/print/ghostscript55 \
-		mpeg2decode:${PORTSDIR}/graphics/mpeg2codec \
-		picttoppm:${PORTSDIR}/graphics/netpbm \
+BUILD_DEPENDS=	picttoppm:${PORTSDIR}/graphics/netpbm
+
+.ifndef NO_X
+BUILD_DEPENDS+=	mpeg2decode:${PORTSDIR}/graphics/mpeg2codec \
+		gs:${PORTSDIR}/print/ghostscript6 \
 		fig2dev:${PORTSDIR}/print/transfig
-RUN_DEPENDS=	${BUILD_DEPENDS}
+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_XLIB=	yes
 USE_LIBTOOL=	yes
 LIBTOOLFLAGS=	# empty
 USE_AUTOCONF=	yes
@@ -45,6 +51,14 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--enable-shared --with-modules \
 		--with-perl=${PERL5}
+
+.ifdef NO_X
+CONFIGURE_ARGS+=--without-x
+PLIST_SUB+=	X11='@comment '
+.else
+PLIST_SUB+=	X11=''
+.endif
+
 INSTALLS_SHLIB=	yes
 
 .if defined(PERL_THREADED) && ${PERL_THREADED} == "true"
@@ -64,12 +78,15 @@ CONFIGURE_ARGS+=	--enable-lzw
 .endif
 
 MAN1=		ImageMagick.1 Magick++-config.1 Magick-config.1 \
-		animate.1 combine.1 convert.1 display.1 identify.1 \
-		import.1 mogrify.1 montage.1
+		combine.1 convert.1 identify.1 mogrify.1 montage.1
 MAN3=		Image::Magick.3
 MAN4=		miff.4
 MAN5=		quantize.5
 
+.ifndef NO_X
+MAN1+=		animate.1 display.1 import.1
+.endif
+
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
 pre-patch:
diff --git a/graphics/ImageMagick/pkg-descr b/graphics/ImageMagick/pkg-descr
index 17399303b1e..56b70c7cb8e 100644
--- a/graphics/ImageMagick/pkg-descr
+++ b/graphics/ImageMagick/pkg-descr
@@ -1,7 +1,11 @@
-ImageMagick is an X11 package for display and interactive manipulation
-of images.  The package includes tools for image conversion,
-annotation, 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.).
+ImageMagick is  a package  for display  and interactive  manipulation of
+images.  The package  includes tools  for image  conversion, annotation,
+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.).
 
-WWW: http://www.imagemagick.org/
+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.
+
+WWW: http://www.ImageMagick.org/
diff --git a/graphics/ImageMagick/pkg-plist b/graphics/ImageMagick/pkg-plist
index 37dffbd089f..4b190de77c9 100644
--- a/graphics/ImageMagick/pkg-plist
+++ b/graphics/ImageMagick/pkg-plist
@@ -1,12 +1,12 @@
 bin/Magick++-config
 bin/Magick-config
-bin/animate
+%%X11%%bin/animate
 bin/cgimagick
 bin/combine
 bin/convert
-bin/display
+%%X11%%bin/display
 bin/identify
-bin/import
+%%X11%%bin/import
 bin/iptcutil
 bin/mogrify
 bin/montage