From 05c41b1ddf299752f8924668cca42cc6ac7f5ba2 Mon Sep 17 00:00:00 2001 From: landry Date: Wed, 18 Mar 2009 20:23:11 +0000 Subject: [PATCH] Add appropriate conflict markers between sdlmame, sdlmess, and the various flavours of the xmame/xmess/xmame+xmess multipackages. Tweak ${V} handling and sdlmame RUN_DEPENDS. Diff from Pierre Riteau, thx! --- emulators/sdlmame/Makefile | 12 ++++++------ emulators/sdlmame/pkg/PLIST-tools | 5 ++++- emulators/sdlmess/Makefile | 10 +++++----- emulators/sdlmess/pkg/PLIST | 4 +++- emulators/xmame/Makefile | 8 ++++---- emulators/xmame/pkg/PLIST-main | 4 +++- emulators/xmame/pkg/PLIST-main-sdl | 4 +++- emulators/xmame/pkg/PLIST-mame | 3 ++- emulators/xmame/pkg/PLIST-mame-sdl | 3 ++- emulators/xmame/pkg/PLIST-mess | 4 +++- emulators/xmame/pkg/PLIST-mess-sdl | 4 +++- 11 files changed, 38 insertions(+), 23 deletions(-) diff --git a/emulators/sdlmame/Makefile b/emulators/sdlmame/Makefile index 366774ec87d..de52c5d5bad 100644 --- a/emulators/sdlmame/Makefile +++ b/emulators/sdlmame/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2009/03/17 19:55:09 landry Exp $ +# $OpenBSD: Makefile,v 1.2 2009/03/18 20:23:11 landry Exp $ # Other archs have not been tested ONLY_FOR_ARCHS = amd64 i386 @@ -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}p0 +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 diff --git a/emulators/sdlmame/pkg/PLIST-tools b/emulators/sdlmame/pkg/PLIST-tools index 7859131ab09..a614adfdb63 100644 --- a/emulators/sdlmame/pkg/PLIST-tools +++ b/emulators/sdlmame/pkg/PLIST-tools @@ -1,4 +1,7 @@ -@comment $OpenBSD: PLIST-tools,v 1.1.1.1 2009/03/17 19:55:09 landry Exp $ +@comment $OpenBSD: PLIST-tools,v 1.2 2009/03/18 20:23:11 landry Exp $ +@conflict xmame+xmess-* +@conflict xmame-* +@conflict xmess-* @bin bin/chdman @bin bin/jedutil @bin bin/ldresample diff --git a/emulators/sdlmess/Makefile b/emulators/sdlmess/Makefile index 95cf121c600..8081a0e6a81 100644 --- a/emulators/sdlmess/Makefile +++ b/emulators/sdlmess/Makefile @@ -1,13 +1,13 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2009/03/17 19:58:21 landry Exp $ +# $OpenBSD: Makefile,v 1.2 2009/03/18 20:23:11 landry Exp $ # Other archs have not been tested 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 diff --git a/emulators/sdlmess/pkg/PLIST b/emulators/sdlmess/pkg/PLIST index c5eb9a63f19..7b2023a89cf 100644 --- a/emulators/sdlmess/pkg/PLIST +++ b/emulators/sdlmess/pkg/PLIST @@ -1,4 +1,6 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2009/03/17 19:58:21 landry Exp $ +@comment $OpenBSD: PLIST,v 1.2 2009/03/18 20:23:11 landry Exp $ +@conflict xmame+xmess-* +@conflict xmess-* @bin bin/dat2html @bin bin/imgtool @bin bin/sdlmess diff --git a/emulators/xmame/Makefile b/emulators/xmame/Makefile index 56de3e40f81..3588c5dbeb8 100644 --- a/emulators/xmame/Makefile +++ b/emulators/xmame/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.31 2008/01/04 17:48:34 espie Exp $ +# $OpenBSD: Makefile,v 1.32 2009/03/18 20:23:11 landry Exp $ COMMENT-main= emulates arcade machines and old home computers COMMENT-mame= emulates a massive variety of arcade machines @@ -7,9 +7,9 @@ COMMENT-mess= emulates game consoles and old home computers 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/ \ diff --git a/emulators/xmame/pkg/PLIST-main b/emulators/xmame/pkg/PLIST-main index 05b51682725..ca7c87befef 100644 --- a/emulators/xmame/pkg/PLIST-main +++ b/emulators/xmame/pkg/PLIST-main @@ -1,4 +1,6 @@ -@comment $OpenBSD: PLIST-main,v 1.2 2007/05/13 12:11:25 aanriot Exp $ +@comment $OpenBSD: PLIST-main,v 1.3 2009/03/18 20:23:12 landry Exp $ +@conflict sdlmame-tools-* +@conflict sdlmess-* @conflict xmame-* @conflict xmess-* bin/chdman diff --git a/emulators/xmame/pkg/PLIST-main-sdl b/emulators/xmame/pkg/PLIST-main-sdl index 444a7e422cd..0df52e67ec6 100644 --- a/emulators/xmame/pkg/PLIST-main-sdl +++ b/emulators/xmame/pkg/PLIST-main-sdl @@ -1,4 +1,6 @@ -@comment $OpenBSD: PLIST-main-sdl,v 1.2 2007/05/13 12:11:25 aanriot Exp $ +@comment $OpenBSD: PLIST-main-sdl,v 1.3 2009/03/18 20:23:12 landry Exp $ +@conflict sdlmame-tools-* +@conflict sdlmess-* @conflict xmame-* @conflict xmess-* bin/chdman diff --git a/emulators/xmame/pkg/PLIST-mame b/emulators/xmame/pkg/PLIST-mame index 9b872462795..831f02f5f91 100644 --- a/emulators/xmame/pkg/PLIST-mame +++ b/emulators/xmame/pkg/PLIST-mame @@ -1,4 +1,5 @@ -@comment $OpenBSD: PLIST-mame,v 1.8 2007/05/13 12:11:25 aanriot Exp $ +@comment $OpenBSD: PLIST-mame,v 1.9 2009/03/18 20:23:12 landry Exp $ +@conflict sdlmame-tools-* @conflict xmame+xmess-* @conflict xmess-* bin/romcmp diff --git a/emulators/xmame/pkg/PLIST-mame-sdl b/emulators/xmame/pkg/PLIST-mame-sdl index d842106c446..ce8899e82ac 100644 --- a/emulators/xmame/pkg/PLIST-mame-sdl +++ b/emulators/xmame/pkg/PLIST-mame-sdl @@ -1,4 +1,5 @@ -@comment $OpenBSD: PLIST-mame-sdl,v 1.7 2007/05/13 12:11:25 aanriot Exp $ +@comment $OpenBSD: PLIST-mame-sdl,v 1.8 2009/03/18 20:23:12 landry Exp $ +@conflict sdlmame-tools-* @conflict xmame+xmess-* @conflict xmess-* bin/romcmp diff --git a/emulators/xmame/pkg/PLIST-mess b/emulators/xmame/pkg/PLIST-mess index 3ec8331d11c..2ef9ebae539 100644 --- a/emulators/xmame/pkg/PLIST-mess +++ b/emulators/xmame/pkg/PLIST-mess @@ -1,4 +1,6 @@ -@comment $OpenBSD: PLIST-mess,v 1.7 2005/10/02 01:39:38 fgsch Exp $ +@comment $OpenBSD: PLIST-mess,v 1.8 2009/03/18 20:23:12 landry Exp $ +@conflict sdlmame-tools-* +@conflict sdlmess-* @conflict xmame+xmess-* @conflict xmame-* bin/chdman diff --git a/emulators/xmame/pkg/PLIST-mess-sdl b/emulators/xmame/pkg/PLIST-mess-sdl index e088b4d2a80..8e97145d6a8 100644 --- a/emulators/xmame/pkg/PLIST-mess-sdl +++ b/emulators/xmame/pkg/PLIST-mess-sdl @@ -1,4 +1,6 @@ -@comment $OpenBSD: PLIST-mess-sdl,v 1.6 2005/10/02 01:39:38 fgsch Exp $ +@comment $OpenBSD: PLIST-mess-sdl,v 1.7 2009/03/18 20:23:12 landry Exp $ +@conflict sdlmame-tools-* +@conflict sdlmess-* @conflict xmame+xmess-* @conflict xmame-* bin/chdman