Index: pkg-descr
===================================================================
--- pkg-descr	(revision 302509)
+++ pkg-descr	(working copy)
@@ -1,5 +1,5 @@
-This is a python extension module to enable python scripts to
-attach to sendmail's libmilter functionality.  Additional python
-modules provide for navigating and modifying MIME parts.
+This is a python extension module to enable python scripts to attach to
+sendmail's libmilter functionality. Additional python modules provide for
+navigating and modifying MIME parts, and sending DSNs or doing CBVs. 
 
 WWW: http://www.bmsi.com/python/milter.html
Index: distinfo
===================================================================
--- distinfo	(revision 302509)
+++ distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (python/milter-0.8.7.tar.gz) = 6ee85ef95533945045444b7d318b443adec74f3965e6297f58a7979ef25663b5
-SIZE (python/milter-0.8.7.tar.gz) = 180433
+SHA256 (python/pymilter-0.9.5.tar.gz) = 7bb478a4f9512e1dfe77c658f0410d62d9af91cedc35ee7aaaff6bc9a56d7f85
+SIZE (python/pymilter-0.9.5.tar.gz) = 117786
Index: files/patch-aa
===================================================================
--- files/patch-aa	(revision 302509)
+++ files/patch-aa	(working copy)
@@ -1,11 +0,0 @@
---- setup.py.orig	Sat Mar 25 18:28:34 2006
-+++ setup.py	Fri Dec  8 18:24:32 2006
-@@ -5,7 +5,7 @@
- # FIXME: on some versions of sendmail, smutil is renamed to sm
- # on slackware and debian, leave it out entirely.  It depends
- # on how libmilter was built by the sendmail package.
--libs = ["milter", "smutil"]
-+libs = ["milter"]
- 
- # patch distutils if it can't cope with the "classifiers" or
- # "download_url" keywords
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 302509)
+++ pkg-plist	(working copy)
@@ -1,18 +1,36 @@
 %%PYTHON_SITELIBDIR%%/Milter/__init__.py
 %%PYTHON_SITELIBDIR%%/Milter/__init__.pyc
 %%PYTHON_SITELIBDIR%%/Milter/__init__.pyo
+%%PYTHON_SITELIBDIR%%/Milter/cache.py
+%%PYTHON_SITELIBDIR%%/Milter/cache.pyc
+%%PYTHON_SITELIBDIR%%/Milter/cache.pyo
+%%PYTHON_SITELIBDIR%%/Milter/config.py
+%%PYTHON_SITELIBDIR%%/Milter/config.pyc
+%%PYTHON_SITELIBDIR%%/Milter/config.pyo
+%%PYTHON_SITELIBDIR%%/Milter/dns.py
+%%PYTHON_SITELIBDIR%%/Milter/dns.pyc
+%%PYTHON_SITELIBDIR%%/Milter/dns.pyo
 %%PYTHON_SITELIBDIR%%/Milter/dsn.py
 %%PYTHON_SITELIBDIR%%/Milter/dsn.pyc
 %%PYTHON_SITELIBDIR%%/Milter/dsn.pyo
 %%PYTHON_SITELIBDIR%%/Milter/dynip.py
 %%PYTHON_SITELIBDIR%%/Milter/dynip.pyc
 %%PYTHON_SITELIBDIR%%/Milter/dynip.pyo
-%%PYTHON_SITELIBDIR%%/Milter/faildsn.py
-%%PYTHON_SITELIBDIR%%/Milter/faildsn.pyc
-%%PYTHON_SITELIBDIR%%/Milter/faildsn.pyo
+%%PYTHON_SITELIBDIR%%/Milter/greylist.py
+%%PYTHON_SITELIBDIR%%/Milter/greylist.pyc
+%%PYTHON_SITELIBDIR%%/Milter/greylist.pyo
+%%PYTHON_SITELIBDIR%%/Milter/plock.py
+%%PYTHON_SITELIBDIR%%/Milter/plock.pyc
+%%PYTHON_SITELIBDIR%%/Milter/plock.pyo
+%%PYTHON_SITELIBDIR%%/Milter/pyip6.py
+%%PYTHON_SITELIBDIR%%/Milter/pyip6.pyc
+%%PYTHON_SITELIBDIR%%/Milter/pyip6.pyo
 %%PYTHON_SITELIBDIR%%/Milter/unsign.py
 %%PYTHON_SITELIBDIR%%/Milter/unsign.pyc
 %%PYTHON_SITELIBDIR%%/Milter/unsign.pyo
+%%PYTHON_SITELIBDIR%%/Milter/utils.py
+%%PYTHON_SITELIBDIR%%/Milter/utils.pyc
+%%PYTHON_SITELIBDIR%%/Milter/utils.pyo
 %%PYTHON_SITELIBDIR%%/milter.so
 %%PYTHON_SITELIBDIR%%/mime.py
 %%PYTHON_SITELIBDIR%%/mime.pyc
Index: Makefile
===================================================================
--- Makefile	(revision 302509)
+++ Makefile	(working copy)
@@ -6,23 +6,27 @@
 #
 
 PORTNAME=	milter
-PORTVERSION=	0.8.7
-PORTREVISION=	1
+PORTVERSION=	0.9.5
 CATEGORIES=	mail python
-MASTER_SITES=	SF/py${PORTNAME}/OldFiles \
-		http://www.bmsi.com/python/
-
+MASTER_SITES=	SOURCEFORGE
+MASTER_SITE_SUBDIR=	${PYPORTNAME}/${PYPORTNAME}/${DISTNAME}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=	${PYPORTNAME}-${PORTVERSION}
 
 MAINTAINER=	georg@graf.priv.at
-COMMENT=	Python interface to sendmail-8.1x milter API
+COMMENT=	Python interface to Sendmail milter API
 
+LICENSE=	GPLv2
+
 .if !exists(/usr/lib/libmilter.so)
-LIB_DEPENDS=	milter.2:${PORTSDIR}/mail/sendmail
+LIB_DEPENDS=	milter:${PORTSDIR}/mail/sendmail
 .endif
 
+PYPORTNAME=	${PKGNAMEPREFIX:C/[0-9]+-//}${PORTNAME}
+
 DIST_SUBDIR=	python
-USE_PYTHON=	2.5-2.9
-USE_PYDISTUTILS=yes
+USE_PYTHON=	2.6-2.9
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_PKGNAME=	${PYPORTNAME}
 
 .include <bsd.port.mk>