Update to 3.5 (new upstream). From the changelog:

v3.5 (2013-06-05)

* Added digest generation and post-processing hooks.
* Fix html2text configuration (ignored since 2012-10-04).
* Fix opmlexport crash due to orphaned feed data.
* Use feed names in OPML 'text' attributes.

v3.4 (2013-05-14)

* Added post-processing hooks for user-specified message manipulation.
* Added settings for IMAP delivery. The old `use-smtp` boolean has
  been replaced by a new `email-protocol` setting. Non-IMAP users
  should adjust their configuration to set `email-protocol` to
  either `sendmail` or `smtp`.

v3.3 (2013-04-13)

* Fix SMTP message submission logic.
* Fix error inheritence (super() calls).
* Convert html2text parsing errors to `ProcessingError`s.
* Cleanup html2text error handling.
* Drop Google Reader rel-via manipulation.
* Drop the wrapping <table> elements from HTML mail

v3.2 (2013-03-13)

* Use extended interpolation in configuration files, to allow percent signs (%).
* Added .as_string() fallback to email flattening (only used if
  `use-smtp = False` and `use-8bit = True`).
* Added sendmail configuration option. Change this if you want to
  use an alternative, sendmail-compatible mailer.

v3.1 (2013-02-14)

* Import __url__, __author__, and __email__ in rss2email.error,
  which fixes bugs in formatting a number of errors.

v3.0 (2013-02-13)

* Changed project email (rss2email@tremily.us) and homepage
  (http://github.com/wking/rss2email).
* Split static configuration parameters into a ConfigParser-read
  config file (rss2email.cfg). Data that depends on the feed state
  is recorded using JSON (rss2email.json).
* Use the XDG Base Directory Specification for standardized
  configuration and data file locations.
* Converted the command line interface to argparse, with some
  restructuring along the way.
* Added the r2e.1 man page (based on one from the Debian package).
* Added setup.py and a PyPI page for simpler installation
  (http://pypi.python.org/pypi/rss2email).
* Added Message-ID headers to outgoing email.
* Added a test suite.
* Upgraded to Python 3.2 to take advantage of cleaner Unicode
  handling and argparse.
* Require Signed-off-by lines in new commit messages, following the
  Linux and Git projects.

5 files changed, 30 insertions, 50 deletions

diff --git a/mail/rss2email/patches/patch-aa b/mail/rss2email/patches/patch-aa
deleted file mode 100644
index 3a1db9a98da..00000000000
--- a/mail/rss2email/patches/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2011/06/09 06:21:58 schmonz Exp $
-
-Missing sample config entries from the Debian package.
-
---- config.py.example.orig	2011-01-28 01:22:26.000000000 +0000
-+++ config.py.example
-@@ -92,3 +92,14 @@ PROXY=""
- # To most correctly encode emails with international characters, we iterate through the list below and use the first character set that works
- # Eventually (and theoretically) ISO-8859-1 and UTF-8 are our catch-all failsafes
- CHARSET_LIST='US-ASCII', 'BIG5', 'ISO-2022-JP', 'ISO-8859-1', 'UTF-8'
-+
-+## html2text options ##
-+
-+# Use Unicode characters instead of their ascii psuedo-replacements
-+UNICODE_SNOB = 0
-+
-+# Put the links after each paragraph instead of at the end.
-+LINKS_EACH_PARAGRAPH = 0
-+
-+# Wrap long lines at position. 0 for no wrapping. (Requires Python 2.3.)
-+BODY_WIDTH = 0
diff --git a/mail/rss2email/patches/patch-ab b/mail/rss2email/patches/patch-ab
deleted file mode 100644
index 116033c32ad..00000000000
--- a/mail/rss2email/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2011/06/09 06:21:58 schmonz Exp $
-
-Fixes from the Debian package.
-
---- r2e.orig	2006-03-16 23:43:03.000000000 +0000
-+++ r2e
-@@ -1,2 +1,7 @@
- #!/bin/sh
--python rss2email.py feeds.dat $*
-+set -e
-+if [ ! -d ~/.rss2email ]; then
-+	mkdir ~/.rss2email
-+fi
-+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
deleted file mode 100644
index 1b266bd72b9..00000000000
--- a/mail/rss2email/patches/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ad,v 1.9 2011/06/09 06:21:58 schmonz Exp $
-
-Find the pkgsrc-provided py-html2text.
-
---- rss2email.py.orig	2011-03-04 13:51:24.000000000 +0000
-+++ rss2email.py
-@@ -296,6 +296,7 @@ for e in ['error', 'gaierror']:
- import feedparser
- feedparser.USER_AGENT = "rss2email/"+__version__+ " +http://www.allthingsrss.com/rss2email/"
- 
-+sys.path.append("@LOCALBASE@/share/html2text")
- import html2text as h2t
- 
- h2t.UNICODE_SNOB = UNICODE_SNOB
diff --git a/mail/rss2email/patches/patch-rss2email_feed.py b/mail/rss2email/patches/patch-rss2email_feed.py
new file mode 100644
index 00000000000..9d7c9e3d12f
--- /dev/null
+++ b/mail/rss2email/patches/patch-rss2email_feed.py
@@ -0,0 +1,15 @@
+$NetBSD: patch-rss2email_feed.py,v 1.1 2013/07/02 01:13:30 schmonz Exp $
+
+Upstream 4aa7f1d: "Fixed syntactical error when generating HTML mails"
+
+--- rss2email/feed.py.orig	2013-06-05 22:13:14.000000000 +0000
++++ rss2email/feed.py
+@@ -709,7 +709,7 @@ class Feed (object):
+             lines.extend([
+                     '</head>',
+                     '<body>',
+-                    '<div id="entry>',
++                    '<div id="entry">',
+                     '<h1 class="header"><a href="{}">{}</a></h1>'.format(
+                         link, subject),
+                     '<div id="body">',
diff --git a/mail/rss2email/patches/patch-rss2email_main.py b/mail/rss2email/patches/patch-rss2email_main.py
new file mode 100644
index 00000000000..c7362151460
--- /dev/null
+++ b/mail/rss2email/patches/patch-rss2email_main.py
@@ -0,0 +1,15 @@
+$NetBSD: patch-rss2email_main.py,v 1.1 2013/07/02 01:13:30 schmonz Exp $
+
+Find the pkgsrc-provided py-html2text.
+
+--- rss2email/main.py.orig	2013-06-05 22:13:14.000000000 +0000
++++ rss2email/main.py
+@@ -21,6 +21,8 @@ import argparse as _argparse
+ import logging as _logging
+ import sys as _sys
+ 
++_sys.path.append("@LOCALBASE@/share/html2text")
++
+ from . import __doc__ as _PACKAGE_DOCSTRING
+ from . import __version__
+ from . import LOG as _LOG