5 files changed, 11 insertions, 54 deletions

diff --git a/mail/py-turbomail/Makefile b/mail/py-turbomail/Makefile
index becd2e1c9627..fed1cfd642cd 100644
--- a/mail/py-turbomail/Makefile
+++ b/mail/py-turbomail/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	turbomail
-PORTVERSION=	2.0.3
-PORTREVISION=	1
+PORTVERSION=	2.1
+#PORTREVISION=	0
 CATEGORIES=	mail www python
-MASTER_SITES=	http://cheeseshop.python.org/packages/source/T/TurboMail/ \
+MASTER_SITES=	CHEESESHOP \
 		http://nivi.interfree.it/distfiles/${PORTNAME}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	TurboMail-${PORTVERSION}
@@ -17,23 +17,13 @@ DISTNAME=	TurboMail-${PORTVERSION}
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Multi-threaded mail queue manager for TurboGears applications
 
-BUILD_DEPENDS=	${EASY_INSTALL_CMD}:${PORTSDIR}/devel/py-setuptools \
-		tg-admin:${PORTSDIR}/www/py-turbogears
+BUILD_DEPENDS=	tg-admin:${PORTSDIR}/www/py-turbogears
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-PLIST_FILES=	${PYTHON_SITELIBDIR:S|${PREFIX}/||}/${PYTURBOMAIL_EGG}
-
-SUB_FILES=	pkg-deinstall pkg-install
-SUB_LIST=	PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR} \
-		EASY_INSTALL_CMD=${EASY_INSTALL_CMD} \
-		EGG_VER="${PORTNAME}==${PORTVERSION}"
+PLIST_FILES=	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
 
 USE_PYTHON=	2.4+
-USE_PYDISTUTILS=	yes
+USE_PYDISTUTILS=	easy_install
 PYDISTUTILS_PKGNAME=	TurboMail
-PYDISTUTILS_NOEGGINFO=	yes # XXX convert easy_install support to bsd.python.mk's
-
-EASY_INSTALL_CMD?=	easy_install-${PYTHON_VER}
-PYTURBOMAIL_EGG=	TurboMail-${PORTVERSION}-py${PYTHON_VER}.egg
 
 .include <bsd.port.mk>
diff --git a/mail/py-turbomail/distinfo b/mail/py-turbomail/distinfo
index 57a80f53f1e8..4100b3016259 100644
--- a/mail/py-turbomail/distinfo
+++ b/mail/py-turbomail/distinfo
@@ -1,3 +1,3 @@
-MD5 (TurboMail-2.0.3.tar.gz) = a4474e3767c83d9a1c14134673fe1a57
-SHA256 (TurboMail-2.0.3.tar.gz) = ca7103ac2aa5a7fbddd8fb6c95f1e633b22e138bc1ad831100112e46391912e9
-SIZE (TurboMail-2.0.3.tar.gz) = 14025
+MD5 (TurboMail-2.1.tar.gz) = 36087c074e7943e8a352ef6cdd3dc04f
+SHA256 (TurboMail-2.1.tar.gz) = d649811ce060b3260652210fb6816a5c50a56c29d1a3ebaccd66da2a43354b41
+SIZE (TurboMail-2.1.tar.gz) = 21680
diff --git a/mail/py-turbomail/files/pkg-deinstall.in b/mail/py-turbomail/files/pkg-deinstall.in
deleted file mode 100644
index 18ccffddbb1e..000000000000
--- a/mail/py-turbomail/files/pkg-deinstall.in
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-PKGNAME=$1
-#
-case $2 in
-    DEINSTALL)
-	%%EASY_INSTALL_CMD%% -q -m -S %%PYTHON_SITELIBDIR%% %%EGG_VER%%
-	;;
-    POST-DEINSTALL)
-	exit 0
-	;;
-    *)
-	echo "Unexpected Argument $2!!!"
-	exit 1
-	;;
-esac
-exit 0
diff --git a/mail/py-turbomail/files/pkg-install.in b/mail/py-turbomail/files/pkg-install.in
deleted file mode 100644
index f361d3b6c356..000000000000
--- a/mail/py-turbomail/files/pkg-install.in
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-PKGNAME=$1
-#
-case $2 in
-    POST-INSTALL)
-	%%EASY_INSTALL_CMD%% -q -S %%PYTHON_SITELIBDIR%% %%EGG_VER%%
-	;;
-    PRE-INSTALL)
-	;;
-    *)
-	echo "Unexpected Argument $2!!!"
-	exit 1
-	;;
-esac
-exit 0
diff --git a/mail/py-turbomail/pkg-descr b/mail/py-turbomail/pkg-descr
index 20dbe3a0cec7..e740e8c6190e 100644
--- a/mail/py-turbomail/pkg-descr
+++ b/mail/py-turbomail/pkg-descr
@@ -7,5 +7,5 @@ MIME e-mail creation, but greatly simplifies these tasks by performing
 the grunt-work for you. Additionally, TurboMail is multi-threaded,
 allowing for single or batch enqueueing and background delivery of mail.
 
-Author: Top Floor Computer Systems Ltd.
-WWW:	http://trac.orianagroup.com/turbomail/
+Author: Alice Dawn Bevan-McGregor
+WWW:	http://www.python-turbomail.org/