diff --git a/emulators/xmame/pkg/PLIST b/emulators/xmame/pkg/PLIST
index 77868eea28d..d61460f8a40 100644
--- a/emulators/xmame/pkg/PLIST
+++ b/emulators/xmame/pkg/PLIST
@@ -1,10 +1,10 @@
-@comment $OpenBSD: PLIST,v 1.5 2004/09/15 00:42:05 espie Exp $
-@pkgcfl xmame-*
-@pkgcfl xmess-*
+@comment $OpenBSD: PLIST,v 1.6 2004/09/18 12:39:37 espie Exp $
+@conflict xmame-*
+@conflict xmess-*
 bin/xmame
 bin/xmess
-@man  man/man6/xmame.6
-@man  man/man6/xmess.6
+@man man/man6/xmame.6
+@man man/man6/xmess.6
 share/doc/xmame/
 share/doc/xmame/README
 share/doc/xmame/changes.mame
diff --git a/emulators/xmame/pkg/PLIST-gl b/emulators/xmame/pkg/PLIST-gl
index 0e849ec5f2c..0cf950d6fea 100644
--- a/emulators/xmame/pkg/PLIST-gl
+++ b/emulators/xmame/pkg/PLIST-gl
@@ -1,10 +1,11 @@
-@comment $OpenBSD: PLIST-gl,v 1.4 2002/02/05 15:27:17 naddy Exp $
-@pkgcfl xmame-*
-@pkgcfl xmess-*
+@comment $OpenBSD: PLIST-gl,v 1.5 2004/09/18 12:39:37 espie Exp $
+@conflict xmame-*
+@conflict xmess-*
 bin/xmame
 bin/xmess
-man/man6/xmame.6
-man/man6/xmess.6
+@man man/man6/xmame.6
+@man man/man6/xmess.6
+share/doc/xmame/
 share/doc/xmame/README
 share/doc/xmame/changes.mame
 share/doc/xmame/changes.mess
@@ -15,6 +16,7 @@ share/doc/xmame/dga2.txt
 share/doc/xmame/gamelist.mame
 share/doc/xmame/gamelist.mess
 share/doc/xmame/hsnew.txt
+share/doc/xmame/img/
 share/doc/xmame/img/xmame.jpg
 share/doc/xmame/imgtool.txt
 share/doc/xmame/liesmich.unix
@@ -46,37 +48,35 @@ share/doc/xmame/xmame-gdoc-7.html
 share/doc/xmame/xmame-gdoc-8.html
 share/doc/xmame/xmame-gdoc.html
 share/doc/xmame/xmame.css
+share/xmame/
+share/xmame/cab/
+share/xmame/cab/glmame/
 share/xmame/cab/glmame/cabfront.jpg
 share/xmame/cab/glmame/cabtitle.jpg
 share/xmame/cab/glmame/glmame.cab
+share/xmame/cab/glmamejau/
 share/xmame/cab/glmamejau/cabfront.jpg
 share/xmame/cab/glmamejau/cabside.jpg
 share/xmame/cab/glmamejau/cabtitle.jpg
 share/xmame/cab/glmamejau/glmamejau.cab
+share/xmame/cab/trans/
 share/xmame/cab/trans/trans.cab
 share/xmame/cheat.dat
 share/xmame/hiscore.dat
 share/xmame/history.dat
 share/xmame/xmamerc
+share/xmess/
+share/xmess/cab/
+share/xmess/cab/glmame/
 share/xmess/cab/glmame/cabfront.jpg
 share/xmess/cab/glmame/cabtitle.jpg
 share/xmess/cab/glmame/glmame.cab
+share/xmess/cab/glmamejau/
 share/xmess/cab/glmamejau/cabfront.jpg
 share/xmess/cab/glmamejau/cabside.jpg
 share/xmess/cab/glmamejau/cabtitle.jpg
 share/xmess/cab/glmamejau/glmamejau.cab
+share/xmess/cab/trans/
 share/xmess/cab/trans/trans.cab
 share/xmess/sysinfo.dat
 share/xmess/xmessrc
-@dirrm share/xmess/cab/trans
-@dirrm share/xmess/cab/glmamejau
-@dirrm share/xmess/cab/glmame
-@dirrm share/xmess/cab
-@dirrm share/xmess
-@dirrm share/xmame/cab/trans
-@dirrm share/xmame/cab/glmamejau
-@dirrm share/xmame/cab/glmame
-@dirrm share/xmame/cab
-@dirrm share/xmame
-@dirrm share/doc/xmame/img
-@dirrm share/doc/xmame
diff --git a/emulators/xmame/pkg/PLIST-mame b/emulators/xmame/pkg/PLIST-mame
index 37c812bc1b8..7a79e28017b 100644
--- a/emulators/xmame/pkg/PLIST-mame
+++ b/emulators/xmame/pkg/PLIST-mame
@@ -1,8 +1,9 @@
-@comment $OpenBSD: PLIST-mame,v 1.4 2002/02/05 15:27:17 naddy Exp $
-@pkgcfl xmame+xmess-*
-@pkgcfl xmess-*
+@comment $OpenBSD: PLIST-mame,v 1.5 2004/09/18 12:39:37 espie Exp $
+@conflict xmame+xmess-*
+@conflict xmess-*
 bin/xmame
-man/man6/xmame.6
+@man man/man6/xmame.6
+share/doc/xmame/
 share/doc/xmame/README
 share/doc/xmame/changes.mame
 share/doc/xmame/changes.opengl
@@ -10,6 +11,7 @@ share/doc/xmame/changes.unix
 share/doc/xmame/dga2.txt
 share/doc/xmame/gamelist.mame
 share/doc/xmame/hsnew.txt
+share/doc/xmame/img/
 share/doc/xmame/img/xmame.jpg
 share/doc/xmame/imgtool.txt
 share/doc/xmame/liesmich.unix
@@ -38,10 +40,8 @@ share/doc/xmame/xmame-gdoc-7.html
 share/doc/xmame/xmame-gdoc-8.html
 share/doc/xmame/xmame-gdoc.html
 share/doc/xmame/xmame.css
+share/xmame/
 share/xmame/cheat.dat
 share/xmame/hiscore.dat
 share/xmame/history.dat
 share/xmame/xmamerc
-@dirrm share/xmame
-@dirrm share/doc/xmame/img
-@dirrm share/doc/xmame
diff --git a/emulators/xmame/pkg/PLIST-mame-gl b/emulators/xmame/pkg/PLIST-mame-gl
index bda9dfaffb6..800d4cccea8 100644
--- a/emulators/xmame/pkg/PLIST-mame-gl
+++ b/emulators/xmame/pkg/PLIST-mame-gl
@@ -1,8 +1,9 @@
-@comment $OpenBSD: PLIST-mame-gl,v 1.4 2002/02/05 15:27:17 naddy Exp $
-@pkgcfl xmame+xmess-*
-@pkgcfl xmess-*
+@comment $OpenBSD: PLIST-mame-gl,v 1.5 2004/09/18 12:39:37 espie Exp $
+@conflict xmame+xmess-*
+@conflict xmess-*
 bin/xmame
-man/man6/xmame.6
+@man man/man6/xmame.6
+share/doc/xmame/
 share/doc/xmame/README
 share/doc/xmame/changes.mame
 share/doc/xmame/changes.opengl
@@ -10,6 +11,7 @@ share/doc/xmame/changes.unix
 share/doc/xmame/dga2.txt
 share/doc/xmame/gamelist.mame
 share/doc/xmame/hsnew.txt
+share/doc/xmame/img/
 share/doc/xmame/img/xmame.jpg
 share/doc/xmame/imgtool.txt
 share/doc/xmame/liesmich.unix
@@ -38,22 +40,20 @@ share/doc/xmame/xmame-gdoc-7.html
 share/doc/xmame/xmame-gdoc-8.html
 share/doc/xmame/xmame-gdoc.html
 share/doc/xmame/xmame.css
+share/xmame/
+share/xmame/cab/
+share/xmame/cab/glmame/
 share/xmame/cab/glmame/cabfront.jpg
 share/xmame/cab/glmame/cabtitle.jpg
 share/xmame/cab/glmame/glmame.cab
+share/xmame/cab/glmamejau/
 share/xmame/cab/glmamejau/cabfront.jpg
 share/xmame/cab/glmamejau/cabside.jpg
 share/xmame/cab/glmamejau/cabtitle.jpg
 share/xmame/cab/glmamejau/glmamejau.cab
+share/xmame/cab/trans/
 share/xmame/cab/trans/trans.cab
 share/xmame/cheat.dat
 share/xmame/hiscore.dat
 share/xmame/history.dat
 share/xmame/xmamerc
-@dirrm share/xmame/cab/trans
-@dirrm share/xmame/cab/glmamejau
-@dirrm share/xmame/cab/glmame
-@dirrm share/xmame/cab
-@dirrm share/xmame
-@dirrm share/doc/xmame/img
-@dirrm share/doc/xmame
diff --git a/emulators/xmame/pkg/PLIST-mame-sdl b/emulators/xmame/pkg/PLIST-mame-sdl
index c63594f8e85..d0e6a2ca1bf 100644
--- a/emulators/xmame/pkg/PLIST-mame-sdl
+++ b/emulators/xmame/pkg/PLIST-mame-sdl
@@ -1,8 +1,9 @@
-@comment $OpenBSD: PLIST-mame-sdl,v 1.3 2002/02/05 15:27:17 naddy Exp $
-@pkgcfl xmame+xmess-*
-@pkgcfl xmess-*
+@comment $OpenBSD: PLIST-mame-sdl,v 1.4 2004/09/18 12:39:37 espie Exp $
+@conflict xmame+xmess-*
+@conflict xmess-*
 bin/xmame
-man/man6/xmame.6
+@man man/man6/xmame.6
+share/doc/xmame/
 share/doc/xmame/README
 share/doc/xmame/changes.mame
 share/doc/xmame/changes.opengl
@@ -10,6 +11,7 @@ share/doc/xmame/changes.unix
 share/doc/xmame/dga2.txt
 share/doc/xmame/gamelist.mame
 share/doc/xmame/hsnew.txt
+share/doc/xmame/img/
 share/doc/xmame/img/xmame.jpg
 share/doc/xmame/imgtool.txt
 share/doc/xmame/liesmich.unix
@@ -38,10 +40,8 @@ share/doc/xmame/xmame-gdoc-7.html
 share/doc/xmame/xmame-gdoc-8.html
 share/doc/xmame/xmame-gdoc.html
 share/doc/xmame/xmame.css
+share/xmame/
 share/xmame/cheat.dat
 share/xmame/hiscore.dat
 share/xmame/history.dat
 share/xmame/xmamerc
-@dirrm share/xmame
-@dirrm share/doc/xmame/img
-@dirrm share/doc/xmame
diff --git a/emulators/xmame/pkg/PLIST-mess b/emulators/xmame/pkg/PLIST-mess
index 950af74c971..2eb74c8975f 100644
--- a/emulators/xmame/pkg/PLIST-mess
+++ b/emulators/xmame/pkg/PLIST-mess
@@ -1,8 +1,9 @@
-@comment $OpenBSD: PLIST-mess,v 1.4 2002/02/05 15:27:17 naddy Exp $
-@pkgcfl xmame+xmess-*
-@pkgcfl xmame-*
+@comment $OpenBSD: PLIST-mess,v 1.5 2004/09/18 12:39:37 espie Exp $
+@conflict xmame+xmess-*
+@conflict xmame-*
 bin/xmess
-man/man6/xmess.6
+@man man/man6/xmess.6
+share/doc/xmame/
 share/doc/xmame/README
 share/doc/xmame/changes.mess
 share/doc/xmame/changes.opengl
@@ -10,6 +11,7 @@ share/doc/xmame/changes.unix
 share/doc/xmame/credits.mess
 share/doc/xmame/dga2.txt
 share/doc/xmame/gamelist.mess
+share/doc/xmame/img/
 share/doc/xmame/img/xmame.jpg
 share/doc/xmame/imgtool.txt
 share/doc/xmame/liesmich.unix
@@ -40,8 +42,6 @@ share/doc/xmame/xmame-gdoc-7.html
 share/doc/xmame/xmame-gdoc-8.html
 share/doc/xmame/xmame-gdoc.html
 share/doc/xmame/xmame.css
+share/xmess/
 share/xmess/sysinfo.dat
 share/xmess/xmessrc
-@dirrm share/xmess
-@dirrm share/doc/xmame/img
-@dirrm share/doc/xmame
diff --git a/emulators/xmame/pkg/PLIST-mess-gl b/emulators/xmame/pkg/PLIST-mess-gl
index 0315ea1d0e6..ea95d33e18c 100644
--- a/emulators/xmame/pkg/PLIST-mess-gl
+++ b/emulators/xmame/pkg/PLIST-mess-gl
@@ -1,8 +1,9 @@
-@comment $OpenBSD: PLIST-mess-gl,v 1.4 2002/02/05 15:27:17 naddy Exp $
-@pkgcfl xmame+xmess-*
-@pkgcfl xmame-*
+@comment $OpenBSD: PLIST-mess-gl,v 1.5 2004/09/18 12:39:37 espie Exp $
+@conflict xmame+xmess-*
+@conflict xmame-*
 bin/xmess
-man/man6/xmess.6
+@man man/man6/xmess.6
+share/doc/xmame/
 share/doc/xmame/README
 share/doc/xmame/changes.mess
 share/doc/xmame/changes.opengl
@@ -10,6 +11,7 @@ share/doc/xmame/changes.unix
 share/doc/xmame/credits.mess
 share/doc/xmame/dga2.txt
 share/doc/xmame/gamelist.mess
+share/doc/xmame/img/
 share/doc/xmame/img/xmame.jpg
 share/doc/xmame/imgtool.txt
 share/doc/xmame/liesmich.unix
@@ -40,20 +42,18 @@ share/doc/xmame/xmame-gdoc-7.html
 share/doc/xmame/xmame-gdoc-8.html
 share/doc/xmame/xmame-gdoc.html
 share/doc/xmame/xmame.css
+share/xmess/
+share/xmess/cab/
+share/xmess/cab/glmame/
 share/xmess/cab/glmame/cabfront.jpg
 share/xmess/cab/glmame/cabtitle.jpg
 share/xmess/cab/glmame/glmame.cab
+share/xmess/cab/glmamejau/
 share/xmess/cab/glmamejau/cabfront.jpg
 share/xmess/cab/glmamejau/cabside.jpg
 share/xmess/cab/glmamejau/cabtitle.jpg
 share/xmess/cab/glmamejau/glmamejau.cab
+share/xmess/cab/trans/
 share/xmess/cab/trans/trans.cab
 share/xmess/sysinfo.dat
 share/xmess/xmessrc
-@dirrm share/xmess/cab/trans
-@dirrm share/xmess/cab/glmamejau
-@dirrm share/xmess/cab/glmame
-@dirrm share/xmess/cab
-@dirrm share/xmess
-@dirrm share/doc/xmame/img
-@dirrm share/doc/xmame
diff --git a/emulators/xmame/pkg/PLIST-mess-sdl b/emulators/xmame/pkg/PLIST-mess-sdl
index 8a0c8243472..a1694b907db 100644
--- a/emulators/xmame/pkg/PLIST-mess-sdl
+++ b/emulators/xmame/pkg/PLIST-mess-sdl
@@ -1,8 +1,9 @@
-@comment $OpenBSD: PLIST-mess-sdl,v 1.3 2002/02/05 15:27:17 naddy Exp $
-@pkgcfl xmame+xmess-*
-@pkgcfl xmame-*
+@comment $OpenBSD: PLIST-mess-sdl,v 1.4 2004/09/18 12:39:37 espie Exp $
+@conflict xmame+xmess-*
+@conflict xmame-*
 bin/xmess
-man/man6/xmess.6
+@man man/man6/xmess.6
+share/doc/xmame/
 share/doc/xmame/README
 share/doc/xmame/changes.mess
 share/doc/xmame/changes.opengl
@@ -10,6 +11,7 @@ share/doc/xmame/changes.unix
 share/doc/xmame/credits.mess
 share/doc/xmame/dga2.txt
 share/doc/xmame/gamelist.mess
+share/doc/xmame/img/
 share/doc/xmame/img/xmame.jpg
 share/doc/xmame/imgtool.txt
 share/doc/xmame/liesmich.unix
@@ -40,8 +42,6 @@ share/doc/xmame/xmame-gdoc-7.html
 share/doc/xmame/xmame-gdoc-8.html
 share/doc/xmame/xmame-gdoc.html
 share/doc/xmame/xmame.css
+share/xmess/
 share/xmess/sysinfo.dat
 share/xmess/xmessrc
-@dirrm share/xmess
-@dirrm share/doc/xmame/img
-@dirrm share/doc/xmame
diff --git a/emulators/xmame/pkg/PLIST-sdl b/emulators/xmame/pkg/PLIST-sdl
index f39562b2303..5de7f89745f 100644
--- a/emulators/xmame/pkg/PLIST-sdl
+++ b/emulators/xmame/pkg/PLIST-sdl
@@ -1,10 +1,11 @@
-@comment $OpenBSD: PLIST-sdl,v 1.3 2002/02/05 15:27:17 naddy Exp $
-@pkgcfl xmame-*
-@pkgcfl xmess-*
+@comment $OpenBSD: PLIST-sdl,v 1.4 2004/09/18 12:39:37 espie Exp $
+@conflict xmame-*
+@conflict xmess-*
 bin/xmame
 bin/xmess
-man/man6/xmame.6
-man/man6/xmess.6
+@man man/man6/xmame.6
+@man man/man6/xmess.6
+share/doc/xmame/
 share/doc/xmame/README
 share/doc/xmame/changes.mame
 share/doc/xmame/changes.mess
@@ -15,6 +16,7 @@ share/doc/xmame/dga2.txt
 share/doc/xmame/gamelist.mame
 share/doc/xmame/gamelist.mess
 share/doc/xmame/hsnew.txt
+share/doc/xmame/img/
 share/doc/xmame/img/xmame.jpg
 share/doc/xmame/imgtool.txt
 share/doc/xmame/liesmich.unix
@@ -46,13 +48,11 @@ share/doc/xmame/xmame-gdoc-7.html
 share/doc/xmame/xmame-gdoc-8.html
 share/doc/xmame/xmame-gdoc.html
 share/doc/xmame/xmame.css
+share/xmame/
 share/xmame/cheat.dat
 share/xmame/hiscore.dat
 share/xmame/history.dat
 share/xmame/xmamerc
+share/xmess/
 share/xmess/sysinfo.dat
 share/xmess/xmessrc
-@dirrm share/xmess
-@dirrm share/xmame
-@dirrm share/doc/xmame/img
-@dirrm share/doc/xmame