CVS commit: pkgsrc/textproc

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Apr 17 22:41:39 UTC 2022

Modified Files:
        pkgsrc/textproc/discount: Makefile
        pkgsrc/textproc/multimarkdown: Makefile

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


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/textproc/discount/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/textproc/multimarkdown/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/textproc/discount/Makefile
diff -u pkgsrc/textproc/discount/Makefile:1.11 pkgsrc/textproc/discount/Makefile:1.12
--- pkgsrc/textproc/discount/Makefile:1.11      Fri Sep 18 20:18:55 2020
+++ pkgsrc/textproc/discount/Makefile   Sun Apr 17 22:41:39 2022
@@ -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 @@ LICENSE=      modified-bsd
 
 WRKSRC=                        ${WRKDIR}/${PKGNAME_NOREV}
 
+CONFLICTS+=            multimarkdown-[0-9]*
+
 HAS_CONFIGURE=         YES
 CONFIGURE_SCRIPT=      ./configure.sh
 CONFIGURE_ARGS=                --prefix=${PREFIX}

Index: pkgsrc/textproc/multimarkdown/Makefile
diff -u pkgsrc/textproc/multimarkdown/Makefile:1.13 pkgsrc/textproc/multimarkdown/Makefile:1.14
--- pkgsrc/textproc/multimarkdown/Makefile:1.13 Wed Dec  8 16:06:44 2021
+++ pkgsrc/textproc/multimarkdown/Makefile      Sun Apr 17 22:41:39 2022
@@ -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 @@ LICENSE=      gnu-gpl-v3 OR mit
 
 WRKSRC=                ${WRKDIR}/${GITHUB_PROJECT}-${PKGVERSION_NOREV}
 
+CONFLICTS+=    discount-[0-9]*
+
 USE_CMAKE=     yes
 USE_TOOLS+=    pkg-config
 USE_LANGUAGES= c c++