Move mail/rss2email => mail/rss2email2

This is done to avoid confusion with mail/rss2email3.  Also update the
conflicts line of rss2email3 that broke with the recent update of
mail/rss2email.  This is the second part of the PR.

PR:		190381
Submitted by:	Stephen Guglielmo

4 files changed, 64 insertions, 0 deletions

diff --git a/mail/rss2email2/Makefile b/mail/rss2email2/Makefile
new file mode 100644
index 000000000000..01c38c93c36f
--- /dev/null
+++ b/mail/rss2email2/Makefile
@@ -0,0 +1,43 @@
+# Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	rss2email
+PORTVERSION=	2.71
+CATEGORIES=	mail python
+MASTER_SITES=	http://www.allthingsrss.com/rss2email/
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	srg@guglielmo.us
+COMMENT=	Emails posts from subscribed RSS/Atom newsfeeds
+
+LICENSE=	GPLv2 GPLv3
+LICENSE_COMB=	dual
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}feedparser>=5.0.1:${PORTSDIR}/textproc/py-feedparser \
+		${PYTHON_PKGNAMEPREFIX}html2text>=3.0.1:${PORTSDIR}/textproc/py-html2text
+
+USES=		python:2
+NO_BUILD=	yes
+
+CONFLICTS_INSTALL=	py*-rss2email-3.*
+
+PLIST_FILES=	bin/r2e \
+		%%DATADIR%%/rss2email.py
+PLIST_DIRS=	%%DATADIR%%
+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} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/rss2email.py ${STAGEDIR}${DATADIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/r2e ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/config.py.example ${STAGEDIR}${EXAMPLESDIR}
+
+.include <bsd.port.mk>
diff --git a/mail/rss2email2/distinfo b/mail/rss2email2/distinfo
new file mode 100644
index 000000000000..a942272d54f3
--- /dev/null
+++ b/mail/rss2email2/distinfo
@@ -0,0 +1,2 @@
+SHA256 (rss2email-2.71.tar.gz) = d5245197a5034410405f1f5794610b84bf26c0c40c8d05fe0895116797a99b31
+SIZE (rss2email-2.71.tar.gz) = 63268
diff --git a/mail/rss2email2/files/patch-r2e b/mail/rss2email2/files/patch-r2e
new file mode 100644
index 000000000000..51dcece6ca49
--- /dev/null
+++ b/mail/rss2email2/files/patch-r2e
@@ -0,0 +1,11 @@
+--- r2e.orig	2010-10-14 16:54:13.000000000 +0000
++++ r2e	2010-10-14 17:00:36.000000000 +0000
+@@ -1,2 +1,7 @@
+ #!/bin/sh
+-python rss2email.py feeds.dat $*
++set -e
++if [ ! -d ~/.rss2email ]; then
++	mkdir ~/.rss2email
++fi
++cd ~/.rss2email
++exec @PYTHONCMD@ @DATADIR@/rss2email.py feeds.dat $*
diff --git a/mail/rss2email2/pkg-descr b/mail/rss2email2/pkg-descr
new file mode 100644
index 000000000000..d9d4a94304d3
--- /dev/null
+++ b/mail/rss2email2/pkg-descr
@@ -0,0 +1,8 @@
+rss2email is a python script that lets you subscribe to a list of
+RSS or Atom feeds and get new posts sent to you by email. It is
+generally run via cron, but can be run manually as well.
+
+This is the original rss2email project and requires python 2. It
+will not run on python 3.
+
+WWW: http://www.allthingsrss.com/rss2email/