svn commit: r393436 - in head/graphics: ImageMagick ImageMagick7

[Koop Mast]

Author: kwm
Date: Sun Aug  2 18:13:16 2015
New Revision: 393436
URL: https://svnweb.freebsd.org/changeset/ports/393436

Log:
  Add some more X11 / NOX11 checks around USES=ghostscript usage.
  
  While here apply the same checks to IM7.
  
  PR:		201993
  Submitted by:	daniel at blodan.se

Modified:
  head/graphics/ImageMagick/Makefile
  head/graphics/ImageMagick7/Makefile

Modified: head/graphics/ImageMagick/Makefile
==============================================================================
--- head/graphics/ImageMagick/Makefile	Sun Aug  2 18:03:05 2015	(r393435)
+++ head/graphics/ImageMagick/Makefile	Sun Aug  2 18:13:16 2015	(r393436)
@@ -357,7 +357,11 @@ PLIST_SUB+=		PANGO="@comment "
 
 # PDF (Adobe Portable Document Format) support
 .if ${PORT_OPTIONS:MPDF}
+. if ${PORT_OPTIONS:MX11}
 USES+=			ghostscript
+. else
+USES+=			ghostscript:nox11
+. endif
 .endif
 
 .if ! ${PORT_OPTIONS:MX11}
@@ -380,7 +384,11 @@ INSTALL_TARGET=	install-strip
 .endif
 
 .if ${PORT_OPTIONS:MTESTS}
+. if ${PORT_OPTIONS:MX11}
 USES+=		ghostscript:build
+. else
+USES+=		ghostscript:build,nox11
+. endif
 .endif
 
 post-patch:

Modified: head/graphics/ImageMagick7/Makefile
==============================================================================
--- head/graphics/ImageMagick7/Makefile	Sun Aug  2 18:03:05 2015	(r393435)
+++ head/graphics/ImageMagick7/Makefile	Sun Aug  2 18:13:16 2015	(r393436)
@@ -363,7 +363,11 @@ PLIST_SUB+=		PANGO="@comment "
 
 # PDF (Adobe Portable Document Format) support
 .if ${PORT_OPTIONS:MPDF}
+. if ${PORT_OPTIONS:MX11}
 USES+=		ghostscript
+. else
+USES+=		ghostscript:nox11
+. endif
 .endif
 
 .if ! ${PORT_OPTIONS:MX11}
@@ -386,7 +390,11 @@ INSTALL_TARGET=	install-strip
 .endif
 
 .if ${PORT_OPTIONS:MTESTS}
+. if ${PORT_OPTIONS:MX11}
 USES+=		ghostscript:build
+. else
+USES+=		ghostscript:build,nox11
+. endif
 .endif
 
 .if defined(USER) && ${USER} == kwm