diff options
Diffstat (limited to 'mail/rss2email/patches')
-rw-r--r-- | mail/rss2email/patches/patch-aa | 21 | ||||
-rw-r--r-- | mail/rss2email/patches/patch-ab | 15 | ||||
-rw-r--r-- | mail/rss2email/patches/patch-ad | 14 | ||||
-rw-r--r-- | mail/rss2email/patches/patch-rss2email_feed.py | 15 | ||||
-rw-r--r-- | mail/rss2email/patches/patch-rss2email_main.py | 15 |
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 |