Update to 3.10. From the changelog:

* Catch and warn for invalid Content-Types
* Add a manually extracted list of config options to r2e.1
* Add a redirect post-process module
* Follow symlinks of datafiles
* Add zsh completion
* Add support for maildir
* Fix `r2e new` overwriting an existing config
* Add new `feed-name` and `feed-url` attributes for the `name-format` setting
* Change logging format
* Allow multiple SMTP recipients
* Fix SMTP security issues
* Fix test suite
* Drop support for Python 3.2 and 3.3
* Remove `__contributors__` from the `rss2email` module
* Stop using deprecated `html2text.unescape`
* Fix locking issues when data file is on NFS
* Add `same-server-fetch-interval` setting for rate-limiting fetches to a server
* Update setup.py to setuptools

pkgsrc changes: simplify GITHUB_*, from leot@.

4 files changed, 33 insertions, 56 deletions

diff --git a/mail/rss2email/Makefile b/mail/rss2email/Makefile
index 0aee3afffc8..6ab98665c4e 100644
--- a/mail/rss2email/Makefile
+++ b/mail/rss2email/Makefile
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.45 2019/08/29 09:20:25 schmonz Exp $
+# $NetBSD: Makefile,v 1.46 2019/09/07 18:58:02 schmonz Exp $
 
-GITHUB_PROJECT=		rss2email
-DISTNAME=		v3.9
-PKGNAME=		${GITHUB_PROJECT}-${DISTNAME:S/^v//}
-PKGREVISION=		3
+DISTNAME=		rss2email-3.10
 CATEGORIES=		mail python
 MASTER_SITES=		${MASTER_SITE_GITHUB:=rss2email/}
-DIST_SUBDIR=		${GITHUB_PROJECT}
+GITHUB_TAG=		v${PKGVERSION_NOREV}
+DIST_SUBDIR=		${PKGNAME_NOREV}
 
 MAINTAINER=		schmonz@NetBSD.org
 HOMEPAGE=		https://github.com/rss2email/rss2email/
@@ -17,12 +15,8 @@ DEPENDS+=		${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 DEPENDS+=		${PYPKGPREFIX}-feedparser>=5.0.1:../../textproc/py-feedparser
 DEPENDS+=		${PYPKGPREFIX}-html2text>=2014.4.5:../../textproc/py-html2text
 
-WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
-
 PYTHON_VERSIONS_INCOMPATIBLE=	27
 
-PYDISTUTILSPKG=		yes
-PY_PATCHPLIST=		yes
 REPLACE_PYTHON=		test/test.py
 
 INSTALLATION_DIRS=	${PKGMANDIR}/man1
@@ -35,5 +29,5 @@ post-install:
 	${INSTALL_MAN} r2e.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../lang/python/application.mk"
-.include "../../lang/python/extension.mk"
+.include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/rss2email/PLIST b/mail/rss2email/PLIST
index ba376b30dbe..010bb5f7a04 100644
--- a/mail/rss2email/PLIST
+++ b/mail/rss2email/PLIST
@@ -1,27 +1,31 @@
-@comment $NetBSD: PLIST,v 1.4 2013/07/02 01:13:30 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.5 2019/09/07 18:58:02 schmonz Exp $
 bin/r2e
-man/man1/r2e.1
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/rss2email/__init__.py
-${PYSITELIB}/rss2email/__init__.pyc
 ${PYSITELIB}/rss2email/__init__.pyo
-${PYSITELIB}/rss2email/command.pyc
+${PYSITELIB}/rss2email/__init__.pyc
 ${PYSITELIB}/rss2email/command.pyo
-${PYSITELIB}/rss2email/config.pyc
+${PYSITELIB}/rss2email/command.pyc
 ${PYSITELIB}/rss2email/config.pyo
-${PYSITELIB}/rss2email/email.pyc
+${PYSITELIB}/rss2email/config.pyc
 ${PYSITELIB}/rss2email/email.pyo
-${PYSITELIB}/rss2email/error.pyc
+${PYSITELIB}/rss2email/email.pyc
 ${PYSITELIB}/rss2email/error.pyo
-${PYSITELIB}/rss2email/feed.pyc
+${PYSITELIB}/rss2email/error.pyc
 ${PYSITELIB}/rss2email/feed.pyo
-${PYSITELIB}/rss2email/feeds.pyc
+${PYSITELIB}/rss2email/feed.pyc
 ${PYSITELIB}/rss2email/feeds.pyo
-${PYSITELIB}/rss2email/main.pyc
+${PYSITELIB}/rss2email/feeds.pyc
 ${PYSITELIB}/rss2email/main.pyo
-${PYSITELIB}/rss2email/util.pyc
+${PYSITELIB}/rss2email/main.pyc
 ${PYSITELIB}/rss2email/util.pyo
-${PYSITELIB}/rss2email/version.pyc
+${PYSITELIB}/rss2email/util.pyc
 ${PYSITELIB}/rss2email/version.pyo
+${PYSITELIB}/rss2email/version.pyc
 ${PYSITELIB}/rss2email/command.py
 ${PYSITELIB}/rss2email/config.py
 ${PYSITELIB}/rss2email/email.py
@@ -30,13 +34,17 @@ ${PYSITELIB}/rss2email/feed.py
 ${PYSITELIB}/rss2email/feeds.py
 ${PYSITELIB}/rss2email/main.py
 ${PYSITELIB}/rss2email/post_process/__init__.py
-${PYSITELIB}/rss2email/post_process/__init__.pyc
 ${PYSITELIB}/rss2email/post_process/__init__.pyo
-${PYSITELIB}/rss2email/post_process/downcase.pyc
+${PYSITELIB}/rss2email/post_process/__init__.pyc
 ${PYSITELIB}/rss2email/post_process/downcase.pyo
-${PYSITELIB}/rss2email/post_process/prettify.pyc
+${PYSITELIB}/rss2email/post_process/downcase.pyc
 ${PYSITELIB}/rss2email/post_process/prettify.pyo
+${PYSITELIB}/rss2email/post_process/prettify.pyc
+${PYSITELIB}/rss2email/post_process/redirect.pyo
+${PYSITELIB}/rss2email/post_process/redirect.pyc
 ${PYSITELIB}/rss2email/post_process/downcase.py
 ${PYSITELIB}/rss2email/post_process/prettify.py
+${PYSITELIB}/rss2email/post_process/redirect.py
 ${PYSITELIB}/rss2email/util.py
 ${PYSITELIB}/rss2email/version.py
+man/man1/r2e.1
diff --git a/mail/rss2email/distinfo b/mail/rss2email/distinfo
index 2a4576eacc4..b3195df4b3c 100644
--- a/mail/rss2email/distinfo
+++ b/mail/rss2email/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.29 2019/08/28 19:44:48 schmonz Exp $
+$NetBSD: distinfo,v 1.30 2019/09/07 18:58:02 schmonz Exp $
 
-SHA1 (rss2email/v3.9.tar.gz) = 3d82fa1da8a59942c22b74f2f290d7f2ebe33ecc
-RMD160 (rss2email/v3.9.tar.gz) = d6410a0303a2a24245300d2946852ff2f660dfe5
-SHA512 (rss2email/v3.9.tar.gz) = 6958eb401d782a027dcf98fbb3cac0d37e58641b800cb1e62916fc898603bb7032900aca34c1744b2c6896963babb61e28dbfedfeaf4206224b15baa2ef09cd9
-Size (rss2email/v3.9.tar.gz) = 160904 bytes
+SHA1 (rss2email-3.10/rss2email-3.10.tar.gz) = 8181fadb6798b0ca207ef5977dec1a9dfe637e3b
+RMD160 (rss2email-3.10/rss2email-3.10.tar.gz) = 57875942ca1eb8a4042f655365595ecdf0590d4a
+SHA512 (rss2email-3.10/rss2email-3.10.tar.gz) = 655f20bfa01ca6923d6b10c5dbed59706e15ae697f3e5f0be8e963301cd9c6d9c5612b82d38bdf5b2cec3a5c495501fd3e4572da5057430fd1de69317b674160
+Size (rss2email-3.10/rss2email-3.10.tar.gz) = 64230 bytes
 SHA1 (patch-rss2email_config.py) = f99a023a1f3b207da46e721da112321fa1e5153d
-SHA1 (patch-rss2email_feed.py) = f626b710703bc70da82eed191872818b130085fc
diff --git a/mail/rss2email/patches/patch-rss2email_feed.py b/mail/rss2email/patches/patch-rss2email_feed.py
deleted file mode 100644
index e0b2a70cea3..00000000000
--- a/mail/rss2email/patches/patch-rss2email_feed.py
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-rss2email_feed.py,v 1.3 2019/08/28 19:44:48 schmonz Exp $
-
-html2text no longer provides unescape(). Python 3.4's html module does.
-<https://github.com/rss2email/rss2email/commit/81824e25723dcd2936f25f64ebc16f2e8ec9f310>
-
---- rss2email/feed.py.orig	2014-09-01 23:21:01.000000000 +0000
-+++ rss2email/feed.py
-@@ -48,6 +48,7 @@ import xml.sax.saxutils as _saxutils
- 
- import feedparser as _feedparser
- import html2text as _html2text
-+import html as _html
- 
- from . import __url__
- from . import __version__
-@@ -595,7 +596,7 @@ class Feed (object):
-         if 'name' in feed.get('publisher_detail', []):
-             data['publisher'] = feed.publisher_detail.name
-         name = self.name_format.format(**data)
--        return _html2text.unescape(name)
-+        return _html.unescape(name)
- 
-     def _validate_email(self, email, default=None):
-         """Do a basic quality check on email address