+Cc pascal (gas maintainer) On Mon, Dec 11, 2023 at 03:35:09PM +0000, Brian Callahan wrote: > On 12/10/2023 8:52 PM, Theo Buehler wrote: > > I thought someone mentioned a conflict in this thread, but I can't find > > it anymore: > > > > That was a different conflict, and (hopefully) I fixed it here: > https://marc.info/?l=openbsd-ports-cvs&m=170207582213615&w=2
That was it, right. > This one, it seems that binutils correctly has a @conflict on gas-* but > gas is missing a @conflict on binutils-*. Though it does beg the > question of if we need a (now outdated) gas package if we have an > up-to-date binutils package. This was brought up before. As always, it's not as simple as it seems: https://marc.info/?l=openbsd-ports&m=167526722419950&w=2 > In any event, here is a diff for devel/gas. Makes sense. Thanks! ok tb > Index: Makefile > =================================================================== > RCS file: /cvs/ports/devel/gas/Makefile,v > retrieving revision 1.5 > diff -u -p -r1.5 Makefile > --- Makefile 21 Sep 2023 09:49:53 -0000 1.5 > +++ Makefile 11 Dec 2023 15:33:48 -0000 > @@ -3,6 +3,7 @@ COMMENT = GNU assembler > V = 2.31.1 > DISTNAME = binutils-$V > PKGNAME = gas-$V > +REVISION = 0 > > CATEGORIES = devel > > Index: pkg/PLIST > =================================================================== > RCS file: /cvs/ports/devel/gas/pkg/PLIST,v > retrieving revision 1.2 > diff -u -p -r1.2 PLIST > --- pkg/PLIST 11 Mar 2022 18:50:04 -0000 1.2 > +++ pkg/PLIST 11 Dec 2023 15:33:48 -0000 > @@ -1,3 +1,4 @@ > +@conflict binutils-* > @bin bin/gas > @info info/gas.info > @man man/man1/gas.1
