I forgot to make sdlmame and sdlmess conflict with the various xmame
flavors.
Here is a diff which fixes it and also improves a little ${V} handling
in my ports.
The @conflict markers in xmame are different depending on the flavor.
And I didn't bump sdlmame since it doesn't conflict with other ports.
Index: sdlmame/Makefile
===================================================================
RCS file: /cvs/ports/emulators/sdlmame/Makefile,v
retrieving revision 1.1.1.1
diff -p -u -r1.1.1.1 Makefile
--- sdlmame/Makefile 17 Mar 2009 19:55:09 -0000 1.1.1.1
+++ sdlmame/Makefile 18 Mar 2009 11:00:41 -0000
@@ -8,10 +8,10 @@ MULTI_PACKAGES = -main -tools
COMMENT-main = emulates a massive variety of arcades machines
COMMENT-tools = tools to manipulate MAME/MESS roms and disk
images
-V = 130
-DISTNAME = sdlmame0${V}
-PKGNAME-main = sdlmame-0.${V}
-PKGNAME-tools = sdlmame-tools-0.${V}
+V = 0.130
+DISTNAME = sdlmame${V:S/.//}
+PKGNAME-main = sdlmame-${V}
+PKGNAME-tools = sdlmame-tools-${V}p0
CATEGORIES = emulators games
@@ -40,7 +40,7 @@ MODGCC4_LANG = c
LIB_DEPENDS = SDL::devel/sdl gconf-2.>=5::devel/gconf2 \
gdk-x11-2.0.>=0.11,gdk_pixbuf-2.0.>=0.11,gtk-x11-2.0.>=0.11::x11/gtk+2
-RUN_DEPENDS-main = :sdlmame-tools-0.${V}:emulators/sdlmame,-tools
+RUN_DEPENDS-main = :${PKGNAME-tools}:emulators/sdlmame,-tools
USE_GMAKE = Yes
USE_X11 = Yes
Index: sdlmame/pkg/PLIST-tools
===================================================================
RCS file: /cvs/ports/emulators/sdlmame/pkg/PLIST-tools,v
retrieving revision 1.1.1.1
diff -p -u -r1.1.1.1 PLIST-tools
--- sdlmame/pkg/PLIST-tools 17 Mar 2009 19:55:09 -0000 1.1.1.1
+++ sdlmame/pkg/PLIST-tools 18 Mar 2009 11:00:41 -0000
@@ -1,4 +1,7 @@
@comment $OpenBSD: PLIST-tools,v 1.1.1.1 2009/03/17 19:55:09 landry Exp $
+...@conflict xmame+xmess-*
+...@conflict xmame-*
+...@conflict xmess-*
@bin bin/chdman
@bin bin/jedutil
@bin bin/ldresample
Index: sdlmess/Makefile
===================================================================
RCS file: /cvs/ports/emulators/sdlmess/Makefile,v
retrieving revision 1.1.1.1
diff -p -u -r1.1.1.1 Makefile
--- sdlmess/Makefile 17 Mar 2009 19:58:21 -0000 1.1.1.1
+++ sdlmess/Makefile 18 Mar 2009 11:00:41 -0000
@@ -5,9 +5,9 @@ ONLY_FOR_ARCHS = amd64 i386
COMMENT = emulates game consoles and old home computers
-V = 130
-DISTNAME = sdlmess0${V}
-PKGNAME = sdlmess-0.${V}
+V = 0.130
+DISTNAME = sdlmess${V:S/.//}
+PKGNAME = sdlmess-${V}p0
CATEGORIES = emulators games
@@ -36,7 +36,7 @@ MODGCC4_LANG = c
LIB_DEPENDS = SDL::devel/sdl gconf-2.>=5::devel/gconf2 \
gdk-x11-2.0.>=0.11,gdk_pixbuf-2.0.>=0.11,gtk-x11-2.0.>=0.11::x11/gtk+2
-RUN_DEPENDS = :sdlmame-tools-0.${V}:emulators/sdlmame,-tools
+RUN_DEPENDS = :sdlmame-tools-${V}:emulators/sdlmame,-tools
USE_GMAKE = Yes
USE_X11 = Yes
Index: sdlmess/pkg/PLIST
===================================================================
RCS file: /cvs/ports/emulators/sdlmess/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -p -u -r1.1.1.1 PLIST
--- sdlmess/pkg/PLIST 17 Mar 2009 19:58:21 -0000 1.1.1.1
+++ sdlmess/pkg/PLIST 18 Mar 2009 11:00:41 -0000
@@ -1,4 +1,6 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2009/03/17 19:58:21 landry Exp $
+...@conflict xmame+xmess-*
+...@conflict xmess-*
@bin bin/dat2html
@bin bin/imgtool
@bin bin/sdlmess
Index: xmame/Makefile
===================================================================
RCS file: /cvs/ports/emulators/xmame/Makefile,v
retrieving revision 1.31
diff -p -u -r1.31 Makefile
--- xmame/Makefile 4 Jan 2008 17:48:34 -0000 1.31
+++ xmame/Makefile 18 Mar 2009 11:00:41 -0000
@@ -7,9 +7,9 @@ COMMENT-mess= emulates game consoles and
VERSION= 0.104
DISTNAME= xmame-${VERSION}
-PKGNAME-main= xmame+xmess-${VERSION}p2
-PKGNAME-mame= xmame-${VERSION}p1
-PKGNAME-mess= xmess-${VERSION}p1
+PKGNAME-main= xmame+xmess-${VERSION}p3
+PKGNAME-mame= xmame-${VERSION}p2
+PKGNAME-mess= xmess-${VERSION}p2
CATEGORIES= emulators games
MASTER_SITES= ftp://xmame.kaupp.us/pub/xmame/ \
Index: xmame/pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/emulators/xmame/pkg/PLIST-main,v
retrieving revision 1.2
diff -p -u -r1.2 PLIST-main
--- xmame/pkg/PLIST-main 13 May 2007 12:11:25 -0000 1.2
+++ xmame/pkg/PLIST-main 18 Mar 2009 11:00:41 -0000
@@ -1,4 +1,6 @@
@comment $OpenBSD: PLIST-main,v 1.2 2007/05/13 12:11:25 aanriot Exp $
+...@conflict sdlmame-tools-*
+...@conflict sdlmess-*
@conflict xmame-*
@conflict xmess-*
bin/chdman
Index: xmame/pkg/PLIST-main-sdl
===================================================================
RCS file: /cvs/ports/emulators/xmame/pkg/PLIST-main-sdl,v
retrieving revision 1.2
diff -p -u -r1.2 PLIST-main-sdl
--- xmame/pkg/PLIST-main-sdl 13 May 2007 12:11:25 -0000 1.2
+++ xmame/pkg/PLIST-main-sdl 18 Mar 2009 11:00:41 -0000
@@ -1,4 +1,6 @@
@comment $OpenBSD: PLIST-main-sdl,v 1.2 2007/05/13 12:11:25 aanriot Exp $
+...@conflict sdlmame-tools-*
+...@conflict sdlmess-*
@conflict xmame-*
@conflict xmess-*
bin/chdman
Index: xmame/pkg/PLIST-mame
===================================================================
RCS file: /cvs/ports/emulators/xmame/pkg/PLIST-mame,v
retrieving revision 1.8
diff -p -u -r1.8 PLIST-mame
--- xmame/pkg/PLIST-mame 13 May 2007 12:11:25 -0000 1.8
+++ xmame/pkg/PLIST-mame 18 Mar 2009 11:00:41 -0000
@@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST-mame,v 1.8 2007/05/13 12:11:25 aanriot Exp $
+...@conflict sdlmame-tools-*
@conflict xmame+xmess-*
@conflict xmess-*
bin/romcmp
Index: xmame/pkg/PLIST-mame-sdl
===================================================================
RCS file: /cvs/ports/emulators/xmame/pkg/PLIST-mame-sdl,v
retrieving revision 1.7
diff -p -u -r1.7 PLIST-mame-sdl
--- xmame/pkg/PLIST-mame-sdl 13 May 2007 12:11:25 -0000 1.7
+++ xmame/pkg/PLIST-mame-sdl 18 Mar 2009 11:00:41 -0000
@@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST-mame-sdl,v 1.7 2007/05/13 12:11:25 aanriot Exp $
+...@conflict sdlmame-tools-*
@conflict xmame+xmess-*
@conflict xmess-*
bin/romcmp
Index: xmame/pkg/PLIST-mess
===================================================================
RCS file: /cvs/ports/emulators/xmame/pkg/PLIST-mess,v
retrieving revision 1.7
diff -p -u -r1.7 PLIST-mess
--- xmame/pkg/PLIST-mess 2 Oct 2005 01:39:38 -0000 1.7
+++ xmame/pkg/PLIST-mess 18 Mar 2009 11:00:41 -0000
@@ -1,4 +1,6 @@
@comment $OpenBSD: PLIST-mess,v 1.7 2005/10/02 01:39:38 fgsch Exp $
+...@conflict sdlmame-tools-*
+...@conflict sdlmess-*
@conflict xmame+xmess-*
@conflict xmame-*
bin/chdman
Index: xmame/pkg/PLIST-mess-sdl
===================================================================
RCS file: /cvs/ports/emulators/xmame/pkg/PLIST-mess-sdl,v
retrieving revision 1.6
diff -p -u -r1.6 PLIST-mess-sdl
--- xmame/pkg/PLIST-mess-sdl 2 Oct 2005 01:39:38 -0000 1.6
+++ xmame/pkg/PLIST-mess-sdl 18 Mar 2009 11:00:41 -0000
@@ -1,4 +1,6 @@
@comment $OpenBSD: PLIST-mess-sdl,v 1.6 2005/10/02 01:39:38 fgsch Exp $
+...@conflict sdlmame-tools-*
+...@conflict sdlmess-*
@conflict xmame+xmess-*
@conflict xmame-*
bin/chdman
