Date: Tue, 19 Aug 2014 12:26:49 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r365373 - in head: . mail mail/rss2email mail/rss2email2 mail/rss2email3 Message-ID: <201408191226.s7JCQn6D010857@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Tue Aug 19 12:26:49 2014 New Revision: 365373 URL: http://svnweb.freebsd.org/changeset/ports/365373 QAT: https://qat.redports.org/buildarchive/r365373/ Log: 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 Added: head/mail/rss2email2/ - copied from r365371, head/mail/rss2email/ Deleted: head/mail/rss2email/ Modified: head/MOVED head/mail/Makefile head/mail/rss2email2/Makefile head/mail/rss2email3/Makefile Modified: head/MOVED ============================================================================== --- head/MOVED Tue Aug 19 12:13:36 2014 (r365372) +++ head/MOVED Tue Aug 19 12:26:49 2014 (r365373) @@ -6426,3 +6426,4 @@ security/sguil-server|security/sguil|201 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 Modified: head/mail/Makefile ============================================================================== --- head/mail/Makefile Tue Aug 19 12:13:36 2014 (r365372) +++ head/mail/Makefile Tue Aug 19 12:26:49 2014 (r365373) @@ -597,7 +597,7 @@ SUBDIR += roundcube-umich SUBDIR += roundcube-veximaccountadmin SUBDIR += rspamd - SUBDIR += rss2email + SUBDIR += rss2email2 SUBDIR += rss2email3 SUBDIR += ruby-rfilter SUBDIR += ruby-rmail Modified: head/mail/rss2email2/Makefile ============================================================================== --- head/mail/rss2email/Makefile Tue Aug 19 11:52:29 2014 (r365371) +++ head/mail/rss2email2/Makefile Tue Aug 19 12:26:49 2014 (r365373) @@ -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} Modified: head/mail/rss2email3/Makefile ============================================================================== --- head/mail/rss2email3/Makefile Tue Aug 19 12:13:36 2014 (r365372) +++ head/mail/rss2email3/Makefile Tue Aug 19 12:26:49 2014 (r365373) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408191226.s7JCQn6D010857>