From df3e062a9d0494a8654940a5c866061cf6bc14fc Mon Sep 17 00:00:00 2001 From: Koop Mast Date: Sun, 2 Aug 2015 18:13:16 +0000 Subject: [PATCH] Add some more X11 / NOX11 checks around USES=ghostscript usage. While here apply the same checks to IM7. PR: 201993 Submitted by: daniel@blodan.se --- graphics/ImageMagick/Makefile | 8 ++++++++ graphics/ImageMagick7/Makefile | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile index c1249d9592b0..574a6ed7c26e 100644 --- a/graphics/ImageMagick/Makefile +++ b/graphics/ImageMagick/Makefile @@ -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: diff --git a/graphics/ImageMagick7/Makefile b/graphics/ImageMagick7/Makefile index 28665a644bec..c5f330c87a30 100644 --- a/graphics/ImageMagick7/Makefile +++ b/graphics/ImageMagick7/Makefile @@ -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