svn commit: r504879 - in head/textproc: discount markdown

[Yuri Victorovich]

Author: yuri
Date: Sat Jun 22 17:36:09 2019
New Revision: 504879
URL: https://svnweb.freebsd.org/changeset/ports/504879

Log:
  textproc/markdown and textproc/discount: Add CONFLICTS_INSTALL
  
  Approved by:	portmgr blanket

Modified:
  head/textproc/discount/Makefile
  head/textproc/markdown/Makefile

Modified: head/textproc/discount/Makefile
==============================================================================
--- head/textproc/discount/Makefile	Sat Jun 22 17:06:35 2019	(r504878)
+++ head/textproc/discount/Makefile	Sat Jun 22 17:36:09 2019	(r504879)
@@ -51,4 +51,6 @@ SAMPLES_PLIST_FILES=	bin/makepage bin/mkd2html bin/the
 			man/man1/makepage.1.gz man/man1/mkd2html.1.gz \
 			man/man1/theme.1.gz
 
+CONFLICTS_INSTALL=	markdown
+
 .include <bsd.port.mk>

Modified: head/textproc/markdown/Makefile
==============================================================================
--- head/textproc/markdown/Makefile	Sat Jun 22 17:06:35 2019	(r504878)
+++ head/textproc/markdown/Makefile	Sat Jun 22 17:36:09 2019	(r504879)
@@ -24,6 +24,8 @@ PORTDOCS=	Markdown-Readme.text
 
 PLIST_FILES=	bin/markdown
 
+CONFLICTS_INSTALL=	discount
+
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/Markdown.pl ${STAGEDIR}${PREFIX}/bin/markdown
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}