aboutsummaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
authoradamw <adamw@FreeBSD.org>2014-07-22 01:47:52 +0800
committeradamw <adamw@FreeBSD.org>2014-07-22 01:47:52 +0800
commit28c2b31d4d537f1f53d05e0668e1397b696c4f1a (patch)
tree319127a7ac77536c193069aa90ed4b279facdd72 /graphics
parentb0a544010f844d1eaa5068532d30d80f00e8854e (diff)
downloadfreebsd-ports-gnome-28c2b31d4d537f1f53d05e0668e1397b696c4f1a.tar.gz
freebsd-ports-gnome-28c2b31d4d537f1f53d05e0668e1397b696c4f1a.tar.zst
freebsd-ports-gnome-28c2b31d4d537f1f53d05e0668e1397b696c4f1a.zip
Remove some instances of WITHOUT_X11 and use an X11 OPTION
instead.
Diffstat (limited to 'graphics')
-rw-r--r--graphics/pecl-imagick/Makefile9
-rw-r--r--graphics/stamp/Makefile6
2 files changed, 7 insertions, 8 deletions
diff --git a/graphics/pecl-imagick/Makefile b/graphics/pecl-imagick/Makefile
index 8c67ef8ba883..418b3e00cc6a 100644
--- a/graphics/pecl-imagick/Makefile
+++ b/graphics/pecl-imagick/Makefile
@@ -15,11 +15,10 @@ COMMENT= Provides a wrapper to the ImageMagick/GraphicsMagick library
LICENSE= PHP301
-.if !defined(WITHOUT_X11)
-LIB_DEPENDS= libMagickWand-6.Q*.so:${PORTSDIR}/graphics/ImageMagick
-.else
-LIB_DEPENDS= libMagickWand-6.Q*.so:${PORTSDIR}/graphics/ImageMagick-nox11
-.endif
+OPTIONS_DEFINE= X11
+
+X11_LIB_DEPENDS= libMagickWand-6.Q*.so:${PORTSDIR}/graphics/ImageMagick
+X11_LIB_DEPENDS_OFF= libMagickWand-6.Q*.so:${PORTSDIR}/graphics/ImageMagick-nox11
USES= pkgconfig
USE_PHP= yes
diff --git a/graphics/stamp/Makefile b/graphics/stamp/Makefile
index 8bf11976e380..bd6c6276ffda 100644
--- a/graphics/stamp/Makefile
+++ b/graphics/stamp/Makefile
@@ -15,9 +15,9 @@ LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LIBS+= -L${LOCALBASE}/lib
-.if !defined(WITHOUT_X11)
-USE_GNOME= gtk12
-.endif
+
+OPTIONS_DEFINE= X11
+X11_USE= GNOME=gtk12
post-patch:
@${REINPLACE_CMD} -e 's#/usr/local/share/stamp#${DATADIR}#' \