diff options
| author | wiz <wiz@pkgsrc.org> | 2022-04-17 22:41:39 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2022-04-17 22:41:39 +0000 |
| commit | b36b360c3379e8d343f1a60823e1d080c7e5afaf (patch) | |
| tree | 99b32e559729a48d1369d82c037caf26a126af45 | |
| parent | 2b2e90b597673507af52f0ee751f75df9c4bc665 (diff) | |
| download | pkgsrc-b36b360c3379e8d343f1a60823e1d080c7e5afaf.tar.gz | |
discount, multimarkdown: add CONFLICTS with each other due to bin/markdown
| -rw-r--r-- | textproc/discount/Makefile | 5 | ||||
| -rw-r--r-- | textproc/multimarkdown/Makefile | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/textproc/discount/Makefile b/textproc/discount/Makefile index 35cba216933..bc4316a44af 100644 --- a/textproc/discount/Makefile +++ b/textproc/discount/Makefile @@ -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} diff --git a/textproc/multimarkdown/Makefile b/textproc/multimarkdown/Makefile index 8b7a159eafe..23450415034 100644 --- a/textproc/multimarkdown/Makefile +++ b/textproc/multimarkdown/Makefile @@ -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++ |