Update to 2.0.1. Changes are too numerous since 1.0.5 and there is no normal

changelog except log in upstream repository.

Most notably (at least for me) it adds an IPv6 support.

9 files changed, 333 insertions, 45 deletions

diff --git a/net/scapy/Makefile b/net/scapy/Makefile
index f156bcf94f4..fcd918e66b9 100644
--- a/net/scapy/Makefile
+++ b/net/scapy/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2009/02/09 22:56:26 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2009/06/09 12:30:02 hasso Exp $
 #
 
-DISTNAME=		scapy-1.0.5
-PKGREVISION=		1
+DISTNAME=		scapy-2.0.1
 CATEGORIES=		net
 MASTER_SITES=		http://www.secdev.org/projects/scapy/files/
 
@@ -10,9 +9,11 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.secdev.org/projects/scapy/
 COMMENT=		Interactive packet manipulation program
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+PYDISTUTILSPKG=			yes
 NO_BUILD=			yes
-PYTHON_VERSIONS_ACCEPTED=	25 24
-PYTHON_PATCH_SCRIPTS=		scapy.py
+PYTHON_VERSIONS_ACCEPTED=	26 25
 
 .include "options.mk"
 
@@ -21,20 +22,20 @@ CONF_FILES=	${PREFIX}/share/examples/scapy/ethertypes \
 
 SUBST_CLASSES+=		config
 SUBST_STAGE.config=	post-patch
-SUBST_FILES.config=	scapy.py
+SUBST_FILES.config=	scapy/data.py
 SUBST_SED.config=	-e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g"
 SUBST_MESSAGE.config=	Fixing paths.
 
 post-extract:
 	${CP} ${FILESDIR}/ethertypes ${WRKSRC}
 
-do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/scapy
-	${INSTALL_DATA} ${WRKSRC}/ethertypes ${PREFIX}/share/examples/scapy/
-	${INSTALL_SCRIPT} ${WRKSRC}/scapy.py ${PREFIX}/bin/scapy
-	${INSTALL_MAN} ${WRKSRC}/scapy.1 ${PREFIX}/${PKGMANDIR}/man1
+post-install:
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/scapy
+	${INSTALL_DATA} ${WRKSRC}/ethertypes ${DESTDIR}${PREFIX}/share/examples/scapy/
+
 
 .include "../../lang/python/application.mk"
+.include "../../lang/python/extension.mk"
 .include "../../net/py-libpcap/buildlink3.mk"
 .include "../../net/py-libdnet/buildlink3.mk"
 .include "../../devel/py-readline/buildlink3.mk"
diff --git a/net/scapy/PLIST b/net/scapy/PLIST
index ef65f6e9700..4db14b998c8 100644
--- a/net/scapy/PLIST
+++ b/net/scapy/PLIST
@@ -1,5 +1,234 @@
-@comment $NetBSD: PLIST,v 1.2 2007/01/03 15:02:51 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/06/09 12:30:02 hasso Exp $
 bin/scapy
+bin/UTscapy
+${PYSITELIB}/scapy/__init__.py
+${PYSITELIB}/scapy/__init__.pyc
+${PYSITELIB}/scapy/__init__.pyo
+${PYSITELIB}/scapy/all.py
+${PYSITELIB}/scapy/all.pyc
+${PYSITELIB}/scapy/all.pyo
+${PYSITELIB}/scapy/ansmachine.py
+${PYSITELIB}/scapy/ansmachine.pyc
+${PYSITELIB}/scapy/ansmachine.pyo
+${PYSITELIB}/scapy/arch/__init__.py
+${PYSITELIB}/scapy/arch/__init__.pyc
+${PYSITELIB}/scapy/arch/__init__.pyo
+${PYSITELIB}/scapy/arch/bsd.py
+${PYSITELIB}/scapy/arch/bsd.pyc
+${PYSITELIB}/scapy/arch/bsd.pyo
+${PYSITELIB}/scapy/arch/linux.py
+${PYSITELIB}/scapy/arch/linux.pyc
+${PYSITELIB}/scapy/arch/linux.pyo
+${PYSITELIB}/scapy/arch/pcapdnet.py
+${PYSITELIB}/scapy/arch/pcapdnet.pyc
+${PYSITELIB}/scapy/arch/pcapdnet.pyo
+${PYSITELIB}/scapy/arch/solaris.py
+${PYSITELIB}/scapy/arch/solaris.pyc
+${PYSITELIB}/scapy/arch/solaris.pyo
+${PYSITELIB}/scapy/arch/unix.py
+${PYSITELIB}/scapy/arch/unix.pyc
+${PYSITELIB}/scapy/arch/unix.pyo
+${PYSITELIB}/scapy/as_resolvers.py
+${PYSITELIB}/scapy/as_resolvers.pyc
+${PYSITELIB}/scapy/as_resolvers.pyo
+${PYSITELIB}/scapy/asn1/__init__.py
+${PYSITELIB}/scapy/asn1/__init__.pyc
+${PYSITELIB}/scapy/asn1/__init__.pyo
+${PYSITELIB}/scapy/asn1/asn1.py
+${PYSITELIB}/scapy/asn1/asn1.pyc
+${PYSITELIB}/scapy/asn1/asn1.pyo
+${PYSITELIB}/scapy/asn1/ber.py
+${PYSITELIB}/scapy/asn1/ber.pyc
+${PYSITELIB}/scapy/asn1/ber.pyo
+${PYSITELIB}/scapy/asn1/mib.py
+${PYSITELIB}/scapy/asn1/mib.pyc
+${PYSITELIB}/scapy/asn1/mib.pyo
+${PYSITELIB}/scapy/asn1fields.py
+${PYSITELIB}/scapy/asn1fields.pyc
+${PYSITELIB}/scapy/asn1fields.pyo
+${PYSITELIB}/scapy/asn1packet.py
+${PYSITELIB}/scapy/asn1packet.pyc
+${PYSITELIB}/scapy/asn1packet.pyo
+${PYSITELIB}/scapy/automaton.py
+${PYSITELIB}/scapy/automaton.pyc
+${PYSITELIB}/scapy/automaton.pyo
+${PYSITELIB}/scapy/autorun.py
+${PYSITELIB}/scapy/autorun.pyc
+${PYSITELIB}/scapy/autorun.pyo
+${PYSITELIB}/scapy/base_classes.py
+${PYSITELIB}/scapy/base_classes.pyc
+${PYSITELIB}/scapy/base_classes.pyo
+${PYSITELIB}/scapy/config.py
+${PYSITELIB}/scapy/config.pyc
+${PYSITELIB}/scapy/config.pyo
+${PYSITELIB}/scapy/dadict.py
+${PYSITELIB}/scapy/dadict.pyc
+${PYSITELIB}/scapy/dadict.pyo
+${PYSITELIB}/scapy/data.py
+${PYSITELIB}/scapy/data.pyc
+${PYSITELIB}/scapy/data.pyo
+${PYSITELIB}/scapy/error.py
+${PYSITELIB}/scapy/error.pyc
+${PYSITELIB}/scapy/error.pyo
+${PYSITELIB}/scapy/fields.py
+${PYSITELIB}/scapy/fields.pyc
+${PYSITELIB}/scapy/fields.pyo
+${PYSITELIB}/scapy/layers/__init__.py
+${PYSITELIB}/scapy/layers/__init__.pyc
+${PYSITELIB}/scapy/layers/__init__.pyo
+${PYSITELIB}/scapy/layers/all.py
+${PYSITELIB}/scapy/layers/all.pyc
+${PYSITELIB}/scapy/layers/all.pyo
+${PYSITELIB}/scapy/layers/bluetooth.py
+${PYSITELIB}/scapy/layers/bluetooth.pyc
+${PYSITELIB}/scapy/layers/bluetooth.pyo
+${PYSITELIB}/scapy/layers/dhcp.py
+${PYSITELIB}/scapy/layers/dhcp.pyc
+${PYSITELIB}/scapy/layers/dhcp.pyo
+${PYSITELIB}/scapy/layers/dhcp6.py
+${PYSITELIB}/scapy/layers/dhcp6.pyc
+${PYSITELIB}/scapy/layers/dhcp6.pyo
+${PYSITELIB}/scapy/layers/dns.py
+${PYSITELIB}/scapy/layers/dns.pyc
+${PYSITELIB}/scapy/layers/dns.pyo
+${PYSITELIB}/scapy/layers/dot11.py
+${PYSITELIB}/scapy/layers/dot11.pyc
+${PYSITELIB}/scapy/layers/dot11.pyo
+${PYSITELIB}/scapy/layers/gprs.py
+${PYSITELIB}/scapy/layers/gprs.pyc
+${PYSITELIB}/scapy/layers/gprs.pyo
+${PYSITELIB}/scapy/layers/hsrp.py
+${PYSITELIB}/scapy/layers/hsrp.pyc
+${PYSITELIB}/scapy/layers/hsrp.pyo
+${PYSITELIB}/scapy/layers/inet.py
+${PYSITELIB}/scapy/layers/inet.pyc
+${PYSITELIB}/scapy/layers/inet.pyo
+${PYSITELIB}/scapy/layers/inet6.py
+${PYSITELIB}/scapy/layers/inet6.pyc
+${PYSITELIB}/scapy/layers/inet6.pyo
+${PYSITELIB}/scapy/layers/ir.py
+${PYSITELIB}/scapy/layers/ir.pyc
+${PYSITELIB}/scapy/layers/ir.pyo
+${PYSITELIB}/scapy/layers/isakmp.py
+${PYSITELIB}/scapy/layers/isakmp.pyc
+${PYSITELIB}/scapy/layers/isakmp.pyo
+${PYSITELIB}/scapy/layers/l2.py
+${PYSITELIB}/scapy/layers/l2.pyc
+${PYSITELIB}/scapy/layers/l2.pyo
+${PYSITELIB}/scapy/layers/l2tp.py
+${PYSITELIB}/scapy/layers/l2tp.pyc
+${PYSITELIB}/scapy/layers/l2tp.pyo
+${PYSITELIB}/scapy/layers/llmnr.py
+${PYSITELIB}/scapy/layers/llmnr.pyc
+${PYSITELIB}/scapy/layers/llmnr.pyo
+${PYSITELIB}/scapy/layers/mgcp.py
+${PYSITELIB}/scapy/layers/mgcp.pyc
+${PYSITELIB}/scapy/layers/mgcp.pyo
+${PYSITELIB}/scapy/layers/mobileip.py
+${PYSITELIB}/scapy/layers/mobileip.pyc
+${PYSITELIB}/scapy/layers/mobileip.pyo
+${PYSITELIB}/scapy/layers/netbios.py
+${PYSITELIB}/scapy/layers/netbios.pyc
+${PYSITELIB}/scapy/layers/netbios.pyo
+${PYSITELIB}/scapy/layers/netflow.py
+${PYSITELIB}/scapy/layers/netflow.pyc
+${PYSITELIB}/scapy/layers/netflow.pyo
+${PYSITELIB}/scapy/layers/ntp.py
+${PYSITELIB}/scapy/layers/ntp.pyc
+${PYSITELIB}/scapy/layers/ntp.pyo
+${PYSITELIB}/scapy/layers/pflog.py
+${PYSITELIB}/scapy/layers/pflog.pyc
+${PYSITELIB}/scapy/layers/pflog.pyo
+${PYSITELIB}/scapy/layers/ppp.py
+${PYSITELIB}/scapy/layers/ppp.pyc
+${PYSITELIB}/scapy/layers/ppp.pyo
+${PYSITELIB}/scapy/layers/radius.py
+${PYSITELIB}/scapy/layers/radius.pyc
+${PYSITELIB}/scapy/layers/radius.pyo
+${PYSITELIB}/scapy/layers/rip.py
+${PYSITELIB}/scapy/layers/rip.pyc
+${PYSITELIB}/scapy/layers/rip.pyo
+${PYSITELIB}/scapy/layers/rtp.py
+${PYSITELIB}/scapy/layers/rtp.pyc
+${PYSITELIB}/scapy/layers/rtp.pyo
+${PYSITELIB}/scapy/layers/sebek.py
+${PYSITELIB}/scapy/layers/sebek.pyc
+${PYSITELIB}/scapy/layers/sebek.pyo
+${PYSITELIB}/scapy/layers/skinny.py
+${PYSITELIB}/scapy/layers/skinny.pyc
+${PYSITELIB}/scapy/layers/skinny.pyo
+${PYSITELIB}/scapy/layers/smb.py
+${PYSITELIB}/scapy/layers/smb.pyc
+${PYSITELIB}/scapy/layers/smb.pyo
+${PYSITELIB}/scapy/layers/snmp.py
+${PYSITELIB}/scapy/layers/snmp.pyc
+${PYSITELIB}/scapy/layers/snmp.pyo
+${PYSITELIB}/scapy/layers/tftp.py
+${PYSITELIB}/scapy/layers/tftp.pyc
+${PYSITELIB}/scapy/layers/tftp.pyo
+${PYSITELIB}/scapy/layers/x509.py
+${PYSITELIB}/scapy/layers/x509.pyc
+${PYSITELIB}/scapy/layers/x509.pyo
+${PYSITELIB}/scapy/main.py
+${PYSITELIB}/scapy/main.pyc
+${PYSITELIB}/scapy/main.pyo
+${PYSITELIB}/scapy/modules/__init__.py
+${PYSITELIB}/scapy/modules/__init__.pyc
+${PYSITELIB}/scapy/modules/__init__.pyo
+${PYSITELIB}/scapy/modules/geoip.py
+${PYSITELIB}/scapy/modules/geoip.pyc
+${PYSITELIB}/scapy/modules/geoip.pyo
+${PYSITELIB}/scapy/modules/nmap.py
+${PYSITELIB}/scapy/modules/nmap.pyc
+${PYSITELIB}/scapy/modules/nmap.pyo
+${PYSITELIB}/scapy/modules/p0f.py
+${PYSITELIB}/scapy/modules/p0f.pyc
+${PYSITELIB}/scapy/modules/p0f.pyo
+${PYSITELIB}/scapy/modules/queso.py
+${PYSITELIB}/scapy/modules/queso.pyc
+${PYSITELIB}/scapy/modules/queso.pyo
+${PYSITELIB}/scapy/modules/voip.py
+${PYSITELIB}/scapy/modules/voip.pyc
+${PYSITELIB}/scapy/modules/voip.pyo
+${PYSITELIB}/scapy/packet.py
+${PYSITELIB}/scapy/packet.pyc
+${PYSITELIB}/scapy/packet.pyo
+${PYSITELIB}/scapy/plist.py
+${PYSITELIB}/scapy/plist.pyc
+${PYSITELIB}/scapy/plist.pyo
+${PYSITELIB}/scapy/route.py
+${PYSITELIB}/scapy/route.pyc
+${PYSITELIB}/scapy/route.pyo
+${PYSITELIB}/scapy/route6.py
+${PYSITELIB}/scapy/route6.pyc
+${PYSITELIB}/scapy/route6.pyo
+${PYSITELIB}/scapy/sendrecv.py
+${PYSITELIB}/scapy/sendrecv.pyc
+${PYSITELIB}/scapy/sendrecv.pyo
+${PYSITELIB}/scapy/supersocket.py
+${PYSITELIB}/scapy/supersocket.pyc
+${PYSITELIB}/scapy/supersocket.pyo
+${PYSITELIB}/scapy/themes.py
+${PYSITELIB}/scapy/themes.pyc
+${PYSITELIB}/scapy/themes.pyo
+${PYSITELIB}/scapy/tools/UTscapy.py
+${PYSITELIB}/scapy/tools/UTscapy.pyc
+${PYSITELIB}/scapy/tools/UTscapy.pyo
+${PYSITELIB}/scapy/tools/__init__.py
+${PYSITELIB}/scapy/tools/__init__.pyc
+${PYSITELIB}/scapy/tools/__init__.pyo
+${PYSITELIB}/scapy/tools/check_asdis.py
+${PYSITELIB}/scapy/tools/check_asdis.pyc
+${PYSITELIB}/scapy/tools/check_asdis.pyo
+${PYSITELIB}/scapy/utils.py
+${PYSITELIB}/scapy/utils.pyc
+${PYSITELIB}/scapy/utils.pyo
+${PYSITELIB}/scapy/utils6.py
+${PYSITELIB}/scapy/utils6.pyc
+${PYSITELIB}/scapy/utils6.pyo
+${PYSITELIB}/scapy/volatile.py
+${PYSITELIB}/scapy/volatile.pyc
+${PYSITELIB}/scapy/volatile.pyo
 man/man1/scapy.1
 share/examples/scapy/ethertypes
 @dirrm share/examples/scapy
diff --git a/net/scapy/distinfo b/net/scapy/distinfo
index 189ef629b81..e08f49221d2 100644
--- a/net/scapy/distinfo
+++ b/net/scapy/distinfo
@@ -1,6 +1,11 @@
-$NetBSD: distinfo,v 1.2 2007/01/03 15:02:51 adrianp Exp $
+$NetBSD: distinfo,v 1.3 2009/06/09 12:30:02 hasso Exp $
 
-SHA1 (scapy-1.0.5.tar.gz) = 58ab1ef469d48a84fe987a3a91d6e40a59bb687d
-RMD160 (scapy-1.0.5.tar.gz) = 33bbc31385ca098b1361d8233f17222fa460836f
-Size (scapy-1.0.5.tar.gz) = 144746 bytes
-SHA1 (patch-aa) = 0f8acd2bd009c3bde32ce4a412023ed291995193
+SHA1 (scapy-2.0.1.tar.gz) = fceb4e60fbea0f2ce8ed258957a5eca1baa05ac5
+RMD160 (scapy-2.0.1.tar.gz) = a4af2137458ad4ffa573ed81303506fdceefbc95
+Size (scapy-2.0.1.tar.gz) = 864953 bytes
+SHA1 (patch-aa) = e907b1c766ba6a64f954233feec0fdeb769c94c1
+SHA1 (patch-ab) = 3d32f4e010180ebe9f9309877c1822f53c247151
+SHA1 (patch-ac) = 1c0634074839c32caa1a58c5a36fcc0d53c3f29a
+SHA1 (patch-ad) = 58df904f26ea1af8b5c31892c267fe97394f809b
+SHA1 (patch-ae) = b680833e3925f7c076e12998cb051e6dac7e9375
+SHA1 (patch-af) = 030753df92458de9e51d690695527ebeb1e55fde
diff --git a/net/scapy/patches/patch-aa b/net/scapy/patches/patch-aa
index 25b513de440..4f4da6dc573 100644
--- a/net/scapy/patches/patch-aa
+++ b/net/scapy/patches/patch-aa
@@ -1,32 +1,21 @@
-$NetBSD: patch-aa,v 1.2 2007/01/03 15:02:51 adrianp Exp $
+$NetBSD: patch-aa,v 1.3 2009/06/09 12:30:02 hasso Exp $
 
---- scapy.py.orig	2006-10-19 16:58:09.000000000 +0100
-+++ scapy.py
-@@ -1829,6 +1829,7 @@ except ImportError:
- LINUX=sys.platform.startswith("linux")
- OPENBSD=sys.platform.startswith("openbsd")
- FREEBSD=sys.platform.startswith("freebsd")
-+NETBSD=sys.platform.startswith("netbsd")
+--- scapy/arch/__init__.py.orig	2009-06-09 13:03:00 +0300
++++ scapy/arch/__init__.py	2009-06-09 13:03:50 +0300
+@@ -45,6 +45,7 @@ FREEBSD=sys.platform.startswith("freebsd
+ NETBSD = sys.platform.startswith("netbsd")
  DARWIN=sys.platform.startswith("darwin")
- BIG_ENDIAN= struct.pack("H",1) == "\x00\x01"
- X86_64 = (os.uname()[4] == 'x86_64')
-@@ -2006,7 +2007,7 @@ except IOError:
+ SOLARIS=sys.platform.startswith("sunos")
++DRAGONFLY=sys.platform.startswith("dragonfly")
  
- ETHER_TYPES={}
- try:
--    f=open("/etc/ethertypes")
-+    f=open("@PKG_SYSCONFDIR@/ethertypes")
-     for l in f:
-         try:
-             if l[0] in ["#","\n"]:
-@@ -2446,8 +2447,8 @@ if PCAP:
-     def get_working_if():
-         try:
-             return pcap.lookupdev()
--        except pcap.pcapc.EXCEPTION:
--            return 'lo'
-+        except:
-+            return 'lo0'
+ X86_64 = (os.uname()[4] == 'x86_64')
  
-     def attach_filter(s, filter):
-         warning("attach_filter() should not be called in PCAP mode")
+@@ -66,7 +67,7 @@ if LINUX:
+     from linux import *
+     if scapy.config.conf.use_pcap or scapy.config.conf.use_dnet:
+         from pcapdnet import *
+-elif OPENBSD or FREEBSD or NETBSD or DARWIN:
++elif OPENBSD or FREEBSD or NETBSD or DARWIN or DRAGONFLY:
+     from bsd import *
+ elif SOLARIS:
+     from solaris import *
diff --git a/net/scapy/patches/patch-ab b/net/scapy/patches/patch-ab
new file mode 100644
index 00000000000..c2936f7c572
--- /dev/null
+++ b/net/scapy/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2009/06/09 12:30:02 hasso Exp $
+
+--- scapy/arch/unix.py.orig	2009-02-01 22:30:20 +0200
++++ scapy/arch/unix.py	2009-06-09 14:33:21 +0300
+@@ -160,7 +160,7 @@ def read_routes6():
+             lspl = l.split()
+             d,nh,fl = lspl[:3]
+             dev = lspl[5+mtu_present+prio_present]
+-        else:       # FREEBSD or DARWIN 
++        else:       # FREEBSD or DARWIN or DRAGONFLY
+             d,nh,fl,dev = l.split()[:4]
+         if filter(lambda x: x[2] == dev, lifaddr) == []:
+             continue
diff --git a/net/scapy/patches/patch-ac b/net/scapy/patches/patch-ac
new file mode 100644
index 00000000000..015472c4fd9
--- /dev/null
+++ b/net/scapy/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2009/06/09 12:30:02 hasso Exp $
+
+--- scapy/sendrecv.py.orig	2009-06-09 13:06:15 +0300
++++ scapy/sendrecv.py	2009-06-09 13:06:31 +0300
+@@ -116,7 +116,7 @@ def sndrcv(pks, pkt, timeout = 2, inter 
+                                 if remaintime <= 0:
+                                     break
+                             r = None
+-                            if FREEBSD or DARWIN:
++                            if FREEBSD or DARWIN or DRAGONFLY:
+                                 inp, out, err = select(inmask,[],[], 0.05)
+                                 if len(inp) == 0 or pks in inp:
+                                     r = pks.nonblock_recv()
diff --git a/net/scapy/patches/patch-ad b/net/scapy/patches/patch-ad
new file mode 100644
index 00000000000..b18a2f40608
--- /dev/null
+++ b/net/scapy/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2009/06/09 12:30:02 hasso Exp $
+
+--- scapy/data.py.orig	2009-06-09 13:13:15 +0300
++++ scapy/data.py	2009-06-09 13:13:57 +0300
+@@ -97,7 +97,7 @@ def load_ethertypes(filename):
+         pass
+     return dct
+ 
+-ETHER_TYPES=load_ethertypes("/etc/ethertypes")
++ETHER_TYPES=load_ethertypes("@PKG_SYSCONFDIR@/ethertypes")
+ 
+ def load_services(filename):
+     spaces = re.compile("[ \t]+|\n")
diff --git a/net/scapy/patches/patch-ae b/net/scapy/patches/patch-ae
new file mode 100644
index 00000000000..419ab3b29ec
--- /dev/null
+++ b/net/scapy/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2009/06/09 12:30:02 hasso Exp $
+
+--- setup.py.orig	2009-02-09 14:41:39 +0200
++++ setup.py	2009-06-09 14:33:59 +0300
+@@ -40,7 +40,7 @@ setup(
+     version = '2.0.1', 
+     packages=['scapy','scapy/arch', 'scapy/layers','scapy/asn1','scapy/tools','scapy/modules'],
+     scripts = ['bin/scapy','bin/UTscapy'],
+-    data_files = [('share/man/man1', ["doc/scapy.1.gz"])],
++    data_files = [('man/man1', ["doc/scapy.1.gz"])],
+ 
+     # Metadata
+     author = 'Philippe BIONDI',
diff --git a/net/scapy/patches/patch-af b/net/scapy/patches/patch-af
new file mode 100644
index 00000000000..3333cce655d
--- /dev/null
+++ b/net/scapy/patches/patch-af
@@ -0,0 +1,12 @@
+$NetBSD: patch-af,v 1.1 2009/06/09 12:30:02 hasso Exp $
+
+--- test/run_tests.orig	2009-06-09 14:35:51 +0300
++++ test/run_tests	2009-06-09 14:36:08 +0300
+@@ -1,6 +1,6 @@
+ #! /bin/sh
+ DIR=$(dirname $0)/..
+-if [ "$*" == "" ]
++if [ "$*" = "" ]
+ then
+ PYTHONPATH=$DIR exec python ${DIR}/scapy/tools/UTscapy.py -t regression.uts -f html -o /tmp/scapy_regression_test_$(date +%Y%M%d-%H%H%S).html
+ else