3 files changed, 24 insertions, 9 deletions

diff --git a/emulators/xmame/Makefile b/emulators/xmame/Makefile
index 880268d8dd53..ba273fabb7cf 100644
--- a/emulators/xmame/Makefile
+++ b/emulators/xmame/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	xmame
-PORTVERSION?=	0.37b13.2
+PORTVERSION?=	0.37b14.1
 CATEGORIES=	emulators
 MASTER_SITES=	http://x.mame.net/download/ \
 		ftp://ftp.kaupp.cx/pub/xmame/ \
@@ -51,7 +51,6 @@ SPOOLGAMES?=	/var/games
 # Docs list
 GENERALDOCS=	changes.unix \
 		liesmich.unix \
-		credits.txt \
 		multiplayer-readme.txt \
 		xmame-doc-1.html \
 		xmame-doc-2.html \
@@ -72,8 +71,10 @@ XMESSDOCS=	changes.mess \
 		gamelist.mess \
 		readme.mess \
 		messold.txt \
-		messroms.txt
-PINMAMEDOCS=	pinmame/simulation.txt \
+		messroms.txt \
+		credits.txt
+PINMAMEDOCS=	credits.txt \
+		pinmame/simulation.txt \
 		pinmame/whatsnew.txt \
 		pinmame/pinmame.txt \
 		pinmame/gamelist.txt \
@@ -93,7 +94,7 @@ ALLDOCS=	${GENERALDOCS} ${PINMAMEDOCS}
 # CPS-2 patches - this enables extra games in MAME.
 .if ${MAMEMESS} == "mame"
 .if defined(WITH_CPS2) && ${WITH_CPS2} == "yes"
-CPS2VERSION=	20010415
+CPS2VERSION=	20010422
 
 PATCH_SITES+=	http://www.win.tue.nl/~stijn/xmame/
 PATCHFILES+=	${DISTNAME}-cps2-${CPS2VERSION}.patch.gz
@@ -125,11 +126,13 @@ post-extract:
 		unzip -q ${DISTDIR}/${DIST_SUBDIR}/cheat.zip cheat.dat
 .else
 PLIST_SUB+=	DATFILES="@comment "
+.if !defined(WITH_DATFILES)
 pre-everything::
 	@${ECHO_MSG} "===> If you want to install additional information with MAME (such as game"
 	@${ECHO_MSG} "     history, cheats, and highscores) use \"make WITH_DATFILES=yes\""
 .endif
 .endif
+.endif
 
 # ASM 68k cores - disabled by default, because they break things (pbobble2
 # being a prime example). These also only work on i386. Should be enabled
@@ -183,6 +186,16 @@ DISPLAY_METHOD=	x11
 .endif
 .endif
 
+# USB joysticks - only enabled on -STABLE because of conflicting USB
+# prototypes in -STABLE & -CURRENT.
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500000
+JOYUSBCOMMENT=\#\ 
+.else
+JOYUSBCOMMENT=
+.endif
+
 # Some simple patches that don't warrant a separate patch
 post-patch:
 	${PERL} -pi -e 's@SDL/@SDL11/@' ${WRKSRC}/src/unix/video-drivers/SDL.c
@@ -202,7 +215,7 @@ do-configure:
 		-e "s@-g bin@-g wheel@g" \
 		-e "s@ARCH  = linux@ARCH  = freebsd@g" \
 		-e "s@# X11_DGA@X11_DGA@g" \
-		-e "s@# JOY_USB@JOY_USB@g" \
+		-e "s@# JOY_USB@${JOYUSBCOMMENT}JOY_USB@g" \
 		-e "s@= x11@= ${DISPLAY_METHOD}@g" \
 		-e "s@= mame@= ${MAMEMESS}@g" \
 		-e "s@# X86_ASM@${ASM_COMMENT}X86_ASM@g" \
@@ -250,4 +263,4 @@ post-install:
 	${INSTALL_DATA} ${WRKDIR}/cheat.dat ${PREFIX}/share/xmame
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/emulators/xmame/distinfo b/emulators/xmame/distinfo
index ea0292b99785..adbd5e507794 100644
--- a/emulators/xmame/distinfo
+++ b/emulators/xmame/distinfo
@@ -1,6 +1,7 @@
 MD5 (xmame/xmame-0.37b13.2.tar.bz2) = 70ec7ae3fba3110a6d85a7f5bfdb84f1
+MD5 (xmame/xmame-0.37b14.1.tar.bz2) = a15c6c5b8f2bbc1e2cda3420c6454bee
 MD5 (xmame/cheat.zip) = dc380436c04780950cee07d3e31bfb0b
 MD5 (xmame/history.zip) = 69da5c33e6a78092c6cd75cbeb737c6a
 MD5 (xmame/hsdat7.zip) = 9e4a7e36448895f13128a675327e34e4
-MD5 (xmame/xmame-0.37b13.2-cps2-20010415.patch.gz) = 16101e5395f6592cc27561b5dd97ae3b
+MD5 (xmame/xmame-0.37b14.1-cps2-20010422.patch.gz) = cd36e3b92acea42e96cc97ae604d6cd2
 MD5 (xmame/xmame-0.37b13.1-pinmame-0.99b1.patch.gz) = 06526474f4bd5afa0874237ffe653d34
diff --git a/emulators/xmame/pkg-plist b/emulators/xmame/pkg-plist
index 364dacfefb0a..63a558947e74 100644
--- a/emulators/xmame/pkg-plist
+++ b/emulators/xmame/pkg-plist
@@ -3,7 +3,6 @@ etc/%%MAMEMESS%%rc.sample
 share/%%MAMEMESS%%/%%MAMEMESS%%rc
 %%PORTDOCS%%share/doc/%%MAMEMESS%%/changes.unix
 %%PORTDOCS%%share/doc/%%MAMEMESS%%/liesmich.unix
-%%PORTDOCS%%share/doc/%%MAMEMESS%%/credits.txt
 %%PORTDOCS%%share/doc/%%MAMEMESS%%/multiplayer-readme.txt
 %%PORTDOCS%%share/doc/%%MAMEMESS%%/xmame-doc-1.html
 %%PORTDOCS%%share/doc/%%MAMEMESS%%/xmame-doc-2.html
@@ -23,6 +22,7 @@ share/%%MAMEMESS%%/%%MAMEMESS%%rc
 %%MAMEONLY%%%%PORTDOCS%%share/doc/xmame/changes.mame
 %%MAMEONLY%%%%PORTDOCS%%share/doc/xmame/gamelist.mame
 %%MAMEONLY%%%%PORTDOCS%%share/doc/xmame/readme.mame
+%%MESSONLY%%%%PORTDOCS%%share/doc/credits.txt
 %%MESSONLY%%%%PORTDOCS%%share/doc/xmess/changes.mess
 %%MESSONLY%%%%PORTDOCS%%share/doc/xmess/gamelist.mess
 %%MESSONLY%%%%PORTDOCS%%share/doc/xmess/readme.mess
@@ -66,6 +66,7 @@ share/%%MAMEMESS%%/%%MAMEMESS%%rc
 %%MESSONLY%%%%PORTDOCS%%share/doc/xmess/sysinfo/t1000hx.txt
 %%MESSONLY%%%%PORTDOCS%%share/doc/xmess/sysinfo/vip.txt
 %%MESSONLY%%%%PORTDOCS%%@dirrm share/doc/xmess/sysinfo
+%%PINMAMEONLY%%%%PORTDOCS%%share/doc/credits.txt
 %%PINMAMEONLY%%%%PORTDOCS%%share/doc/xpinmame/simulation.txt
 %%PINMAMEONLY%%%%PORTDOCS%%share/doc/xpinmame/whatsnew.txt
 %%PINMAMEONLY%%%%PORTDOCS%%share/doc/xpinmame/pinmame.txt