On 2018/06/28 16:18, Sebastien Marie wrote:
> On Thu, Jun 28, 2018 at 09:43:13AM -0400, Daniel Jakots wrote:
> > On Thu, 28 Jun 2018 08:15:05 +0100, Stuart Henderson
> > <[email protected]> wrote:
> >
> > > On 2018/06/28 00:53, Brian Callahan wrote:
> > > > Hi ports --
> > > >
> > > > Attached is a new port, devel/py-magic. py-magic is a Python module
> > > > for file type identification using libmagic.
> > > >
> > > > ---
> > > > pkg/DESCR:
> > > > python-magic is a module that uses ctypes to access the libmagic
> > > > file type identification library. It makes use of the local magic
> > > > database and supports both textual and MIME-type output.
> > > > ---
> > > >
> > > > This is a dependency for the upcoming diffoscope port (see next
> > > > email).
> >
> > Yay, I'm glad to see this, I wanted to do it for a long time :)
> > It's also needed for other ports.
> >
> > > This has a conflict:
> > >
> > > $ make plist
> > > Warning: py-magic-0.4.15 conflicts with py-libmagic-5.32
> > > (devel/py-libmagic):/usr/local/lib/python2.7/site-packages/magic.py
> > > /usr/local/lib/python2.7/site-packages/magic.pyc
> > > /usr/local/lib/python2.7/site-packages/magic.pyc
> > > /usr/ports/openbsd-wip/devel/py-magic/pkg/PLIST
> > > changed
> >
> > Yes and py-libmagic is only needed by print/py-relatorio so my plan was
> > to check if py-relatorio could be switched to it but I didn't go
> > further than asking semarie about it.
>
> there is no problem for py-relatorio for switching to py-magic instead
> of py-libmagic. And in fact, py-magic is the intented dependency for
> upstream (and from reading py-relatorio code, it is possible that with
> py-libmagic, it doesn't work as expected).
>
> I ran the testsuite of py3-relatorio with both (py3-magic and
> py3-libmagic), and the result are same: all 23 tests passes.
>
> If py-libmagic has no other reverse dependencies than py-relatorio, I
> would be in favor to remove it, and use py-magic as dependency instead
> of. Below a diff that do it, and while here taking maintainership of
> py-relatorio.
Great, I'm OK with that approach.
I think if we're doing this, it would make sense to auto update py-libmagic
to py-magic. We'll need some magic in devel/py-magic so that conflict/pkgpath
lines are set correctly, I think this should do the trick:
@conflict ${MODPY_PY_PREFIX}libmagic-*
@pkgpath devel/py-libmagic${MODPY_FLAVOR}
> Sebastien Marie
>
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/print/py-relatorio/Makefile,v
> retrieving revision 1.8
> diff -u -p -r1.8 Makefile
> --- Makefile 12 Dec 2017 01:45:10 -0000 1.8
> +++ Makefile 28 Jun 2018 14:03:49 -0000
> @@ -3,6 +3,8 @@
> COMMENT= templating library able to output odt and pdf files
>
> MODPY_EGG_VERSION= 0.8.0
> +REVISION= 0
> +
> DISTNAME= relatorio-${MODPY_EGG_VERSION}
> PKGNAME= py-${DISTNAME}
>
> @@ -10,6 +12,8 @@ CATEGORIES= print textproc
>
> HOMEPAGE= http://relatorio.tryton.org/
>
> +MAINTAINER = Sebastien Marie <[email protected]>
> +
> # GPLv3
> PERMIT_PACKAGE_CDROM= Yes
>
> @@ -24,7 +28,7 @@ FLAVORS= python3
>
> RUN_DEPENDS= www/py-genshi${MODPY_FLAVOR} \
> textproc/py-lxml${MODPY_FLAVOR} \
> - devel/py-libmagic${MODPY_FLAVOR}
> + devel/py-magic${MODPY_FLAVOR}
>
> .if !${FLAVOR:Mpython3}
> RUN_DEPENDS+= graphics/pycha \
>
