[pkgsrc/trunk]: pkgsrc/textproc discount, multimarkdown: add CONFLICTS with e...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/986a08a6a729
branches:  trunk
changeset: 377201:986a08a6a729
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sun Apr 17 22:41:39 2022 +0000

description:
discount, multimarkdown: add CONFLICTS with each other due to bin/markdown

diffstat:

 textproc/discount/Makefile      |  5 +++--
 textproc/multimarkdown/Makefile |  4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diffs (37 lines):

diff -r 39e88617de5b -r 986a08a6a729 textproc/discount/Makefile
--- a/textproc/discount/Makefile        Sun Apr 17 21:16:29 2022 +0000
+++ b/textproc/discount/Makefile        Sun Apr 17 22:41:39 2022 +0000
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2020/09/18 20:18:55 schmonz Exp $
-#
+# $NetBSD: Makefile,v 1.12 2022/04/17 22:41:39 wiz Exp $
 
 DISTNAME=      discount-2.2.7
 CATEGORIES=    textproc
@@ -13,6 +12,8 @@
 
 WRKSRC=                        ${WRKDIR}/${PKGNAME_NOREV}
 
+CONFLICTS+=            multimarkdown-[0-9]*
+
 HAS_CONFIGURE=         YES
 CONFIGURE_SCRIPT=      ./configure.sh
 CONFIGURE_ARGS=                --prefix=${PREFIX}
diff -r 39e88617de5b -r 986a08a6a729 textproc/multimarkdown/Makefile
--- a/textproc/multimarkdown/Makefile   Sun Apr 17 21:16:29 2022 +0000
+++ b/textproc/multimarkdown/Makefile   Sun Apr 17 22:41:39 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2021/12/08 16:06:44 adam Exp $
+# $NetBSD: Makefile,v 1.14 2022/04/17 22:41:39 wiz Exp $
 
 DISTNAME=      multimarkdown-6.5.2
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=fletcher/}
@@ -13,6 +13,8 @@
 
 WRKSRC=                ${WRKDIR}/${GITHUB_PROJECT}-${PKGVERSION_NOREV}
 
+CONFLICTS+=    discount-[0-9]*
+
 USE_CMAKE=     yes
 USE_TOOLS+=    pkg-config
 USE_LANGUAGES= c c++