Index: branches/2018Q4/mail/rss2email2/Makefile =================================================================== --- branches/2018Q4/mail/rss2email2/Makefile (revision 484455) +++ branches/2018Q4/mail/rss2email2/Makefile (revision 484456) @@ -1,56 +1,56 @@ # Created by: Andrew Pantyukhin # $FreeBSD$ PORTNAME= rss2email PORTVERSION= 2.71 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= mail python MASTER_SITES= http://www.allthingsrss.com/rss2email/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -MAINTAINER= srg@guglielmo.us +MAINTAINER= ports@FreeBSD.org COMMENT= Emails posts from subscribed RSS/Atom newsfeeds LICENSE= GPLv2 GPLv3 LICENSE_COMB= dual RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}feedparser>=5.0.1:textproc/py-feedparser@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}html2text>=3.0.1:textproc/py-html2text@${PY_FLAVOR} USES= python:2.7 shebangfix SHEBANG_FILES= rss2email.py NO_ARCH= yes NO_BUILD= yes CONFLICTS_INSTALL= py*-rss2email-3.* PLIST_FILES= bin/r2e \ %%DATADIR%%/rss2email.py PORTEXAMPLES= config.py.example OPTIONS_DEFINE= EXAMPLES post-patch: @${REINPLACE_CMD} -e 's|@PYTHONCMD@|${PYTHON_CMD}|;s|@DATADIR@|${DATADIR}|'\ ${WRKSRC}/r2e @${REINPLACE_CMD} -e "s|\([^[:alnum:]]\)c.type\([^[:alnum:]]\)|\1c.get('type','')\2|"\ ${WRKSRC}/rss2email.py do-install: @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_SCRIPT} ${WRKSRC}/rss2email.py ${STAGEDIR}${DATADIR} ${INSTALL_SCRIPT} ${WRKSRC}/r2e ${STAGEDIR}${PREFIX}/bin do-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/config.py.example ${STAGEDIR}${EXAMPLESDIR} .include .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100077 # chmod -R bug. post-extract: @${CHMOD} 0755 ${WRKSRC} .endif .include Index: branches/2018Q4/mail/rss2email2/files/patch-rss2email.py =================================================================== --- branches/2018Q4/mail/rss2email2/files/patch-rss2email.py (nonexistent) +++ branches/2018Q4/mail/rss2email2/files/patch-rss2email.py (revision 484456) @@ -0,0 +1,13 @@ +https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=734327 + +--- rss2email.py.orig 2018-01-14 00:42:27 UTC ++++ rss2email.py +@@ -694,7 +694,7 @@ def run(num=None): + for tag in tags: + taglist.append(tag['term']) + if taglist: +- tagline = ",".join(taglist) ++ tagline = ",".join(filter(None, taglist)) + + extraheaders = {'Date': datehdr, 'User-Agent': useragenthdr, 'X-RSS-Feed': f.url, 'X-RSS-ID': id, 'X-RSS-URL': link, 'X-RSS-TAGS' : tagline} + if BONUS_HEADER != '': Property changes on: branches/2018Q4/mail/rss2email2/files/patch-rss2email.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2018Q4 =================================================================== --- branches/2018Q4 (revision 484455) +++ branches/2018Q4 (revision 484456) Property changes on: branches/2018Q4 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r484444