summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRene Ladan <rene@FreeBSD.org>2020-01-27 14:59:50 +0000
committerRene Ladan <rene@FreeBSD.org>2020-01-27 14:59:50 +0000
commit885bcbc3e1ac55733bfabaf222c1b5197ef600c0 (patch)
treed5e13cdcfc7a2e37e637c3857cd56358f58e251f
parentUpdate to 2.0.54. (diff)
net/scapy: remove optional dependency on expired py-gnuplot
Notes
Notes: svn path=/head/; revision=524261
-rw-r--r--net/scapy/Makefile11
1 files changed, 2 insertions, 9 deletions
diff --git a/net/scapy/Makefile b/net/scapy/Makefile
index e440ba097f19..45fca1e17878 100644
--- a/net/scapy/Makefile
+++ b/net/scapy/Makefile
@@ -21,7 +21,7 @@ USE_PYTHON= autoplist concurrent distutils
NO_ARCH= yes
-OPTIONS_DEFINE= GRAPH IPYTHON P0F_BASE MANUF MATPLOT NMAP PYCRYPTO PYGNUPLOT PYX QUESO_BASE SOX
+OPTIONS_DEFINE= GRAPH IPYTHON P0F_BASE MANUF MATPLOT NMAP PYCRYPTO PYX QUESO_BASE SOX
GRAPH_DESC= graph generation and visualization
IPYTHON_DESC= Use IPython (enhanced interactive shell)
MANUF_DESC= wireshark's MANUF MAC database
@@ -29,7 +29,6 @@ MATPLOT_DESC= Install python matplotlibs
NMAP_DESC= nmap OS signatures database
P0F_BASE_DESC= p0f OS signatures database
PYCRYPTO_DESC= Use py-crypto for WEP decoding
-PYGNUPLOT_DESC= Use py-gnuplot wrapper to plot graphs
PYX_DESC= PostScript and PDF graphs drawing
QUESO_BASE_DESC=queso OS signatures database
SOX_DESC= Support for VoIP
@@ -41,19 +40,13 @@ MANUF_RUN_DEPENDS= ${LOCALBASE}/share/wireshark/manuf:net/wireshark
MATPLOT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR}
P0F_BASE_RUN_DEPENDS= ${LOCALBASE}/etc/p0f.fp:net-mgmt/p0f
PYCRYPTO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${PY_FLAVOR}
-PYGNUPLOT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gnuplot>0:math/py-gnuplot@${PY_FLAVOR}
PYX_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}PyX>0:graphics/py-PyX@${PY_FLAVOR}
QUESO_BASE_RUN_DEPENDS= ${LOCALBASE}/etc/queso.conf.sample:net/queso
SOX_RUN_DEPENDS= ${LOCALBASE}/bin/sox:audio/sox
-PYX_PREVENTS= PYGNUPLOT
-PYX_PREVENTS_MSG= PyX requires Python 3.4+ and py-gnuplot requires 2.7.
-
.include <bsd.port.options.mk>
-.if ${PORT_OPTIONS:MPYGNUPLOT}
-USES+= python:2.7
-.elif ${PORT_OPTIONS:MPYX}
+.if ${PORT_OPTIONS:MPYX}
USES+= python:3.4+
.else
USES+= python