Update to 2.59. From the changelog:

- Total rewrite of email code that should fix encoding problems

- Added configurable timeout for nonresponsive feeds

- Fixed incorrectly using text summary_detail instead of html content

- Fixed bug with deleting feed 0 if no default email was set

- Print name of feed that is being deleted

- Finally added oft-requested support for enclosures. Any enclosures,
    such as a podcast MP3, will be listed under the entry URL

- Made feed timeout compatible with Python versions 2.2 and higher,
    instead of v2.4 only

- Added optional, configurable CSS styling to HTML mail. Set
    USE_CSS_STYLING=1 in your config.py to enable this. If you want
    to tweak the look, modify STYLE_SHEET.

- Improved empty feed checking

- Improved invalid feed messages

- Unfortunately, rss2email is no longer compatible with Python v2.1.
    Two of the most serious lingering issues with rss2email were
    waiting forever for non-responsive feeds and its inablility to
    properly handle feeds with international characters. To properly
    fix these once and for all, rss2email now depends on functionality
    that was not available until Python v2.2. Hopefully this does
    not unduly inconvenience anyone that has not yet upgraded to a
    more current version of Python.

4 files changed, 27 insertions, 38 deletions

diff --git a/mail/rss2email/Makefile b/mail/rss2email/Makefile
index 6b7da8ba055..ef783732126 100644
--- a/mail/rss2email/Makefile
+++ b/mail/rss2email/Makefile
@@ -1,26 +1,22 @@
-# $NetBSD: Makefile,v 1.12 2006/04/09 17:01:55 schmonz Exp $
+# $NetBSD: Makefile,v 1.13 2006/07/01 19:32:40 schmonz Exp $
 #
 
-DISTNAME=		rss2email-${RVER}
+DISTNAME=		rss2email-2.59
 CATEGORIES=		mail
 MASTER_SITES=		${HOMEPAGE}
 EXTRACT_SUFX=		.py
-DISTFILES=		r2e-${SVER}.sh ${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=		schmonz@NetBSD.org
-HOMEPAGE=		http://www.aaronsw.com/2002/rss2email/
+HOMEPAGE=		http://rss2email.infogami.com/
 COMMENT=		Get RSS feeds emailed to you
 
 DEPENDS+=		${PYPKGPREFIX}-feedparser-[0-9]*:../../textproc/py-feedparser
 DEPENDS+=		${PYPKGPREFIX}-html2text-[0-9]*:../../textproc/py-html2text
 
-SVER=			2.0
-RVER=			2.57
-
-DIST_SUBDIR=		${PKGNAME_NOREV}
-
+WRKSRC=			${WRKDIR}
 NO_BUILD=		yes
 PYTHON_PATCH_SCRIPTS=	*.py
+PYTHON_VERSIONS_ACCEPTED?=	24 23 22
 
 SUBST_CLASSES+=		bin
 SUBST_STAGE.bin=	do-configure
@@ -35,10 +31,7 @@ INSTALLATION_DIRS=	bin man/man1
 
 do-extract:
 	${_PKG_SILENT}${_PKG_DEBUG}					\
-	${CP} -R ${DISTDIR}/${DIST_SUBDIR} ${WRKSRC};			\
-	cd ${WRKSRC};							\
-	${MV} rss2email-${RVER}.py rss2email.py;			\
-	${MV} r2e-${SVER}.sh r2e
+	${CP} ${DISTDIR}/${DISTFILES:Q} ${WRKSRC}/rss2email.py
 
 do-install:
 	cd ${WRKSRC} &&							\
diff --git a/mail/rss2email/distinfo b/mail/rss2email/distinfo
index 0a03f2d500d..cdf8c42107a 100644
--- a/mail/rss2email/distinfo
+++ b/mail/rss2email/distinfo
@@ -1,12 +1,9 @@
-$NetBSD: distinfo,v 1.11 2006/04/09 17:01:55 schmonz Exp $
+$NetBSD: distinfo,v 1.12 2006/07/01 19:32:40 schmonz Exp $
 
-SHA1 (rss2email-2.57/r2e-2.0.sh) = 11eb7b878c30fac548d56aed90c1503143583e3d
-RMD160 (rss2email-2.57/r2e-2.0.sh) = 32f8ba9fa977a72c21b0303fc127eaf8e2f8d43f
-Size (rss2email-2.57/r2e-2.0.sh) = 60 bytes
-SHA1 (rss2email-2.57/rss2email-2.57.py) = cbda58bebfee2595189f6cc3030f1fbc910360c9
-RMD160 (rss2email-2.57/rss2email-2.57.py) = 58b20704e1b1ee147327c4b952fb4c056b355f7f
-Size (rss2email-2.57/rss2email-2.57.py) = 17015 bytes
+SHA1 (rss2email-2.59.py) = 32091d8cc9378e6346a9589d9783505259564337
+RMD160 (rss2email-2.59.py) = ef21bc4dab3efbf52449319e736b23a9eb3ae591
+Size (rss2email-2.59.py) = 24152 bytes
 SHA1 (patch-aa) = bc095413de3a22da143535acdc501d08e08203b6
 SHA1 (patch-ab) = ffd6f8131e156abb2faf91b47c2250953fce21ff
-SHA1 (patch-ac) = c79d83efbab5359689bd9ca2ca83dfc35f0e5398
-SHA1 (patch-ad) = 58ce636e422947dee14aa04a28b9255a6baf55be
+SHA1 (patch-ac) = 0742748bad328241b858cb2e54e9a91868feedeb
+SHA1 (patch-ad) = 58b80c4bb0c4c00f2a4994d36da35f29f0dc59e8
diff --git a/mail/rss2email/patches/patch-ac b/mail/rss2email/patches/patch-ac
index 1f7b03a896d..91950a67f77 100644
--- a/mail/rss2email/patches/patch-ac
+++ b/mail/rss2email/patches/patch-ac
@@ -1,13 +1,12 @@
-$NetBSD: patch-ac,v 1.3 2005/08/03 17:19:26 schmonz Exp $
+$NetBSD: patch-ac,v 1.4 2006/07/01 19:32:40 schmonz Exp $
 
---- r2e.orig	2005-08-03 13:01:21.000000000 -0400
+--- r2e.orig	2006-07-01 14:29:52.000000000 -0400
 +++ r2e
-@@ -1,3 +1,7 @@
- #!/bin/sh
+@@ -0,0 +1,7 @@
++#!/bin/sh
 +set -e
 +if [ ! -d ~/.rss2email ]; then
 +	mkdir ~/.rss2email
 +fi
- cd ~/.rss2email/
--python rss2email.py feeds.dat $*
++cd ~/.rss2email
 +exec @PYTHONBIN@ @PREFIX@/share/rss2email/rss2email.py feeds.dat $*
diff --git a/mail/rss2email/patches/patch-ad b/mail/rss2email/patches/patch-ad
index 5bcbae98f64..deb5aa6119c 100644
--- a/mail/rss2email/patches/patch-ad
+++ b/mail/rss2email/patches/patch-ad
@@ -1,12 +1,12 @@
-$NetBSD: patch-ad,v 1.2 2006/04/09 17:01:55 schmonz Exp $
+$NetBSD: patch-ad,v 1.3 2006/07/01 19:32:40 schmonz Exp $
 
---- rss2email.py.orig	2006-04-09 12:42:00.000000000 -0400
+--- rss2email.py.orig	2006-07-01 14:06:47.000000000 -0400
 +++ rss2email.py
-@@ -150,6 +150,7 @@ import mimify; from StringIO import Stri
- import feedparser
- feedparser.USER_AGENT = "rss2email/"+__version__+ " +http://www.aaronsw.com/2002/rss2email/"
- 
-+sys.path.append("@LOCALBASE@/share/html2text")
- import html2text as h2t
- 
- h2t.UNICODE_SNOB = UNICODE_SNOB
+@@ -228,6 +228,7 @@ import mimify; from StringIO import Stri
+ import feedparser

+ feedparser.USER_AGENT = "rss2email/"+__version__+ " +http://www.aaronsw.com/2002/rss2email/"

+ 

++sys.path.append("@LOCALBASE@/share/html2text")

+ import html2text as h2t

+ 

+ h2t.UNICODE_SNOB = UNICODE_SNOB