repair conflict accidentally introduced in the recent update

reported by rsadowski@
This commit is contained in:
daniel 2021-02-26 07:09:55 +00:00
parent 6cdb79d4f3
commit 8c7916afe4
2 changed files with 7 additions and 3 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.8 2021/01/18 00:15:37 daniel Exp $
# $OpenBSD: Makefile,v 1.9 2021/02/26 07:09:55 daniel Exp $
COMMENT= parser for the CommonMark markdown spec
@ -6,6 +6,7 @@ MODPY_EGG_VERSION= 0.9.1
DISTNAME= commonmark-${MODPY_EGG_VERSION}
PKGNAME= py-${DISTNAME}
CATEGORIES= textproc
REVISION= 0
MAINTAINER= Sebastian Reitenbach <sebastia@openbsd.org>
@ -24,4 +25,7 @@ RUN_DEPENDS= devel/py-future${MODPY_FLAVOR}
TEST_DEPENDS= devel/flake8 \
devel/py-hypothesis${MODPY_FLAVOR}
post-install:
mv ${PREFIX}/bin/cmark ${PREFIX}/bin/commonmark
.include <bsd.port.mk>

View File

@ -1,7 +1,7 @@
@comment $OpenBSD: PLIST,v 1.3 2021/01/18 00:15:38 daniel Exp $
@comment $OpenBSD: PLIST,v 1.4 2021/02/26 07:09:55 daniel Exp $
@conflict py-commonmark-*
@pkgpath textproc/py-commonmark
bin/cmark
bin/commonmark
lib/python${MODPY_VERSION}/site-packages/commonmark/
lib/python${MODPY_VERSION}/site-packages/commonmark-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/commonmark-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO