svn commit: r524261 - head/net/scapy

[Rene Ladan]

Author: rene
Date: Mon Jan 27 14:59:50 2020
New Revision: 524261
URL: https://svnweb.freebsd.org/changeset/ports/524261

Log:
  net/scapy: remove optional dependency on expired py-gnuplot

Modified:
  head/net/scapy/Makefile

Modified: head/net/scapy/Makefile
==============================================================================
--- head/net/scapy/Makefile	Mon Jan 27 14:00:11 2020	(r524260)
+++ head/net/scapy/Makefile	Mon Jan 27 14:59:50 2020	(r524261)
@@ -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:
 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