On Thu, Apr 26 2018, Marc Espie <[email protected]> wrote:
> On Thu, Apr 26, 2018 at 05:19:39PM +0200, Jeremie Courreges-Anglas wrote:
>> 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...
>>
> Oh, and does it perform the same if you keep sdlmame, and remove sdlmess
> instead ?
Not directly answering this question because Marc has since pointed me
in the right direction: I had not spotted that sdlmame used subpackages,
so the @pkgpath annotations were slightly off. Also we ought to provide
a quirks entry for sdlmame-tools, and the obvious REVISION bump for
mame.
Sample pkg_add -u run:
--8<--
# env TRUSTED_PKG_PATH=/tmp/mame/ pkg_add -nu
Ambiguous: choose package for sdlmame-0.160p5
a 0: <None>
1: mame-0.197p0
2: sdlmame-0.160p5
Your choice: 0
Ambiguous: choose package for sdlmame-tools-0.160p5
a 0: <None>
1: mame-0.197p0
2: sdlmame-tools-0.160p5
Your choice: 0
Ambiguous: choose package for sdlmess-0.160p3
a 0: <None>
1: mame-0.197p0
2: sdlmess-0.160p3
Your choice: 0
Couldn't find updates for [snip]
# env TRUSTED_PKG_PATH=/tmp/mame-only/ pkg_add -nu
sdlmame-0.160p5+sdlmame-tools-0.160p5+sdlmess-0.160p3->mame-0.197p0: ok
Couldn't find updates for [snip]
# ls /tmp/mame-only /tmp/mame
/tmp/mame:
mame-0.197p0.tgz sdlmame-0.160p5.tgz
sdlmame-tools-0.160p5.tgz sdlmess-0.160p3.tgz
/tmp/mame-only:
mame-0.197p0.tgz
-->8--
So with the updated diff below along with the removal of sdlmame and
sdlmess, the upgrade path is fully automatic. naddy is right about the
@pkgpath lines for xmame in sdlmame and sdlmess, but since xmame was
removed in 2010 I don't feel too strongly about it -> not my call.
ok jca@
Index: devel/quirks/Makefile
===================================================================
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.592
diff -u -p -r1.592 Makefile
--- devel/quirks/Makefile 26 Apr 2018 20:30:23 -0000 1.592
+++ devel/quirks/Makefile 26 Apr 2018 23:43:19 -0000
@@ -5,7 +5,7 @@ CATEGORIES = devel databases
DISTFILES =
# API.rev
-PKGNAME = quirks-2.436
+PKGNAME = quirks-2.437
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.605
diff -u -p -r1.605 Quirks.pm
--- devel/quirks/files/Quirks.pm 26 Apr 2018 20:30:23 -0000 1.605
+++ devel/quirks/files/Quirks.pm 26 Apr 2018 23:43:09 -0000
@@ -526,6 +526,9 @@ my $stem_extensions = {
'pecl-swish' => 'pecl56-swish',
'pecl-uploadprogress' => 'pecl56-uploadprogress',
'rope' => 'py-rope',
+ 'sdlmame' => 'mame',
+ 'sdlmame-tools' => 'mame',
+ 'sdlmess' => 'mame',
};
my $obsolete_reason = {
Index: emulators/mame/Makefile
===================================================================
RCS file: /cvs/ports/emulators/mame/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- emulators/mame/Makefile 25 Apr 2018 10:22:37 -0000 1.8
+++ emulators/mame/Makefile 26 Apr 2018 17:58:53 -0000
@@ -9,6 +9,7 @@ COMMENT = Multiple Arcade Machine Emulat
V = 197
DISTNAME = mame0${V}s
PKGNAME = mame-0.${V}
+REVISION = 0
CATEGORIES = emulators
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 26 Apr 2018 17:55:56 -0000
@@ -2,6 +2,9 @@
@conflict sdlmame-*
@conflict sdlmame-tools-*
@conflict sdlmess-*
+@pkgpath emulators/sdlmame,-main
+@pkgpath emulators/sdlmame,-tools
+@pkgpath emulators/sdlmess
@bin bin/castool
@bin bin/chdman
@bin bin/floptool
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
