Am Montag, September 17, 2018 11:14 CEST, Marc Espie <es...@nerim.net> schrieb:
> On Mon, Sep 17, 2018 at 08:48:02AM +0200, Sebastian Reitenbach wrote:
> > Hi,
> >
> > Am Samstag, September 15, 2018 12:12 CEST, Marc Espie <es...@nerim.net>
> > schrieb:
> >
> > > (resend, something burped on the first try, I can't find it in the
> > > archives)
> > >
> > > The python stuff seems to be files to rename or remove.
> > >
> > > Chicken and mono do install stuff that's WAY too short.
> > >
> > > The rest, well, that's for maintainer to decide.
> > >
> > > Anyway, those are unregistered conflicts right now.
> > >
> > > If not fixed soon, they should be marked as conflicting.
> > >
> >
> > > cmark-0.28.3(textproc/cmark),py-commonmark-0.7.4(textproc/py-commonmark)
> > > /usr/local/bin/cmark
> >
> > I'm looking into py-commonmark, which has this in the post-install:
> > post-install:
> > for i in ${PREFIX}/bin/*; do \
> > mv $${i} $${i}${MODPY_BIN_SUFFIX} ;\
> > done
> >
> > Is the MODPY_BIN_SUFFIX gone?
> > This port only installs python3 FLAVOR, and it's the only binary that goes
> > to ${PREFIX}/bin, so should be easy to rename the 'cmark' to 'commonmark'
> > to resolve the conflict.
> > Just wanted to know if I didn't miss anything with regard to the
> > MODPY_BIN_SUFFIX?
> > On an a bit older box, cmark installs as cmark-3
>
> I see
> SUBDIR += py-commonmark
> SUBDIR += py-commonmark,python3
>
> in the category makefile.
>
> and we are talking about the python2 flavor.
>
> Adjusting the binary name to commonmark or whatever is cool for me.
>
Then this should do the trick, OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/textproc/py-commonmark/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- Makefile 2 Nov 2017 09:32:36 -0000 1.1.1.1
+++ Makefile 17 Sep 2018 10:24:21 -0000
@@ -3,6 +3,7 @@
COMMENT= parser for the CommonMark markdown spec
MODPY_EGG_VERSION= 0.7.4
+REVISION= 0
DISTNAME= CommonMark-${MODPY_EGG_VERSION}
PKGNAME= py-commonmark-${MODPY_EGG_VERSION}
CATEGORIES= textproc
@@ -25,8 +26,8 @@
devel/py-hypothesis${MODPY_FLAVOR}
post-install:
- for i in ${PREFIX}/bin/*; do \
- mv $${i} $${i}${MODPY_BIN_SUFFIX} ;\
- done
+ # cmark binary conflicts with textproc/cmark
+ mv ${PREFIX}/bin/cmark \
+ ${PREFIX}/bin/commonmark${MODPY_BIN_SUFFIX}
.include <bsd.port.mk>
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/textproc/py-commonmark/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST
--- pkg/PLIST 2 Nov 2017 09:32:36 -0000 1.1.1.1
+++ pkg/PLIST 17 Sep 2018 10:24:21 -0000
@@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2017/11/02 09:32:36 sebastia Exp $
-bin/cmark${MODPY_BIN_SUFFIX}
+bin/commonmark${MODPY_BIN_SUFFIX}
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
