svn commit: r420009 - in head/graphics: ImageMagick ImageMagick-nox11 ImageMagick7 ImageMagick7-nox11

[Koop Mast]

Author: kwm
Date: Wed Aug 10 12:08:05 2016
New Revision: 420009
URL: https://svnweb.freebsd.org/changeset/ports/420009

Log:
  Don't add X libraries to the nox11 ports [1]
  
  While here fix USE_GNOME in the SVG case to add to the USE_GNOME macro
  and not overwrite it.
  
  PR:		211721 [1]
  Reported by:	Gary (freebsd-bugzilla at in-addr.com)
  Pointy hat to:	kwm@

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

Modified: head/graphics/ImageMagick-nox11/Makefile
==============================================================================
--- head/graphics/ImageMagick-nox11/Makefile	Wed Aug 10 11:24:21 2016	(r420008)
+++ head/graphics/ImageMagick-nox11/Makefile	Wed Aug 10 12:08:05 2016	(r420009)
@@ -1,6 +1,8 @@
 # Created by: mm at FreeBSD.org
 # $FreeBSD$
 
+PORTREVISION=	1
+
 # the SVG and PANGO plugins need X11
 OPTIONS_EXCLUDE=	X11 SVG PANGO
 PORTSCOUT=	ignore:1

Modified: head/graphics/ImageMagick/Makefile
==============================================================================
--- head/graphics/ImageMagick/Makefile	Wed Aug 10 11:24:21 2016	(r420008)
+++ head/graphics/ImageMagick/Makefile	Wed Aug 10 12:08:05 2016	(r420009)
@@ -51,7 +51,6 @@ CONFIGURE_ENV=	MAKE=${MAKE_CMD}
 CONFIGURE_ARGS=	--without-dps
 USE_LDCONFIG=	yes
 USE_GNOME=	glib20 libxml2
-USE_XORG=	sm ice x11
 
 SAMPLE_FILES=	coder.xml colors.xml delegates.xml log.xml magic.xml mime.xml \
 		policy.xml quantization-table.xml thresholds.xml type-apple.xml \
@@ -372,7 +371,7 @@ PKGNAMESUFFIX=		-nox11
 CONFLICTS_INSTALL+=	ImageMagick-nox11-6*
 CONFLICTS+=		display-[0-9]*
 CONFIGURE_ARGS+=	--with-x
-USE_XORG+=		xext xt
+USE_XORG=		sm ice x11 xext xt
 PLIST_SUB+=		X11=''
 .endif
 

Modified: head/graphics/ImageMagick7-nox11/Makefile
==============================================================================
--- head/graphics/ImageMagick7-nox11/Makefile	Wed Aug 10 11:24:21 2016	(r420008)
+++ head/graphics/ImageMagick7-nox11/Makefile	Wed Aug 10 12:08:05 2016	(r420009)
@@ -1,6 +1,8 @@
 # Created by: mm at FreeBSD.org
 # $FreeBSD$
 
+PORTREVISION=	1
+
 # the SVG and PANGO plugins need X11
 OPTIONS_EXCLUDE=	X11 SVG PANGO
 PORTSCOUT=	ignore:1

Modified: head/graphics/ImageMagick7/Makefile
==============================================================================
--- head/graphics/ImageMagick7/Makefile	Wed Aug 10 11:24:21 2016	(r420008)
+++ head/graphics/ImageMagick7/Makefile	Wed Aug 10 12:08:05 2016	(r420009)
@@ -49,7 +49,6 @@ CONFIGURE_ENV=	MAKE=${MAKE_CMD}
 CONFIGURE_ARGS=	--without-dps
 USE_LDCONFIG=	yes
 USE_GNOME=	glib20 libxml2
-USE_XORG=	sm ice x11
 
 SAMPLE_FILES=	coder.xml colors.xml delegates.xml log.xml magic.xml mime.xml \
 		policy.xml quantization-table.xml thresholds.xml \
@@ -338,7 +337,7 @@ PLIST_SUB+=		WMF="@comment "
 # SVG (Scalable Vector Graphics) requires both libxml2 and X11
 .if ${PORT_OPTIONS:MSVG} && ${PORT_OPTIONS:MX11}
 LIB_DEPENDS+=		librsvg-2.so:graphics/librsvg2
-USE_GNOME=		cairo gdkpixbuf2
+USE_GNOME+=		cairo gdkpixbuf2
 CONFIGURE_ARGS+=	--with-rsvg
 .else
 CONFIGURE_ARGS+=	--without-rsvg
@@ -371,7 +370,7 @@ PKGNAMESUFFIX=		7-nox11
 CONFLICTS+=		ImageMagick7-nox11-*
 CONFLICTS+=		display-[0-9]*
 CONFIGURE_ARGS+=	--with-x
-USE_XORG+=		xext xt
+USE_XORG=		sm ice x11 xext xt
 PLIST_SUB+=		X11=''
 .endif