net/scapy: Update to upstream release 2.3.3

Update to latest tagged release

Upstream moved to github so we can now track releases there:
https://github.com/secdev/scapy/releases/tag/v2.3.3

Add upstream matplotlib support

Reviewed by:    Sergey Kozlov <kozlov.sergey.404@gmail.com>
Approved by:    Maintainer Timeout (2 weeks)
Differential Revision:  https://reviews.freebsd.org/D13572

net/scapy/Makefile

@@ -1,17 +1,19 @@
 # Created by: vanhu <vanhu@netasq.com>
 # $FreeBSD$
 
-PORTNAME=	scapy
-PORTVERSION=	2.2.0
-PORTREVISION=	2
-CATEGORIES=	net
-MASTER_SITES=	http://secdev.org/projects/scapy/files/
+PORTNAME=		scapy
+PORTVERSION=		2.3.3
+DISTVERSIONPREFIX=	v
+CATEGORIES=		net
 
 MAINTAINER=	vanhu@FreeBSD.org
 COMMENT=	Powerful interactive packet manipulation program in python
 
 LICENSE=	GPLv2
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	secdev
+
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/dnet.so:net/py-libdnet@${FLAVOR} \
 		${PYTHON_SITELIBDIR}/pcap.py:net/py-pcap@${FLAVOR}
 
@@ -19,7 +21,7 @@ USES=		python:2.7
 USE_PYTHON=	autoplist distutils
 NO_ARCH=	yes
 
-OPTIONS_DEFINE=	PYX PYCRYPTO PYGNUPLOT GRAPH P0F_BASE QUESO_BASE NMAP MANUF
+OPTIONS_DEFINE=	PYX PYCRYPTO PYGNUPLOT GRAPH P0F_BASE QUESO_BASE NMAP MANUF MATPLOT
 PYX_DESC=	PostScript and PDF graphs drawing
 PYCRYPTO_DESC=	Use py-crypto for WEP decoding
 PYGNUPLOT_DESC=	Use py-gnuplot wrapper to plot graphs
@@ -28,6 +30,7 @@ P0F_BASE_DESC=	p0f OS signatures database
 QUESO_BASE_DESC=	queso OS signatures database
 NMAP_DESC=	nmap OS signatures database
 MANUF_DESC=	wireshark's MANUF MAC database
+MATPLOT_DESC=	Install python matplotlibs
 SOX_DESC=	Support for VoIP
 
 PYX_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pyx/__init__.py:graphics/py-PyX12@${FLAVOR}
@@ -39,6 +42,7 @@ P0F_BASE_RUN_DEPENDS=	${LOCALBASE}/etc/p0f.fp:net-mgmt/p0f
 QUESO_BASE_RUN_DEPENDS=	${LOCALBASE}/etc/queso.conf.sample:net/queso
 NMAP_RUN_DEPENDS=	${LOCALBASE}/share/nmap/nmap-os-db:security/nmap
 MANUF_RUN_DEPENDS=	${LOCALBASE}/share/wireshark/manuf:net/wireshark
+MATPLOT_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/matplotlib/__init__.py:math/py-matplotlib@${FLAVOR}
 SOX_RUN_DEPENDS=	${LOCALBASE}/bin/sox:audio/sox
 
 post-patch:

net/scapy/distinfo

@@ -1,2 +1,3 @@
-SHA256 (scapy-2.2.0.tar.gz) = c5363b224df0efbd78d7dc4d8a518e5518b2e7affc2e5f1fcecd4efa3ab815af
-SIZE (scapy-2.2.0.tar.gz) = 972996
+TIMESTAMP = 1513871305
+SHA256 (secdev-scapy-v2.3.3_GH0.tar.gz) = 67642cf7b806e02daeddd588577588caebddc3426db7904e7999a0b0334a63b5
+SIZE (secdev-scapy-v2.3.3_GH0.tar.gz) = 1459132

net/scapy/files/patch-scapy__arch__unix.py

@@ -1,32 +0,0 @@
---- ./scapy/arch/unix.py.orig	2010-08-10 23:09:40.000000000 +0000
-+++ ./scapy/arch/unix.py	2014-03-03 23:59:21.000000000 +0000
-@@ -38,6 +38,8 @@
-     ok = 0
-     mtu_present = False
-     prio_present = False
-+    refs_present = False
-+    use_present = False
-     routes = []
-     pending_if = []
-     for l in f.readlines():
-@@ -51,6 +53,8 @@
-                 ok = 1
-                 mtu_present = l.find("Mtu") >= 0
-                 prio_present = l.find("Prio") >= 0
-+                refs_present = l.find("Refs") >= 0
-+                use_present = l.find("Use") >= 0
-             continue
-         if not l:
-             break
-@@ -64,7 +68,10 @@
-         else:
-             rt = l.split()
-             dest,gw,flg = rt[:3]
--            netif = rt[5+mtu_present+prio_present]
-+            if scapy.arch.FREEBSD:
-+                netif = rt[3+refs_present+use_present+mtu_present]
-+            else:
-+                netif = rt[5+mtu_present+prio_present]
-         if flg.find("Lc") >= 0:
-             continue                
-         if dest == "default":

net/scapy/files/patch-setup.py

@@ -1,11 +0,0 @@
---- setup.py.orig	2011-02-28 05:11:55.000000000 +0300
-+++ setup.py	2011-03-01 13:11:36.000000000 +0300
-@@ -47,7 +47,7 @@
- setup(
-     name = 'scapy',
-     version = '2.2.0',
--    packages=['scapy','scapy/arch', 'scapy/arch/windows', 'scapy/layers','scapy/asn1','scapy/tools','scapy/modules', 'scapy/crypto'],
-+    packages=['scapy','scapy/arch', 'scapy/layers','scapy/asn1','scapy/tools','scapy/modules', 'scapy/crypto'],
-     scripts = SCRIPTS,
-     data_files = [('share/man/man1', ["doc/scapy.1.gz"])],
-