diff options
| author | kwm <kwm@FreeBSD.org> | 2016-08-10 20:08:05 +0800 |
|---|---|---|
| committer | kwm <kwm@FreeBSD.org> | 2016-08-10 20:08:05 +0800 |
| commit | af35e98dc344c56473ddb151136ef449042b36c6 (patch) | |
| tree | 08de51551114b887358bc3315d89c359b6402382 /graphics | |
| parent | 1e62202ace58614b0695e463b22c8dfe98325356 (diff) | |
| download | freebsd-ports-gnome-af35e98dc344c56473ddb151136ef449042b36c6.tar.gz freebsd-ports-gnome-af35e98dc344c56473ddb151136ef449042b36c6.tar.zst freebsd-ports-gnome-af35e98dc344c56473ddb151136ef449042b36c6.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@
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/ImageMagick-nox11/Makefile | 2 | ||||
| -rw-r--r-- | graphics/ImageMagick/Makefile | 3 | ||||
| -rw-r--r-- | graphics/ImageMagick7-nox11/Makefile | 2 | ||||
| -rw-r--r-- | graphics/ImageMagick7/Makefile | 5 |
4 files changed, 7 insertions, 5 deletions
diff --git a/graphics/ImageMagick-nox11/Makefile b/graphics/ImageMagick-nox11/Makefile index 62e3b72c0444..d5e43c88813e 100644 --- a/graphics/ImageMagick-nox11/Makefile +++ b/graphics/ImageMagick-nox11/Makefile @@ -1,6 +1,8 @@ # Created by: mm@FreeBSD.org # $FreeBSD$ +PORTREVISION= 1 + # the SVG and PANGO plugins need X11 OPTIONS_EXCLUDE= X11 SVG PANGO PORTSCOUT= ignore:1 diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile index dc3bf9722cfd..ffc03a191487 100644 --- a/graphics/ImageMagick/Makefile +++ b/graphics/ImageMagick/Makefile @@ -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 diff --git a/graphics/ImageMagick7-nox11/Makefile b/graphics/ImageMagick7-nox11/Makefile index f041763a5d7b..f72a8871208b 100644 --- a/graphics/ImageMagick7-nox11/Makefile +++ b/graphics/ImageMagick7-nox11/Makefile @@ -1,6 +1,8 @@ # Created by: mm@FreeBSD.org # $FreeBSD$ +PORTREVISION= 1 + # the SVG and PANGO plugins need X11 OPTIONS_EXCLUDE= X11 SVG PANGO PORTSCOUT= ignore:1 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 |