On Mon 10/08/2020 15:04, Stuart Henderson wrote: > On 2020/08/10 16:00, Paco Esteban wrote: > > > .include <bsd.port.mk> > > > diff --git math/py-numexpr/pkg/PLIST math/py-numexpr/pkg/PLIST > > > index 562a4deac37..c9f63abe582 100644 > > > --- math/py-numexpr/pkg/PLIST > > > +++ math/py-numexpr/pkg/PLIST > > > @@ -1,4 +1,6 @@ > > > @comment $OpenBSD: PLIST,v 1.1.1.1 2017/04/23 17:45:20 shadchin Exp $ > > > +@conflict py-numexpr-* > > > +@pkgpath math/py-numexpr > > > > This is probably ok but I've seen (even committed myself) conflict lines > > both like you're doing and with `category/py-port-*`. Not sure which > > one is preferred (as they both seem to be ok). > > category/ is wrong for @conflict, it must be package name. > these need fixing: > > $ ag -G pkg/P @conflict | grep conflict.*/ > converters/p5-Net-IDN-Encode/pkg/PLIST:2:@conflict > converters/p5-IDNA-Punycode-* > mail/p5-Email-MIME/pkg/PLIST:2:@conflict mail/p5-Email-MIME-Creator-* > mail/p5-Email-MIME/pkg/PLIST:3:@conflict mail/p5-Email-MIME-Modifier-* > net/py-aiodns/pkg/PLIST:2:@conflict net/py-aiodns-* > net/py-cares/pkg/PLIST:2:@conflict net/py-cares-*
I have a diff for the above, and will commit unless someone beats me to it.
