aboutsummaryrefslogtreecommitdiffstats
path: root/www
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 /www
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 'www')
-rw-r--r--www/gallery3/Makefile4
-rw-r--r--www/webinject/Makefile4
2 files changed, 4 insertions, 4 deletions
diff --git a/www/gallery3/Makefile b/www/gallery3/Makefile
index 259221c17e55..6d3234b6bd7b 100644
--- a/www/gallery3/Makefile
+++ b/www/gallery3/Makefile
@@ -23,7 +23,7 @@ NO_BUILD= yes
SUB_FILES= pkg-message
OPTIONS_DEFINE= DCRAW FFMPEG GD GRAPHMAGICK IMAGEMAGICK JHEAD \
- NETPBM NLS UNZIP
+ NETPBM NLS UNZIP X11
OPTIONS_DEFAULT= IMAGEMAGICK JHEAD UNZIP
.include <bsd.port.options.mk>
@@ -51,7 +51,7 @@ RUN_DEPENDS+= gm:${PORTSDIR}/graphics/GraphicsMagick
.endif
.if ${PORT_OPTIONS:MIMAGEMAGICK}
-.if !defined(WITHOUT_X11)
+.if ${PORT_OPTIONS:MX11}
RUN_DEPENDS+= convert:${PORTSDIR}/graphics/ImageMagick
.else
RUN_DEPENDS+= convert:${PORTSDIR}/graphics/ImageMagick-nox11
diff --git a/www/webinject/Makefile b/www/webinject/Makefile
index ba4b2883b148..50367ee85e35 100644
--- a/www/webinject/Makefile
+++ b/www/webinject/Makefile
@@ -16,10 +16,10 @@ RUN_DEPENDS= p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \
p5-Crypt-SSLeay>=0:${PORTSDIR}/security/p5-Crypt-SSLeay
-.if !defined(WITHOUT_X11)
+#.if !defined(WITHOUT_X11)
# some work to do here
#RUN_DEPENDS+= p5-Tk>=0:${PORTSDIR}/x11-toolkits/p5-Tk
-.endif
+#.endif
USES= perl5 shebangfix
SHEBANG_FILES= webinject.pl