diff options
| author | Koop Mast <kwm@FreeBSD.org> | 2016-08-10 12:08:05 +0000 |
|---|---|---|
| committer | Koop Mast <kwm@FreeBSD.org> | 2016-08-10 12:08:05 +0000 |
| commit | c1b43977c85a179a0547909d13f71f583e682e4b (patch) | |
| tree | 08de51551114b887358bc3315d89c359b6402382 /graphics/ImageMagick7 | |
| parent | 83e0bfa0e99985684d0ff77726724f7708b7a166 (diff) | |
| download | ports-c1b43977c85a179a0547909d13f71f583e682e4b.tar.gz ports-c1b43977c85a179a0547909d13f71f583e682e4b.zip | |
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@in-addr.com)
Pointy hat to: kwm@
Notes
Notes:
svn path=/head/; revision=420009
Diffstat (limited to 'graphics/ImageMagick7')
| -rw-r--r-- | graphics/ImageMagick7/Makefile | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/graphics/ImageMagick7/Makefile b/graphics/ImageMagick7/Makefile index c4b4395f40ab..80c37517ca88 100644 --- a/graphics/ImageMagick7/Makefile +++ b/graphics/ImageMagick7/Makefile @@ -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 |