4 files changed, 31 insertions, 26 deletions

diff --git a/net/py-dpkt/Makefile b/net/py-dpkt/Makefile
index 03803bdbd5cd..968bdcd6199c 100644
--- a/net/py-dpkt/Makefile
+++ b/net/py-dpkt/Makefile
@@ -6,17 +6,24 @@
 #
 
 PORTNAME=	dpkt
-PORTVERSION=	1.6
-PORTREVISION=	1
+PORTVERSION=	1.7
 CATEGORIES=	net python
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sbrabez@gmail.com
 COMMENT=	Python fast, simple packet creation / parsing module
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 USE_PYTHON_PREFIX=	yes
 
+EXAMPLESDIR=	${PREFIX}/share/examples/py-${PORTNAME}
+
+.if !defined(NOPORTEXAMPLES)
+post-install:
+	@${MKDIR} ${EXAMPLESDIR}
+	@(cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${EXAMPLESDIR})
+.endif
+
 .include <bsd.port.mk>
diff --git a/net/py-dpkt/distinfo b/net/py-dpkt/distinfo
index 207d3e776054..d8a0a57f9358 100644
--- a/net/py-dpkt/distinfo
+++ b/net/py-dpkt/distinfo
@@ -1,3 +1,3 @@
-MD5 (dpkt-1.6.tar.gz) = 5e8b48868dd2ad283089fd82ed41c408
-SHA256 (dpkt-1.6.tar.gz) = 65493079b94e945ef1bf05ef2986ce61a13058776f8430d509c2e6ead06e0ec5
-SIZE (dpkt-1.6.tar.gz) = 116518
+MD5 (dpkt-1.7.tar.gz) = 0baa25fd5d87066cf6189a66cf452ac0
+SHA256 (dpkt-1.7.tar.gz) = 185277cd37ce1d65a95d7a8b8652bf33725645ea7ca0086baf3fe643506abe72
+SIZE (dpkt-1.7.tar.gz) = 66396
diff --git a/net/py-dpkt/files/patch-dpkt.py b/net/py-dpkt/files/patch-dpkt.py
deleted file mode 100644
index e9b0f819f4d2..000000000000
--- a/net/py-dpkt/files/patch-dpkt.py
+++ /dev/null
@@ -1,20 +0,0 @@
---- dpkt/bgp.py.orig	2006-10-01 08:41:30.000000000 +0200
-+++ dpkt/bgp.py	2009-06-06 18:04:02.000000000 +0200
-@@ -675,7 +675,7 @@
-             self.failUnless(a.len == 12)
-             self.failUnless(len(a.communities.list) == 3)
-             c = a.communities.list[0]
--            self.failUnless(c.as == 65215)
-+            self.failUnless(c._as == 65215)
-             self.failUnless(c.value == 1)
-             r = b2.update.announced[0]
-             self.failUnless(r.len == 22)
-@@ -712,7 +712,7 @@
-             b4 = BGP(self.bgp4)
-             self.failUnless(b4.len == 45)
-             self.failUnless(b4.type == OPEN)
--            self.failUnless(b4.open.as == 237)
-+            self.failUnless(b4.open._as == 237)
-             self.failUnless(b4.open.param_len == 16)
-             self.failUnless(len(b4.open.parameters) == 3)
-             p = b4.open.parameters[0]
diff --git a/net/py-dpkt/pkg-plist b/net/py-dpkt/pkg-plist
index 87ce4cec1435..e166bcadac05 100644
--- a/net/py-dpkt/pkg-plist
+++ b/net/py-dpkt/pkg-plist
@@ -1,3 +1,4 @@
+@comment $FreeBSD$
 %%PYTHON_SITELIBDIR%%/dpkt/__init__.py
 %%PYTHON_SITELIBDIR%%/dpkt/__init__.pyc
 %%PYTHON_SITELIBDIR%%/dpkt/__init__.pyo
@@ -64,6 +65,9 @@
 %%PYTHON_SITELIBDIR%%/dpkt/icmp6.py
 %%PYTHON_SITELIBDIR%%/dpkt/icmp6.pyc
 %%PYTHON_SITELIBDIR%%/dpkt/icmp6.pyo
+%%PYTHON_SITELIBDIR%%/dpkt/ieee80211.py
+%%PYTHON_SITELIBDIR%%/dpkt/ieee80211.pyc
+%%PYTHON_SITELIBDIR%%/dpkt/ieee80211.pyo
 %%PYTHON_SITELIBDIR%%/dpkt/igmp.py
 %%PYTHON_SITELIBDIR%%/dpkt/igmp.pyc
 %%PYTHON_SITELIBDIR%%/dpkt/igmp.pyo
@@ -112,9 +116,15 @@
 %%PYTHON_SITELIBDIR%%/dpkt/qq.py
 %%PYTHON_SITELIBDIR%%/dpkt/qq.pyc
 %%PYTHON_SITELIBDIR%%/dpkt/qq.pyo
+%%PYTHON_SITELIBDIR%%/dpkt/radiotap.py
+%%PYTHON_SITELIBDIR%%/dpkt/radiotap.pyc
+%%PYTHON_SITELIBDIR%%/dpkt/radiotap.pyo
 %%PYTHON_SITELIBDIR%%/dpkt/radius.py
 %%PYTHON_SITELIBDIR%%/dpkt/radius.pyc
 %%PYTHON_SITELIBDIR%%/dpkt/radius.pyo
+%%PYTHON_SITELIBDIR%%/dpkt/rfb.py
+%%PYTHON_SITELIBDIR%%/dpkt/rfb.pyc
+%%PYTHON_SITELIBDIR%%/dpkt/rfb.pyo
 %%PYTHON_SITELIBDIR%%/dpkt/rip.py
 %%PYTHON_SITELIBDIR%%/dpkt/rip.pyc
 %%PYTHON_SITELIBDIR%%/dpkt/rip.pyo
@@ -124,6 +134,9 @@
 %%PYTHON_SITELIBDIR%%/dpkt/rtp.py
 %%PYTHON_SITELIBDIR%%/dpkt/rtp.pyc
 %%PYTHON_SITELIBDIR%%/dpkt/rtp.pyo
+%%PYTHON_SITELIBDIR%%/dpkt/rx.py
+%%PYTHON_SITELIBDIR%%/dpkt/rx.pyc
+%%PYTHON_SITELIBDIR%%/dpkt/rx.pyo
 %%PYTHON_SITELIBDIR%%/dpkt/sccp.py
 %%PYTHON_SITELIBDIR%%/dpkt/sccp.pyc
 %%PYTHON_SITELIBDIR%%/dpkt/sccp.pyo
@@ -173,3 +186,8 @@
 %%PYTHON_SITELIBDIR%%/dpkt/yahoo.pyc
 %%PYTHON_SITELIBDIR%%/dpkt/yahoo.pyo
 @dirrm %%PYTHON_SITELIBDIR%%/dpkt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dhcprequest.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dnsping.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/nbtping.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ping.py
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%