On Wed, Apr 25 2018, Frederic Cambus <[email protected]> wrote: > Hi ports@, > > We now have an up-to-date emulators/mame port for which we can build > and distribute binary packages for amd64 and i386. More information > here: https://marc.info/?l=openbsd-ports&m=151514926004836&w=2 > > I think it's time to remove emulators/sdlmame and emulators/sdlmess. > MAME and MESS merged in 2015 so emulators/mame contains both. > > Diff to add @pkgpath markers to emulators/mame and quirks entry below. > > Comments? OK to remove?
Looks like you can't upgrade to mame if you have both sdlmame and sdlmess installed: env TRUSTED_PKG_PATH=/usr/ports/packages/amd64/all/ pkg_add -u [sdlmame-0.160p5]sdlmess-0.160p3->mame-0.197: internal conflict between mame-0.197 and sdlmame-0.160p5 After removing sdlmame: env TRUSTED_PKG_PATH=/usr/ports/packages/amd64/all/ pkg_add -u sdlmess-0.160p3->mame-0.197: ok Dunno if that's a limitation in pkg_add or if some annotations/quirks are missing. Maybe espie knows better? I'm tempted to ok this anyway... > Index: emulators/mame/pkg/PLIST > =================================================================== > RCS file: /cvs/ports/emulators/mame/pkg/PLIST,v > retrieving revision 1.1.1.1 > diff -u -p -r1.1.1.1 PLIST > --- emulators/mame/pkg/PLIST 24 Jan 2018 20:56:12 -0000 1.1.1.1 > +++ emulators/mame/pkg/PLIST 25 Apr 2018 11:46:10 -0000 > @@ -2,6 +2,8 @@ > @conflict sdlmame-* > @conflict sdlmame-tools-* > @conflict sdlmess-* > +@pkgpath emulators/sdlmame > +@pkgpath emulators/sdlmess > @bin bin/castool > @bin bin/chdman > @bin bin/floptool > Index: devel/quirks/Makefile > =================================================================== > RCS file: /cvs/ports/devel/quirks/Makefile,v > retrieving revision 1.587 > diff -u -p -r1.587 Makefile > --- devel/quirks/Makefile 25 Apr 2018 07:45:16 -0000 1.587 > +++ devel/quirks/Makefile 25 Apr 2018 11:46:10 -0000 > @@ -5,7 +5,7 @@ CATEGORIES = devel databases > DISTFILES = > > # API.rev > -PKGNAME = quirks-2.431 > +PKGNAME = quirks-2.432 > PKG_ARCH = * > MAINTAINER = Marc Espie <[email protected]> > > Index: devel/quirks/files/Quirks.pm > =================================================================== > RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v > retrieving revision 1.600 > diff -u -p -r1.600 Quirks.pm > --- devel/quirks/files/Quirks.pm 25 Apr 2018 07:45:17 -0000 1.600 > +++ devel/quirks/files/Quirks.pm 25 Apr 2018 11:46:10 -0000 > @@ -507,6 +507,8 @@ my $stem_extensions = { > 'osh' => 'etsh', > 'gnome-themes-standard' => 'gnome-themes-extra', > 'open-cobol' => 'gnucobol', > + 'sdlmame' => 'mame', > + 'sdlmess' => 'mame', > }; > > my $obsolete_reason = { > -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
