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

MOVED

@@ -6426,3 +6426,4 @@ security/sguil-server|security/sguil|2014-08-16|Merged into new port security/sg
 databases/jasperserver||2014-08-18|Has expired: Unstaged, depends on expiring devel/maven2
 devel/maven2|devel/maven3|2014-08-18|Has expired: No longer supported by the Apache Foundation. Use 3.x instead
 x11-clocks/alarm-clock||2014-08-18|Removed: disappeared upstream
+mail/rss2email|mail/rss2email2|2014-08-19|Renamed to avoid ambiguity with mail/rss2email3

mail/Makefile

@@ -597,7 +597,7 @@
     SUBDIR += roundcube-umich
     SUBDIR += roundcube-veximaccountadmin
     SUBDIR += rspamd
-    SUBDIR += rss2email
+    SUBDIR += rss2email2
     SUBDIR += rss2email3
     SUBDIR += ruby-rfilter
     SUBDIR += ruby-rmail

mail/rss2email2/Makefile

@@ -22,7 +22,7 @@ NO_BUILD=	yes
 CONFLICTS_INSTALL=	py*-rss2email-3.*
 
 PLIST_FILES=	bin/r2e \
-		%%DATADIR%%/${PORTNAME}.py
+		%%DATADIR%%/rss2email.py
 PLIST_DIRS=	%%DATADIR%%
 PORTEXAMPLES=	config.py.example
 
@@ -36,7 +36,7 @@ post-patch:
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR} ${STAGEDIR}${EXAMPLESDIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.py ${STAGEDIR}${DATADIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/rss2email.py ${STAGEDIR}${DATADIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/r2e ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/config.py.example ${STAGEDIR}${EXAMPLESDIR}
 

mail/rss2email3/Makefile

@@ -24,7 +24,7 @@ USE_PYTHON=	3.2+
 USE_PYDISTUTILS=yes
 PYDISTUTILS_AUTOPLIST=yes
 
-CONFLICTS_INSTALL=rss2email2
+CONFLICTS_INSTALL=	py*-rss2email-2.*
 
 PORTDOCS=	AUTHORS CHANGELOG README
 OPTIONS_DEFINE=	DOCS