ports/130783: [PATCH] mail/py-turbomail: update to 2.1

[Nicola Vitale]

>Number:         130783
>Category:       ports
>Synopsis:       [PATCH] mail/py-turbomail: update to 2.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jan 20 16:30:00 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Nicola Vitale
>Release:        FreeBSD 7.1-STABLE
>Organization:
>Environment:
FreeBSD scutigera.domo.sva 7.1-STABLE FreeBSD 7.1-STABLE #0: Mon Jan  5 17:18:47 CET 2009     stan at scutigera.domo.sva:/usr/obj/usr/src/sys/SCUTIGERA  i386

>Description:
- Update to 2.1
- Convert easy_install support to <bsd.python.mk>
- Remove files/pkg-install.in and files/pkg-deinstall.in
- Update WWW url in pkg-descr
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN py-turbomail/Makefile py-turbomail-2.1/Makefile
--- py-turbomail/Makefile	2008-12-29 10:11:30.000000000 +0100
+++ py-turbomail-2.1/Makefile	2009-01-20 15:26:44.000000000 +0100
@@ -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 @@
 MAINTAINER=	python at 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 -ruN py-turbomail/distinfo py-turbomail-2.1/distinfo
--- py-turbomail/distinfo	2007-02-17 15:15:41.000000000 +0100
+++ py-turbomail-2.1/distinfo	2009-01-20 14:57:29.000000000 +0100
@@ -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 -ruN py-turbomail/files/pkg-deinstall.in py-turbomail-2.1/files/pkg-deinstall.in
--- py-turbomail/files/pkg-deinstall.in	2007-02-17 15:15:41.000000000 +0100
+++ py-turbomail-2.1/files/pkg-deinstall.in	1970-01-01 01:00:00.000000000 +0100
@@ -1,17 +0,0 @@
-#!/bin/sh
-# $FreeBSD: ports/mail/py-turbomail/files/pkg-deinstall.in,v 1.1 2007/02/17 14:15:41 nivit Exp $
-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 -ruN py-turbomail/files/pkg-install.in py-turbomail-2.1/files/pkg-install.in
--- py-turbomail/files/pkg-install.in	2007-02-17 15:15:41.000000000 +0100
+++ py-turbomail-2.1/files/pkg-install.in	1970-01-01 01:00:00.000000000 +0100
@@ -1,16 +0,0 @@
-#!/bin/sh
-# $FreeBSD: ports/mail/py-turbomail/files/pkg-install.in,v 1.1 2007/02/17 14:15:41 nivit Exp $
-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 -ruN py-turbomail/pkg-descr py-turbomail-2.1/pkg-descr
--- py-turbomail/pkg-descr	2007-02-17 15:15:41.000000000 +0100
+++ py-turbomail-2.1/pkg-descr	2009-01-20 15:56:11.000000000 +0100
@@ -7,5 +7,5 @@
 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/


>Release-Note:
>Audit-Trail:
>Unformatted: