4 files changed, 11 insertions, 66 deletions

diff --git a/devel/py-freebsd/Makefile b/devel/py-freebsd/Makefile
index a6d8ea5c3a2f..859a3b92fbbd 100644
--- a/devel/py-freebsd/Makefile
+++ b/devel/py-freebsd/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	freebsd
-PORTVERSION=	0.2
-PORTREVISION=	1
+PORTVERSION=	0.9.1
 CATEGORIES=	devel python
-MASTER_SITES=	${MASTER_SITE_LOCAL}
+MASTER_SITES=	${MASTER_SITE_LOCAL} \
+		http://people.freebsd.org/~perky/distfiles/
 MASTER_SITE_SUBDIR=	perky
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	py-freebsd-${PORTVERSION}
@@ -17,8 +17,12 @@ DISTNAME=	py-freebsd-${PORTVERSION}
 MAINTAINER=	perky@FreeBSD.org
 COMMENT=	Python interface to FreeBSD-specific system libraries
 
-PLIST_FILES=	lib/%%PYTHON_VERSION%%/site-packages/freebsd.so
-USE_PYTHON=	yes
+USE_PYTHON=	2.3+
 USE_PYDISTUTILS=	yes
 
+PLIST_FILES=	%%PYTHON_SITELIBDIR%%/freebsd.so \
+		%%PYTHON_SITELIBDIR%%/freebsd_compat02.py \
+		%%PYTHON_SITELIBDIR%%/freebsd_compat02.pyc \
+		%%PYTHON_SITELIBDIR%%/freebsd_compat02.pyo
+
 .include <bsd.port.mk>
diff --git a/devel/py-freebsd/distinfo b/devel/py-freebsd/distinfo
index 97be4056ffd0..15a8cb09d91b 100644
--- a/devel/py-freebsd/distinfo
+++ b/devel/py-freebsd/distinfo
@@ -1,2 +1,2 @@
-MD5 (py-freebsd-0.2.tar.gz) = 42c7476f8a809eb0bd9602c385b8e18b
-SIZE (py-freebsd-0.2.tar.gz) = 13695
+MD5 (py-freebsd-0.9.1.tar.gz) = b440b67d6c701d82cd868347c138b00b
+SIZE (py-freebsd-0.9.1.tar.gz) = 26752
diff --git a/devel/py-freebsd/files/patch-src::netstat.c b/devel/py-freebsd/files/patch-src::netstat.c
deleted file mode 100644
index b28ec112bdd7..000000000000
--- a/devel/py-freebsd/files/patch-src::netstat.c
+++ /dev/null
@@ -1,48 +0,0 @@
---- src/netstat.c.orig	Sun Dec  5 10:58:17 2004
-+++ src/netstat.c	Sun Dec  5 10:55:25 2004
-@@ -71,7 +71,7 @@
-     size_t len = sizeof ipstat; 
-     PyObject *r, *t;
- 
--    if (sysctlbyname("net.inet.ip.stats", &ipstat, &len, NULL, NULL) < 0) {
-+    if (sysctlbyname("net.inet.ip.stats", &ipstat, &len, NULL, 0) < 0) {
-         PyErr_SetFromErrno(PyExc_OSError);
-         return Py_None;
-     }
-@@ -114,7 +114,7 @@
-     size_t len = sizeof tcpstat; 
-     PyObject *r, *t;
- 
--    if (sysctlbyname("net.inet.tcp.stats", &tcpstat, &len, NULL, NULL) < 0) {
-+    if (sysctlbyname("net.inet.tcp.stats", &tcpstat, &len, NULL, 0) < 0) {
-         PyErr_SetFromErrno(PyExc_OSError);
-         return Py_None;
-     }
-@@ -166,7 +166,7 @@
-     size_t len = sizeof udpstat; 
-     PyObject *r, *t;
- 
--    if (sysctlbyname("net.inet.udp.stats", &udpstat, &len, NULL, NULL) < 0) {
-+    if (sysctlbyname("net.inet.udp.stats", &udpstat, &len, NULL, 0) < 0) {
-         PyErr_SetFromErrno(PyExc_OSError);
-         return Py_None;
-     }
-@@ -218,7 +218,7 @@
-     PyObject *r, *d, *t;
- 
-     len = sizeof value;
--    if (sysctlbyname("net.link.generic.system.ifcount", &value, &len, NULL, NULL) < 0) {
-+    if (sysctlbyname("net.link.generic.system.ifcount", &value, &len, NULL, 0) < 0) {
-         PyErr_SetFromErrno(PyExc_OSError);
-         return Py_None;
-     }
-@@ -263,8 +263,7 @@
-         p_long(ibytes);     p_long(obytes);
-         p_long(imcasts);    p_long(omcasts);
-         p_long(iqdrops);    p_long(noproto);
--        p_long(hwassist);   p_long(unused);
--#undef p, p_long, p_str, p_int
-+#undef p
- 
-         PyDict_SetItemString(r, ifmd.ifmd_name, d);
-         Py_DECREF(d);
diff --git a/devel/py-freebsd/files/patch-src::statfs.c b/devel/py-freebsd/files/patch-src::statfs.c
deleted file mode 100644
index de8a9b6dee69..000000000000
--- a/devel/py-freebsd/files/patch-src::statfs.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/statfs.c.orig   Sat Dec 11 07:04:56 2004
-+++ src/statfs.c        Sat Dec 11 07:05:34 2004
-@@ -30,6 +30,8 @@
- CONST_INT (MNT_DEFEXPORTED)
- CONST_INT (MNT_EXPORTANON)
- CONST_INT (MNT_EXKERB)
-+CONST_INT (MNT_WAIT)
-+CONST_INT (MNT_NOWAIT)
- 
- 
- /*