Update to 2.62. From the changelog:

* Local feeds (/home/user/file.xml) should work
* Now really compatible with SunOS
* Don't wrap long subject headers
* New parameter CHARSET_LIST to override or supplement the order
    in which charsets are tried against an entry
* Don't use blank content to generate id
* Using GMail as mail server should work

3 files changed, 33 insertions, 40 deletions

diff --git a/mail/rss2email/Makefile b/mail/rss2email/Makefile
index 5ad29d418f8..c752ac5efbe 100644
--- a/mail/rss2email/Makefile
+++ b/mail/rss2email/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2007/01/19 00:57:03 schmonz Exp $
+# $NetBSD: Makefile,v 1.17 2008/02/19 10:33:05 schmonz Exp $
 #
 
-DISTNAME=		rss2email-2.60
+DISTNAME=		rss2email-2.62
 CATEGORIES=		mail
 MASTER_SITES=		${HOMEPAGE}
 EXTRACT_SUFX=		.py
@@ -14,6 +14,8 @@ DEPENDS+=		${PYPKGPREFIX}-feedparser-[0-9]*:../../textproc/py-feedparser
 DEPENDS+=		${PYPKGPREFIX}-html2text-[0-9]*:../../textproc/py-html2text
 
 WRKSRC=			${WRKDIR}
+
+USE_TOOLS+=		tr
 NO_BUILD=		yes
 PYTHON_PATCH_SCRIPTS=	*.py
 PYTHON_VERSIONS_ACCEPTED?=	24 23 22
@@ -31,7 +33,8 @@ INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-extract:
 	${_PKG_SILENT}${_PKG_DEBUG}					\
-	${CP} ${DISTDIR}/${DISTFILES:Q} ${WRKSRC}/rss2email.py;		\
+	${TR} -d '\r' < ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}		\
+		> ${WRKSRC}/rss2email.py;				\
 	cd ${FILESDIR} && cp config.py r2e r2e.1 ${WRKSRC}
 
 do-install:
diff --git a/mail/rss2email/distinfo b/mail/rss2email/distinfo
index 946e0e48f57..c74eb670d89 100644
--- a/mail/rss2email/distinfo
+++ b/mail/rss2email/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.14 2007/01/19 00:57:03 schmonz Exp $
+$NetBSD: distinfo,v 1.15 2008/02/19 10:33:05 schmonz Exp $
 
-SHA1 (rss2email-2.60.py) = 1427043b2335574c57028a2692ca5fd18f461b6c
-RMD160 (rss2email-2.60.py) = ad7716ed62007bc13524057e060a529bdf924e18
-Size (rss2email-2.60.py) = 23956 bytes
-SHA1 (patch-ad) = 8932556b67aaa0e7d4df263ad9f3cf96deb74bfd
+SHA1 (rss2email-2.62.py) = 0c69c3325fa9ddac11f8d461337f11c989c62f66
+RMD160 (rss2email-2.62.py) = 715c9c26406336984e5e7862adfb920421a07bdf
+Size (rss2email-2.62.py) = 24310 bytes
+SHA1 (patch-ad) = ce953548c05c764b8dff1a7f9cc6fb7c52acf166
diff --git a/mail/rss2email/patches/patch-ad b/mail/rss2email/patches/patch-ad
index 5bb777e7b6c..ffd1838469c 100644
--- a/mail/rss2email/patches/patch-ad
+++ b/mail/rss2email/patches/patch-ad
@@ -1,34 +1,24 @@
-$NetBSD: patch-ad,v 1.4 2007/01/19 00:57:03 schmonz Exp $
+$NetBSD: patch-ad,v 1.5 2008/02/19 10:33:05 schmonz Exp $
 
---- rss2email.py.orig	2007-01-18 18:27:17.000000000 -0500
+--- rss2email.py.orig	2008-02-13 16:47:25.000000000 -0500
 +++ rss2email.py
-@@ -182,6 +182,11 @@ def send(sender, recipient, subject, bod
- 		i, o = os.popen2(["/usr/sbin/sendmail", recipient])

- 		i.write(msg_as_string)

- 		i.close(); o.close()

-+		pid, status = os.wait()

-+		if status != 0:

-+			print >>warn, ""

-+			print >>warn, ('Fatal error: sendmail exited with code %s' % status)

-+			sys.exit(1)

- 		del i, o

- 		return None

- 

-@@ -212,8 +217,7 @@ import cPickle as pickle, md5, time, os,
- unix = 0

- try:

- 	import fcntl

--	if sys.version.find('sunos') != -1:

--		unix = 1

-+	unix = 1

- except:

- 	pass

- 		

-@@ -225,6 +229,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

+@@ -188,6 +188,11 @@ def send(sender, recipient, subject, bod
+ 		i, o = os.popen2(["/usr/sbin/sendmail", recipient])
+ 		i.write(msg_as_string)
+ 		i.close(); o.close()
++		pid, status = os.wait()
++		if status != 0:
++			print >>warn, ""
++			print >>warn, ('Fatal error: sendmail exited with code %s' % status)
++			sys.exit(1)
+ 		del i, o
+ 		return None
+ 
+@@ -230,6 +235,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