On Sat, May 08, 2010 at 03:53:33PM +0200, Landry Breuil wrote: > So... cvs delete emulators/xmame & set corresponding > pkgpath/pkgname/quirks/whatever in sdlmess/sdlmame so > that xmame/xmess users are automatically updated to > their sdl* successors ? > Icanhazdiff ?
does this look right? wasn't sure what to do about xmame+xmess, as far as which of sdlmess and sdlmame should be the successor. is it possible to add an ambiguity (the user would have to choose between sdlmame or sdlmess) in quirks? sdlmess already has @conflict markers for xmame+xmess-* and xmess-*. -- jake...@sdf.lonestar.org SDF Public Access UNIX System - http://sdf.lonestar.org Index: devel/quirks/Makefile =================================================================== RCS file: /cvs/ports/devel/quirks/Makefile,v retrieving revision 1.14 diff -u -p devel/quirks/Makefile --- devel/quirks/Makefile 7 May 2010 15:53:34 -0000 1.14 +++ devel/quirks/Makefile 8 May 2010 18:10:25 -0000 @@ -5,7 +5,7 @@ CATEGORIES = devel databases DISTFILES = # API.rev -PKGNAME = quirks-1.12 +PKGNAME = quirks-1.13 PKG_ARCH = * MAINTAINER = Marc Espie <es...@openbsd.org> Index: devel/quirks/files/Quirks.pm =================================================================== RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v retrieving revision 1.18 diff -u -p devel/quirks/files/Quirks.pm --- devel/quirks/files/Quirks.pm 7 May 2010 15:53:34 -0000 1.18 +++ devel/quirks/files/Quirks.pm 8 May 2010 18:10:25 -0000 @@ -139,6 +139,9 @@ my $stem_extensions = { 'pwlib' => 'ptlib', 'e2fs-uuid' => 'e2fsprogs', 'puppet' => 'ruby-puppet', + 'xmame+xmess' => 'sdlmame', + 'xmame' => 'sdlmame', + 'xmess' => 'sdlmess', }; # ->is_base_system($handle, $state): Index: emulators/sdlmame/Makefile =================================================================== RCS file: /cvs/ports/emulators/sdlmame/Makefile,v retrieving revision 1.8 diff -u -p emulators/sdlmame/Makefile --- emulators/sdlmame/Makefile 27 Apr 2010 13:00:25 -0000 1.8 +++ emulators/sdlmame/Makefile 8 May 2010 18:10:25 -0000 @@ -10,7 +10,7 @@ COMMENT-tools = tools to manipulate MAME/MESS roms an V = 0.132 DISTNAME = sdlmame${V:S/.//} -PKGNAME-main = sdlmame-${V}p2 +PKGNAME-main = sdlmame-${V}p3 PKGNAME-tools = sdlmame-tools-${V}p1 CATEGORIES = emulators games Index: emulators/sdlmame/pkg/PLIST-main =================================================================== RCS file: /cvs/ports/emulators/sdlmame/pkg/PLIST-main,v retrieving revision 1.3 diff -u -p emulators/sdlmame/pkg/PLIST-main --- emulators/sdlmame/pkg/PLIST-main 27 Apr 2010 13:00:25 -0000 1.3 +++ emulators/sdlmame/pkg/PLIST-main 8 May 2010 18:10:25 -0000 @@ -1,4 +1,6 @@ @comment $OpenBSD: PLIST-main,v 1.3 2010/04/27 13:00:25 jasper Exp $ +...@conflict xmame+xmess-* +...@conflict xmame-* @bin bin/sdlmame share/doc/sdlmame/ share/doc/sdlmame/SDLMAME.txt