cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add appropriate conflict markers between sdlmame, sdlmess, and the

Browse Source 
various flavours of the xmame/xmess/xmame+xmess multipackages.
Tweak ${V} handling and sdlmame RUN_DEPENDS.
Diff from Pierre Riteau, thx!
This commit is contained in:
landry 2009-03-18 20:23:11 +00:00
parent a6effd3fb8
commit 05c41b1ddf
11 changed files with 38 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
emulators/sdlmame/Makefile
View File

@ -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

5
emulators/sdlmame/pkg/PLIST-tools
View File

@ -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

10
emulators/sdlmess/Makefile
View File

@ -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

4
emulators/sdlmess/pkg/PLIST
View File

@ -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

8
emulators/xmame/Makefile
View File

@ -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/ \

4
emulators/xmame/pkg/PLIST-main
View File

@ -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

4
emulators/xmame/pkg/PLIST-main-sdl
View File

@ -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

3
emulators/xmame/pkg/PLIST-mame
View File

@ -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

3
emulators/xmame/pkg/PLIST-mame-sdl
View File

@ -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

4
emulators/xmame/pkg/PLIST-mess
View File

@ -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

4
emulators/xmame/pkg/PLIST-mess-sdl
View File

@ -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