Update to 2.51. From the changelog for 2.5:

* An HTML mail option.
* SMTP support.
* html2text 2.0.
* A gaggle of bug fixes.
* A gaggle of small improvements.

And for 2.51:

* Fixes a crash in older versions of Python on slow feeds.

pkgsrc changes:

* Set the versions of rss2email.py and html2text.py in one place.

4 files changed, 31 insertions, 29 deletions

diff --git a/mail/rss2email/Makefile b/mail/rss2email/Makefile
index 00d23c9569e..5639663e875 100644
--- a/mail/rss2email/Makefile
+++ b/mail/rss2email/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/06/27 23:00:34 schmonz Exp $
+# $NetBSD: Makefile,v 1.2 2004/06/30 20:19:35 schmonz Exp $
 #
 
-DISTNAME=		rss2email-2.32
+DISTNAME=		rss2email-${RVER}
 CATEGORIES=		mail
 MASTER_SITES=		${HOMEPAGE}
 EXTRACT_SUFX=		.py
-DISTFILES=		${DISTNAME}${EXTRACT_SUFX} r2e html2text-1.0.py
+DISTFILES=		${DISTNAME}${EXTRACT_SUFX} r2e html2text-${HVER}.py
 
 MAINTAINER=		schmonz@NetBSD.org
 HOMEPAGE=		http://www.aaronsw.com/2002/rss2email/
@@ -13,7 +13,10 @@ COMMENT=		Get RSS feeds emailed to you
 
 DEPENDS+=		${PYPKGPREFIX}-feedparser-[0-9]*:../../textproc/py-feedparser
 
-SITES_html2text-1.0.py=	http://www.aaronsw.com/2002/html2text/
+RVER=			2.51
+HVER=			2.11
+
+SITES_html2text-${HVER}.py=	http://www.aaronsw.com/2002/html2text/
 
 DIST_SUBDIR=		${PKGNAME_NOREV}
 
@@ -36,8 +39,8 @@ do-extract:
 do-install:
 	cd ${WRKSRC} &&							\
 	${INSTALL_SCRIPT_DIR} ${SHAREDIR};				\
-	${INSTALL_SCRIPT} rss2email-2.32.py ${SHAREDIR}/rss2email.py;	\
-	${INSTALL_SCRIPT} html2text-1.0.py ${SHAREDIR}/html2text.py;	\
+	${INSTALL_SCRIPT} rss2email-${RVER}.py ${SHAREDIR}/rss2email.py;\
+	${INSTALL_SCRIPT} html2text-${HVER}.py ${SHAREDIR}/html2text.py;\
 	${INSTALL_DATA_DIR} ${EGDIR};					\
 	${INSTALL_DATA} config.py ${EGDIR};				\
 	${INSTALL_MAN} r2e.1 ${PREFIX}/man/man1;			\
diff --git a/mail/rss2email/distinfo b/mail/rss2email/distinfo
index a5308041ae9..3c814430aad 100644
--- a/mail/rss2email/distinfo
+++ b/mail/rss2email/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/06/27 23:00:34 schmonz Exp $
+$NetBSD: distinfo,v 1.2 2004/06/30 20:19:35 schmonz Exp $
 
-SHA1 (rss2email-2.32/rss2email-2.32.py) = 33ccc61bf252bc074937298dc332321b75ef7967
-Size (rss2email-2.32/rss2email-2.32.py) = 7705 bytes
-SHA1 (rss2email-2.32/r2e) = 11eb7b878c30fac548d56aed90c1503143583e3d
-Size (rss2email-2.32/r2e) = 60 bytes
-SHA1 (rss2email-2.32/html2text-1.0.py) = 30c632fba425e49283fd24b149781c313cc003b9
-Size (rss2email-2.32/html2text-1.0.py) = 7334 bytes
-SHA1 (patch-aa) = e990985d2318e5dafbc53a59cafafe2fa4e8ba6a
-SHA1 (patch-ab) = a01934c5e471093a8a453789c0a691f8d4eebaa4
+SHA1 (rss2email-2.51/rss2email-2.51.py) = 7b3b3839bd58b681d16a275e3a22d5c342f14a8f
+Size (rss2email-2.51/rss2email-2.51.py) = 12954 bytes
+SHA1 (rss2email-2.51/r2e) = 11eb7b878c30fac548d56aed90c1503143583e3d
+Size (rss2email-2.51/r2e) = 60 bytes
+SHA1 (rss2email-2.51/html2text-2.11.py) = e40c8f77924e94b3ee54bca9aea0994017e1a396
+Size (rss2email-2.51/html2text-2.11.py) = 7464 bytes
+SHA1 (patch-aa) = bc095413de3a22da143535acdc501d08e08203b6
+SHA1 (patch-ab) = ffd6f8131e156abb2faf91b47c2250953fce21ff
 SHA1 (patch-ac) = e941a9d75580396fc70fd3808a19b99a77e51bec
diff --git a/mail/rss2email/patches/patch-aa b/mail/rss2email/patches/patch-aa
index 09d36a9d840..25d045da317 100644
--- a/mail/rss2email/patches/patch-aa
+++ b/mail/rss2email/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/06/27 23:00:34 schmonz Exp $
+$NetBSD: patch-aa,v 1.2 2004/06/30 20:19:35 schmonz Exp $
 
---- config.py.orig	2004-06-27 17:49:51.000000000 -0400
+--- config.py.orig	2004-06-30 15:33:08.000000000 -0400
 +++ config.py
 @@ -0,0 +1,27 @@
 +# The email address messages are from by default:
@@ -10,6 +10,10 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/06/27 23:00:34 schmonz Exp $
 +# 0: Use the email address specified by the feed, when possible.
 +FORCE_FROM = 0
 +
++# 1: Receive HTML mail
++# 0: Have entries converted to plain text
++HTML_MAIL = 1
++
 +# 1: Receive one email per post
 +# 0: Receive an email every time a post changes
 +TRUST_GUID = 1
@@ -18,10 +22,6 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/06/27 23:00:34 schmonz Exp $
 +# 0: Generate Date header based on time sent
 +DATE_HEADER = 0
 +
-+# 1: Treat the contents of <description> as HTML
-+# 0: Send the contents of <description> as is, without conversion
-+TREAT_DESCRIPTION_AS_HTML = 1
-+
 +# 1: Apply Q-P conversion (required for some MUAs)
 +# 0: Send message in 8-bits
 +# http://cr.yp.to/smtp/8bitmime.html
diff --git a/mail/rss2email/patches/patch-ab b/mail/rss2email/patches/patch-ab
index 84a31c7ca31..44afcf4ddde 100644
--- a/mail/rss2email/patches/patch-ab
+++ b/mail/rss2email/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/06/27 23:00:35 schmonz Exp $
+$NetBSD: patch-ab,v 1.2 2004/06/30 20:19:35 schmonz Exp $
 
---- r2e.1.orig	2004-06-27 17:48:05.000000000 -0400
+--- r2e.1.orig	2004-06-30 15:33:08.000000000 -0400
 +++ r2e.1
-@@ -0,0 +1,95 @@
+@@ -0,0 +1,94 @@
 +.TH R2E 1a
 +.SH NAME
 +r2e \- receive RSS feeds by email
@@ -70,6 +70,10 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/06/27 23:00:35 schmonz Exp $
 +If set, the DEFAULT_FROM address will always be used, otherwise use 
 +the email address specified by the feed, when possible.
 +.TP
++.B HTML_MAIL
++If set, HTML mail will be sent as such. Otherwise, entries will be
++converted to plain text before sending.
++.TP
 +.B TRUST_GUID
 +If set, receive one email per post. Otherwise, a new email will be sent
 +each time a post changes.
@@ -78,11 +82,6 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/06/27 23:00:35 schmonz Exp $
 +If set, the mail's date will be set to the date the item was posted, if
 +possible. Otherwise, the date will be based on the time the email is sent.
 +.TP
-+.B TREAT_DESCRIPTION_AS_HTML
-+Controls whether to treat the contents of a post as html. If set, the
-+contents are assumed to be html, and will be converted to plain text. If
-+not set, the contents will be assumed to be text, and left alone.
-+.TP
 +.B QP_REQUIRED
 +If set, do a quoted printible conversion; otherwise send message in 8 bits.
 +.TP