CVS commit: pkgsrc/mail/rss2email

["Leonardo Taccari" <leot%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   leot
Date:           Mon May 22 17:51:12 UTC 2017

Modified Files:
        pkgsrc/mail/rss2email: Makefile distinfo
Added Files:
        pkgsrc/mail/rss2email/patches: patch-rss2email_config.py

Log Message:
Add a patch to properly honor html2text options via rss2email's configuration
file.

While here also simplify MASTER_SITES (convert it to MASTER_SITE_GITHUB)
and delete DIST_SUBDIR and WRKSRC that are no longer needed with
that change.

Bump PKGREVISION

Discussed with <schmonz>


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 pkgsrc/mail/rss2email/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/mail/rss2email/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/mail/rss2email/patches/patch-rss2email_config.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/rss2email/Makefile
diff -u pkgsrc/mail/rss2email/Makefile:1.41 pkgsrc/mail/rss2email/Makefile:1.42
--- pkgsrc/mail/rss2email/Makefile:1.41 Mon Apr 13 23:12:42 2015
+++ pkgsrc/mail/rss2email/Makefile      Mon May 22 17:51:12 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.41 2015/04/13 23:12:42 rodent Exp $
+# $NetBSD: Makefile,v 1.42 2017/05/22 17:51:12 leot Exp $
 
-DISTNAME=              v3.9
-PKGNAME=               rss2email-3.9
+DISTNAME=              rss2email-3.9
+PKGREVISION=           1
 CATEGORIES=            mail
-MASTER_SITES=          ${HOMEPAGE}archive/
-DIST_SUBDIR=           rss2email
+MASTER_SITES=          ${MASTER_SITE_GITHUB:=wking/}
+GITHUB_TAG=            v${PKGVERSION_NOREV}
 
 MAINTAINER=            schmonz%NetBSD.org@localhost
 HOMEPAGE=              https://github.com/wking/rss2email/
@@ -15,8 +15,6 @@ DEPENDS+=             ${PYPKGPREFIX}-expat-[0-9]*:.
 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

Index: pkgsrc/mail/rss2email/distinfo
diff -u pkgsrc/mail/rss2email/distinfo:1.27 pkgsrc/mail/rss2email/distinfo:1.28
--- pkgsrc/mail/rss2email/distinfo:1.27 Tue Nov  3 23:27:19 2015
+++ pkgsrc/mail/rss2email/distinfo      Mon May 22 17:51:12 2017
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.27 2015/11/03 23:27:19 agc Exp $
+$NetBSD: distinfo,v 1.28 2017/05/22 17:51:12 leot 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.9.tar.gz) = 3d82fa1da8a59942c22b74f2f290d7f2ebe33ecc
+RMD160 (rss2email-3.9.tar.gz) = d6410a0303a2a24245300d2946852ff2f660dfe5
+SHA512 (rss2email-3.9.tar.gz) = 6958eb401d782a027dcf98fbb3cac0d37e58641b800cb1e62916fc898603bb7032900aca34c1744b2c6896963babb61e28dbfedfeaf4206224b15baa2ef09cd9
+Size (rss2email-3.9.tar.gz) = 160904 bytes
+SHA1 (patch-rss2email_config.py) = f99a023a1f3b207da46e721da112321fa1e5153d

Added files:

Index: pkgsrc/mail/rss2email/patches/patch-rss2email_config.py
diff -u /dev/null pkgsrc/mail/rss2email/patches/patch-rss2email_config.py:1.1
--- /dev/null   Mon May 22 17:51:12 2017
+++ pkgsrc/mail/rss2email/patches/patch-rss2email_config.py     Mon May 22 17:51:12 2017
@@ -0,0 +1,21 @@
+$NetBSD: patch-rss2email_config.py,v 1.1 2017/05/22 17:51:12 leot Exp $
+
+Properly pass the configuration options to html2text
+
+--- rss2email/config.py.orig   2014-09-01 23:21:01.000000000 +0000
++++ rss2email/config.py
+@@ -51,11 +51,11 @@ class Config (_configparser.ConfigParser
+         """
+         if section not in self:
+             section = 'DEFAULT'
+-        _html2text.UNICODE_SNOB = self.getboolean(
++        _html2text.config.UNICODE_SNOB = self.getboolean(
+             section, 'unicode-snob')
+-        _html2text.LINKS_EACH_PARAGRAPH = self.getboolean(
++        _html2text.config.LINKS_EACH_PARAGRAPH = self.getboolean(
+             section, 'links-after-each-paragraph')
+-        _html2text.BODY_WIDTH = self.getint(section, 'body-width')
++        _html2text.config.BODY_WIDTH = self.getint(section, 'body-width')
+ 
+ 
+ CONFIG = Config()