Index: head/textproc/discount/Makefile
===================================================================
--- head/textproc/discount/Makefile	(revision 504878)
+++ head/textproc/discount/Makefile	(revision 504879)
@@ -1,54 +1,56 @@
 # Created by: Julien Laffaye <kimelto@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	discount
 DISTVERSION=	2.2.2
 CATEGORIES=	textproc devel
 MASTER_SITES=	http://www.pell.portland.or.us/~orc/Code/discount/ \
 		LOCAL/jlaffaye
 
 MAINTAINER=	jlaffaye@FreeBSD.org
 COMMENT=	C implementation of the Markdown markup language
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
 USES=	tar:bzip2
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=configure.sh
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--mandir=${MANPREFIX}/man
 INSTALL_TARGET=	install install.man
 
 PLIST_FILES=	bin/markdown lib/libmarkdown.a include/mkdio.h \
 		man/man1/markdown.1.gz man/man3/markdown.3.gz \
 		man/man3/mkd-callbacks.3.gz man/man3/mkd-functions.3.gz \
 		man/man3/mkd-line.3.gz man/man3/mkd_cleanup.3.gz \
 		man/man3/mkd_compile.3.gz man/man3/mkd_css.3.gz \
 		man/man3/mkd_doc_author.3.gz man/man3/mkd_doc_date.3.gz \
 		man/man3/mkd_doc_title.3.gz man/man3/mkd_generatecss.3.gz \
 		man/man3/mkd_generatehtml.3.gz man/man3/mkd_generateline.3.gz \
 		man/man3/mkd_in.3.gz man/man3/mkd_line.3.gz \
 		man/man3/mkd_string.3.gz man/man7/markdown.7.gz \
 		man/man7/mkd-extensions.7.gz
 
 OPTIONS_DEFINE=	EXTRA TAB8 SAMPLES
 OPTIONS_DEFAULT=	EXTRA TAB8
 
 EXTRA_DESC=	Enable all extra features
 TAB8_DESC=	Use a tabstop of 8 (default is 4)
 SAMPLES_DESC=	Install sample programs
 
 EXTRA_CONFIGURE_ON=	--with-dl=both --with-fenced-code --with-github-tags \
 			--with-id-anchor
 
 TAB8_CONFIGURE_ON=	--with-tabstops=8
 
 CFLAGS+=	-fPIC
 
 SAMPLES_INSTALL_TARGET=	install install.samples
 SAMPLES_PLIST_FILES=	bin/makepage bin/mkd2html bin/theme \
 			man/man1/makepage.1.gz man/man1/mkd2html.1.gz \
 			man/man1/theme.1.gz
 
+CONFLICTS_INSTALL=	markdown
+
 .include <bsd.port.mk>
Index: head/textproc/markdown/Makefile
===================================================================
--- head/textproc/markdown/Makefile	(revision 504878)
+++ head/textproc/markdown/Makefile	(revision 504879)
@@ -1,32 +1,34 @@
 # Created by: Anton Berezin <tobez@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	markdown
 PORTVERSION=	1.0.1
 PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	http://daringfireball.net/projects/downloads/
 DISTNAME=	Markdown_${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Text-to-HTML conversion tool for web writers
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/License.text
 
 NO_BUILD=	yes
 USES=		shebangfix perl5 zip
 SHEBANG_FILES=	Markdown.pl
 
 OPTIONS_DEFINE=	DOCS
 
 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}
 	${INSTALL_DATA} "${WRKSRC}/Markdown Readme.text" ${STAGEDIR}${DOCSDIR}/Markdown-Readme.text
 
 .include <bsd.port.mk>