Re: package conflicts to fix or process somehow
Am Montag, September 17, 2018 12:10 CEST, Stuart Henderson
schrieb:
> On 2018/09/17 11:14, Marc Espie wrote:
> > On Mon, Sep 17, 2018 at 08:48:02AM +0200, Sebastian Reitenbach wrote:
> > > Hi,
> > >
> > > Am Samstag, September 15, 2018 12:12 CEST, Marc Espie
> > > 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.
> >
>
> Sorry I missed this when I was reviewing textproc/cmark, obvious diff:
you were faster, looks quite similar to mine, sure OK ;)
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/textproc/py-commonmark/Makefile,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 Makefile
> --- Makefile 2 Nov 2017 09:32:36 - 1.1.1.1
> +++ Makefile 17 Sep 2018 10:09:30 -
> @@ -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,6 @@ TEST_DEPENDS= ${RUN_DEPENDS} \
> devel/py-hypothesis${MODPY_FLAVOR}
>
> post-install:
> - for i in ${PREFIX}/bin/*; do \
> - mv $${i} $${i}${MODPY_BIN_SUFFIX} ;\
> - done
> + mv ${PREFIX}/bin/cmark ${PREFIX}/bin/commonmark${MODPY_BIN_SUFFIX}
>
> .include
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/textproc/py-commonmark/pkg/PLIST,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 PLIST
> --- pkg/PLIST 2 Nov 2017 09:32:36 - 1.1.1.1
> +++ pkg/PLIST 17 Sep 2018 10:09:30 -
> @@ -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
>
Re: package conflicts to fix or process somehow
Am Montag, September 17, 2018 11:14 CEST, Marc Espie 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
> > 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
--- Makefile2 Nov 2017 09:32:36 - 1.1.1.1
+++ Makefile17 Sep 2018 10:24:21 -
@@ -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
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 - 1.1.1.1
+++ pkg/PLIST 17 Sep 2018 10:24:21 -
@@ -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
Re: package conflicts to fix or process somehow
On 2018/09/17 11:14, Marc Espie wrote:
> On Mon, Sep 17, 2018 at 08:48:02AM +0200, Sebastian Reitenbach wrote:
> > Hi,
> >
> > Am Samstag, September 15, 2018 12:12 CEST, Marc Espie
> > 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.
>
Sorry I missed this when I was reviewing textproc/cmark, obvious diff:
Index: Makefile
===
RCS file: /cvs/ports/textproc/py-commonmark/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile2 Nov 2017 09:32:36 - 1.1.1.1
+++ Makefile17 Sep 2018 10:09:30 -
@@ -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,6 @@ TEST_DEPENDS= ${RUN_DEPENDS} \
devel/py-hypothesis${MODPY_FLAVOR}
post-install:
- for i in ${PREFIX}/bin/*; do \
- mv $${i} $${i}${MODPY_BIN_SUFFIX} ;\
- done
+ mv ${PREFIX}/bin/cmark ${PREFIX}/bin/commonmark${MODPY_BIN_SUFFIX}
.include
Index: pkg/PLIST
===
RCS file: /cvs/ports/textproc/py-commonmark/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 2 Nov 2017 09:32:36 - 1.1.1.1
+++ pkg/PLIST 17 Sep 2018 10:09:30 -
@@ -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
Re: package conflicts to fix or process somehow
On Mon, Sep 17, 2018 at 08:48:02AM +0200, Sebastian Reitenbach wrote:
> Hi,
>
> Am Samstag, September 15, 2018 12:12 CEST, Marc Espie
> 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.
Re: package conflicts to fix or process somehow
Hi,
Am Samstag, September 15, 2018 12:12 CEST, Marc Espie 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
cheers,
Sebastian
Re: package conflicts to fix or process somehow
On Sat, 15 Sep 2018 12:12:42 +0200, Marc Espie wrote:
> py-dtopt-0.1p6(devel/py-dtopt),py3-dtopt-0.1p6(devel/py-dtopt,python3)
> /usr/local/share/doc/py-dtopt/index.txt
Yes, Elias pointed it out, this port should probably be removed (see
Subject: [REMOVE] devel/py-dtopt [2/2])
> py-setuptools_trial-0.6.0(devel/py-setuptools_trial),py3-setuptools_trial-0.6.0(devel/py-setuptools_trial,python3)
> /usr/local/share/doc/python-setuptools_trial/COPYING.SPL.txt
> /usr/local/share/doc/python-setuptools_trial/README.rst
imho there's no point in shipping these files. But if someone
disagrees, feel free to work on a diff :)
Index: Makefile
===
RCS file: /cvs/ports/devel/py-setuptools_trial/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile22 Jun 2018 22:02:09 - 1.1.1.1
+++ Makefile16 Sep 2018 14:45:15 -
@@ -5,6 +5,7 @@ COMMENT=setuptools plugin for unit tes
MODPY_EGG_VERSION= 0.6.0
DISTNAME= setuptools_trial-${MODPY_EGG_VERSION}
PKGNAME= py-${DISTNAME}
+REVISION= 0
CATEGORIES=devel
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/py-setuptools_trial/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 22 Jun 2018 22:02:09 - 1.1.1.1
+++ pkg/PLIST 16 Sep 2018 14:45:15 -
@@ -14,6 +14,6 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/setuptools_trial/${MODPY_PYCACHE}setuptools_trial.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/setuptools_trial/_version.py
lib/python${MODPY_VERSION}/site-packages/setuptools_trial/setuptools_trial.py
-share/doc/python-setuptools_trial/
-share/doc/python-setuptools_trial/COPYING.SPL.txt
-share/doc/python-setuptools_trial/README.rst
+@comment share/doc/python-setuptools_trial/
+@comment share/doc/python-setuptools_trial/COPYING.SPL.txt
+@comment share/doc/python-setuptools_trial/README.rst
package conflicts to fix or process somehow
(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. cftp-0.12p2(net/cftp),py-twisted-18.7.0(devel/py-twisted) /usr/local/bin/cftp chicken-4.13.0p0(lang/chicken/core),mono-5.12.0.226(lang/mono) /usr/local/bin/csc /usr/local/bin/csi cmark-0.28.3(textproc/cmark),py-commonmark-0.7.4(textproc/py-commonmark) /usr/local/bin/cmark fcitx-4.2.9.5p2(inputmethods/fcitx,-main),scim-fcitx-3.1.1p5(inputmethods/scim-fcitx) /usr/local/bin/createPYMB /usr/local/bin/mb2txt /usr/local/bin/txt2mb google-cloud-sdk-215.0.0(sysutils/google-cloud-sdk),gsutil-3.1(telephony/gsutil) /usr/local/bin/gsutil py-dtopt-0.1p6(devel/py-dtopt),py3-dtopt-0.1p6(devel/py-dtopt,python3) /usr/local/share/doc/py-dtopt/index.txt py-setuptools_trial-0.6.0(devel/py-setuptools_trial),py3-setuptools_trial-0.6.0(devel/py-setuptools_trial,python3) /usr/local/share/doc/python-setuptools_trial/COPYING.SPL.txt /usr/local/share/doc/python-setuptools_trial/README.rst
