Tue Jul 2 01:13:30 2013 UTC ()
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.


(schmonz)
diff -r1.1 -r1.2 pkgsrc/mail/rss2email/MESSAGE
diff -r1.31 -r1.32 pkgsrc/mail/rss2email/Makefile
diff -r1.3 -r1.4 pkgsrc/mail/rss2email/PLIST
diff -r1.20 -r1.21 pkgsrc/mail/rss2email/distinfo
diff -r1.3 -r0 pkgsrc/mail/rss2email/files/r2e.1
diff -r1.5 -r0 pkgsrc/mail/rss2email/patches/patch-aa
diff -r1.5 -r0 pkgsrc/mail/rss2email/patches/patch-ab
diff -r1.9 -r0 pkgsrc/mail/rss2email/patches/patch-ad
diff -r0 -r1.1 pkgsrc/mail/rss2email/patches/patch-rss2email_feed.py
diff -r0 -r1.1 pkgsrc/mail/rss2email/patches/patch-rss2email_main.py
cvs diff -r1.1 -r1.2 pkgsrc/mail/rss2email/Attic/MESSAGE (expand / switch to unified diff)

--- pkgsrc/mail/rss2email/Attic/MESSAGE 2013/06/07 02:13:39 1.1
+++ pkgsrc/mail/rss2email/Attic/MESSAGE 2013/07/02 01:13:30 1.2
@@ -1,9 +1,16 @@ @@ -1,9 +1,16 @@
1=========================================================================== 1===========================================================================
2$NetBSD: MESSAGE,v 1.1 2013/06/07 02:13:39 schmonz Exp $ 2$NetBSD: MESSAGE,v 1.2 2013/07/02 01:13:30 schmonz Exp $
3 3
4Just before upgrading to 3.x: 4Just before upgrading to 3.x:
5 5
6$ r2e run 6$ r2e run
7$ r2e opmlexport feeds.xml 7$ r2e opmlexport feeds.xml
8 8
 9Just after upgrading from 2.x:
 10
 11$ r2e new
 12$ vi ~/.rss2email/config.py ~/.config/rss2email.cfg # keep custom settings
 13$ r2e opmlimport feeds.xml
 14$ r2e run --no-send
 15
9=========================================================================== 16===========================================================================
cvs diff -r1.31 -r1.32 pkgsrc/mail/rss2email/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/rss2email/Makefile 2013/06/07 02:13:39 1.31
+++ pkgsrc/mail/rss2email/Makefile 2013/07/02 01:13:30 1.32
@@ -1,50 +1,41 @@ @@ -1,50 +1,41 @@
1# $NetBSD: Makefile,v 1.31 2013/06/07 02:13:39 schmonz Exp $ 1# $NetBSD: Makefile,v 1.32 2013/07/02 01:13:30 schmonz Exp $
2# 2#
3 3
4DISTNAME= rss2email-2.71 4R2EVER= 3.5
5PKGREVISION= 3 5DISTNAME= rss2email-${R2EVER}
6CATEGORIES= mail 6CATEGORIES= mail
7MASTER_SITES= ${HOMEPAGE} 7MASTER_SITES= -http://nodeload.github.com/wking/rss2email/tar.gz/v${R2EVER}
8EXTRACT_SUFX= .zip 
9 8
10MAINTAINER= schmonz@NetBSD.org 9MAINTAINER= schmonz@NetBSD.org
11HOMEPAGE= http://www.allthingsrss.com/rss2email/ 10HOMEPAGE= http://github.com/wking/rss2email/
12COMMENT= Get RSS feeds emailed to you 11COMMENT= Get RSS feeds emailed to you
13LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
14 13
15DEPENDS+= ${PYPKGPREFIX}-feedparser-[0-9]*:../../textproc/py-feedparser 14DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
16DEPENDS+= ${PYPKGPREFIX}-html2text-[0-9]*:../../textproc/py-html2text 15DEPENDS+= ${PYPKGPREFIX}-feedparser>=5.0.1:../../textproc/py-feedparser
17 16DEPENDS+= ${PYPKGPREFIX}-html2text>=3.0.1:../../textproc/py-html2text
18NO_BUILD= yes 17
19PYTHON_PATCH_SCRIPTS= *.py 18PYTHON_VERSIONS_INCLUDE_3X= yes
 19PYTHON_VERSIONS_INCOMPATIBLE= 26 27
 20
 21PYDISTUTILSPKG= yes
 22PY_PATCHPLIST= yes
 23REPLACE_PYTHON= test/test.py
20 24
21SUBST_CLASSES+= bin 25SUBST_CLASSES+= bin
22SUBST_STAGE.bin= do-configure 26SUBST_STAGE.bin= do-configure
23SUBST_FILES.bin= rss2email.py r2e 27SUBST_FILES.bin= rss2email/main.py
24SUBST_SED.bin= -e 's|@LOCALBASE@|${LOCALBASE}|g' 28SUBST_SED.bin= -e 's|@LOCALBASE@|${LOCALBASE}|g'
25SUBST_SED.bin+= -e 's|@PREFIX@|${PREFIX}|g' 
26SUBST_SED.bin+= -e 's|@PYTHONBIN@|${PYTHONBIN}|g' 
27 29
28SUBST_CLASSES+= crlf 30INSTALLATION_DIRS= ${PKGMANDIR}/man1
29SUBST_STAGE.crlf= post-extract 
30SUBST_FILES.crlf= config.py.example 
31SUBST_SED.crlf= -e 's| ||g' 
32 
33SHAREDIR= ${PREFIX}/share/rss2email 
34EGDIR= ${PREFIX}/share/examples/rss2email 
35INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 
36 31
37post-extract: 32do-test:
38 cp ${FILESDIR}/r2e.1 ${WRKSRC} 33 cd ${WRKSRC} && env PYTHONPATH=.:${LOCALBASE}/share/html2text ./test/test.py
39 34
40do-install: 35post-install:
41 set -e; cd ${WRKSRC}; \ 36 set -e; cd ${WRKSRC}; \
42 ${INSTALL_SCRIPT_DIR} ${DESTDIR}${SHAREDIR}; \ 37 ${INSTALL_MAN} r2e.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
43 ${INSTALL_SCRIPT} rss2email.py ${DESTDIR}${SHAREDIR}; \ 
44 ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}; \ 
45 ${INSTALL_DATA} config.py.example ${DESTDIR}${EGDIR}/config.py; \ 
46 ${INSTALL_MAN} r2e.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1; \ 
47 ${INSTALL_SCRIPT} r2e ${DESTDIR}${PREFIX}/bin 
48 38
49.include "../../lang/python/application.mk" 39.include "../../lang/python/application.mk"
 40.include "../../lang/python/extension.mk"
50.include "../../mk/bsd.pkg.mk" 41.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/mail/rss2email/PLIST (expand / switch to unified diff)

--- pkgsrc/mail/rss2email/PLIST 2009/06/14 18:04:42 1.3
+++ pkgsrc/mail/rss2email/PLIST 2013/07/02 01:13:30 1.4
@@ -1,5 +1,42 @@ @@ -1,5 +1,42 @@
1@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:04:42 joerg Exp $ 1@comment $NetBSD: PLIST,v 1.4 2013/07/02 01:13:30 schmonz Exp $
2bin/r2e 2bin/r2e
3man/man1/r2e.1 3man/man1/r2e.1
4share/examples/rss2email/config.py 4${PYSITELIB}/rss2email/__init__.py
5share/rss2email/rss2email.py 5${PYSITELIB}/rss2email/__init__.pyc
 6${PYSITELIB}/rss2email/__init__.pyo
 7${PYSITELIB}/rss2email/command.pyc
 8${PYSITELIB}/rss2email/command.pyo
 9${PYSITELIB}/rss2email/config.pyc
 10${PYSITELIB}/rss2email/config.pyo
 11${PYSITELIB}/rss2email/email.pyc
 12${PYSITELIB}/rss2email/email.pyo
 13${PYSITELIB}/rss2email/error.pyc
 14${PYSITELIB}/rss2email/error.pyo
 15${PYSITELIB}/rss2email/feed.pyc
 16${PYSITELIB}/rss2email/feed.pyo
 17${PYSITELIB}/rss2email/feeds.pyc
 18${PYSITELIB}/rss2email/feeds.pyo
 19${PYSITELIB}/rss2email/main.pyc
 20${PYSITELIB}/rss2email/main.pyo
 21${PYSITELIB}/rss2email/util.pyc
 22${PYSITELIB}/rss2email/util.pyo
 23${PYSITELIB}/rss2email/version.pyc
 24${PYSITELIB}/rss2email/version.pyo
 25${PYSITELIB}/rss2email/command.py
 26${PYSITELIB}/rss2email/config.py
 27${PYSITELIB}/rss2email/email.py
 28${PYSITELIB}/rss2email/error.py
 29${PYSITELIB}/rss2email/feed.py
 30${PYSITELIB}/rss2email/feeds.py
 31${PYSITELIB}/rss2email/main.py
 32${PYSITELIB}/rss2email/post_process/__init__.py
 33${PYSITELIB}/rss2email/post_process/__init__.pyc
 34${PYSITELIB}/rss2email/post_process/__init__.pyo
 35${PYSITELIB}/rss2email/post_process/downcase.pyc
 36${PYSITELIB}/rss2email/post_process/downcase.pyo
 37${PYSITELIB}/rss2email/post_process/prettify.pyc
 38${PYSITELIB}/rss2email/post_process/prettify.pyo
 39${PYSITELIB}/rss2email/post_process/downcase.py
 40${PYSITELIB}/rss2email/post_process/prettify.py
 41${PYSITELIB}/rss2email/util.py
 42${PYSITELIB}/rss2email/version.py
cvs diff -r1.20 -r1.21 pkgsrc/mail/rss2email/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/rss2email/distinfo 2011/06/09 06:21:58 1.20
+++ pkgsrc/mail/rss2email/distinfo 2013/07/02 01:13:30 1.21
@@ -1,8 +1,7 @@ @@ -1,8 +1,7 @@
1$NetBSD: distinfo,v 1.20 2011/06/09 06:21:58 schmonz Exp $ 1$NetBSD: distinfo,v 1.21 2013/07/02 01:13:30 schmonz Exp $
2 2
3SHA1 (rss2email-2.71.zip) = aa0123a02139415acdcb765bdcafe4c568d5c16b 3SHA1 (rss2email-3.5.tar.gz) = b6fb59c1765ffd5a7f8b2d892011ca7fb351cd5f
4RMD160 (rss2email-2.71.zip) = 2c2e81b6d4e2101ca7e82d524b6222aa44056e95 4RMD160 (rss2email-3.5.tar.gz) = d94321e3d3fea4274f6d0d2f91cd72b0de3e76e2
5Size (rss2email-2.71.zip) = 63612 bytes 5Size (rss2email-3.5.tar.gz) = 158424 bytes
6SHA1 (patch-aa) = 5c35ae987257ed8fbe2efae11f144e37b1236d45 6SHA1 (patch-rss2email_feed.py) = 142520ccf2a567bb0925253c257586f8b4da33ad
7SHA1 (patch-ab) = a53ac7577f897750d51f0db17be5b28480278097 7SHA1 (patch-rss2email_main.py) = 3d30cec4068f11031624356dd36cf9b739d0755f
8SHA1 (patch-ad) = 2dd7fe698eae415085fe62f3df16337cc95481c3 
File Deleted: pkgsrc/mail/rss2email/files/Attic/r2e.1
File Deleted: pkgsrc/mail/rss2email/patches/Attic/patch-aa
File Deleted: pkgsrc/mail/rss2email/patches/Attic/patch-ab
File Deleted: pkgsrc/mail/rss2email/patches/Attic/patch-ad
File Added: pkgsrc/mail/rss2email/patches/Attic/patch-rss2email_feed.py
$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">',
File Added: pkgsrc/mail/rss2email/patches/Attic/patch-rss2email_main.py
$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