5 files changed, 37 insertions, 11 deletions

diff --git a/emulators/xmame/Makefile b/emulators/xmame/Makefile
index b887e743b013..c295fa40ff17 100644
--- a/emulators/xmame/Makefile
+++ b/emulators/xmame/Makefile
@@ -176,11 +176,13 @@ LIB_DEPENDS=    SDL-1.1.3:${PORTSDIR}/devel/sdl-devel
 SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
 MAKE_ENV+=	SDL_CONFIG=${SDL_CONFIG}
 DISPLAY_METHOD=	SDL
+.if !defined(WITH_SDL)
 pre-everything::
 	@${ECHO_MSG} "===> If you don't want ${MAMEMESS:U} to be built with SDL support,"
 	@${ECHO_MSG} "     use \"make WITH_SDL=no\""
-	@${ECHO_MSG} "===> You can also build ${MAMEMESS:U} with OpenGL support."
-	@${ECHO_MSG} "     use \"make WITH_GL=yes\" for this"
+	@${ECHO_MSG} "===> If you want to build ${MAMEMESS:U} with OpenGL support for vector games,"
+	@${ECHO_MSG} "     use \"make WITH_GL=yes\""
+.endif
 .else
 DISPLAY_METHOD=	x11
 .endif
@@ -203,8 +205,12 @@ do-configure:
 		-e "s@GLLIBS=.-ldl@GLLIBS= ${PTHREAD_LIBS}@g" \
 			${WRKSRC}/makefile.unix.sed > ${WRKSRC}/makefile.unix
 	${PERL} -pi -e 's@SDL/@SDL11/@' ${WRKSRC}/src/unix/video-drivers/SDL.c
+.if ${XMAMEVERSION} != "0.37b12.1"
 	${PERL} -pi -e 's@png.h@../../png.h@' \
 				${WRKSRC}/src/unix/video-drivers/glexport.c
+	${PERL} -pi -e 's@malloc.h@stdlib.h@' \
+				${WRKSRC}/src/unix/video-drivers/gljpg.c
+.endif
 
 post-build:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} SDL_VIDEODRIVER=aalib \
diff --git a/emulators/xmame/distinfo b/emulators/xmame/distinfo
index ca01a4113c33..00b6786339ce 100644
--- a/emulators/xmame/distinfo
+++ b/emulators/xmame/distinfo
@@ -4,4 +4,4 @@ MD5 (xmame/cheat.zip) = dc380436c04780950cee07d3e31bfb0b
 MD5 (xmame/history.zip) = 69da5c33e6a78092c6cd75cbeb737c6a
 MD5 (xmame/hsdat7.zip) = 9e4a7e36448895f13128a675327e34e4
 MD5 (xmame/xmame-0.37b13.1-cps2-20010330.patch.gz) = bf1d53ea84a4905d8377a187d3478883
-MD5 (xmame/xmame-0.37b13.1-pinmame-0.99b.patch.gz) = ea61399643a49b96025629960652455b
+MD5 (xmame/xmame-0.37b13.1-pinmame-0.99b1.patch.gz) = 06526474f4bd5afa0874237ffe653d34
diff --git a/emulators/xmame/files/patch-ac b/emulators/xmame/files/patch-ac
index 9a9567c01510..d8f0f0590141 100644
--- a/emulators/xmame/files/patch-ac
+++ b/emulators/xmame/files/patch-ac
@@ -1,5 +1,5 @@
 --- src/unix/unix.mak.orig	Sat Mar 24 02:33:38 2001
-+++ src/unix/unix.mak	Mon Apr  2 10:33:48 2001
++++ src/unix/unix.mak	Mon Apr  2 12:32:36 2001
 @@ -46,18 +46,18 @@
  LIBS.x11        = $(X11LIB) $(JOY_X11_LIBS) -lX11 -lXext 
  LIBS.svgalib    = $(X11LIB) -lvga -lvgagl
@@ -23,12 +23,22 @@
  CFLAGS.photon2	=
  
  INST.x11        = doinstall
-@@ -326,7 +326,7 @@
+@@ -317,7 +317,7 @@
+ 	
+ doc/x$(TARGET)rc.dist: all src/unix/xmamerc-keybinding-notes.txt
+ 	./x$(TARGET).$(DISPLAY_METHOD) -noloadconfig -showconfig | \
+-	 grep -v loadconfig > doc/x$(TARGET)rc.dist
++	 grep -v loadconfig | tr "\033" \# > doc/x$(TARGET)rc.dist
+ 	cat src/unix/xmamerc-keybinding-notes.txt >> doc/x$(TARGET)rc.dist
+ 	
+ doc/gamelist.$(TARGET): all
+@@ -326,7 +326,8 @@
  
  doc/x$(TARGET).6: all src/unix/xmame.6-1 src/unix/xmame.6-3
  	cat src/unix/xmame.6-1 > doc/x$(TARGET).6
 -	./x$(TARGET).$(DISPLAY_METHOD) -manhelp >> doc/x$(TARGET).6
-+	./x$(TARGET).$(DISPLAY_METHOD) -noloadconfig -manhelp >> doc/x$(TARGET).6
++	./x$(TARGET).$(DISPLAY_METHOD) -noloadconfig -manhelp | \
++	 tr "\033" \# >> doc/x$(TARGET).6
  	cat src/unix/xmame.6-3 >> doc/x$(TARGET).6
  
  install: $(INST.$(DISPLAY_METHOD)) install-man
diff --git a/emulators/xmess/files/patch-ac b/emulators/xmess/files/patch-ac
index c7fbc9ba5e9f..17ce071c4a6c 100644
--- a/emulators/xmess/files/patch-ac
+++ b/emulators/xmess/files/patch-ac
@@ -1,5 +1,5 @@
---- src/unix/unix.mak.orig	Sat Mar 10 09:11:54 2001
-+++ src/unix/unix.mak	Sun Mar 11 19:26:27 2001
+--- src/unix/unix.mak.orig	Sat Mar 17 03:11:38 2001
++++ src/unix/unix.mak	Mon Apr  2 12:36:22 2001
 @@ -50,14 +50,14 @@
  LIBS.xfx        = $(X11LIB) $(JOY_X11_LIBS) -lX11 -lXext -lglide2x
  LIBS.svgafx     = $(X11LIB) -lvga -lvgagl -lglide2x
@@ -17,12 +17,22 @@
  CFLAGS.photon2	=
  
  INST.x11        = doinstall
-@@ -326,7 +326,7 @@
+@@ -317,7 +317,7 @@
+ 	
+ doc/x$(TARGET)rc.dist: all src/unix/xmamerc-keybinding-notes.txt
+ 	./x$(TARGET).$(DISPLAY_METHOD) -noloadconfig -showconfig | \
+-	 grep -v loadconfig > doc/x$(TARGET)rc.dist
++	 grep -v loadconfig | tr "\033" \# > doc/x$(TARGET)rc.dist
+ 	cat src/unix/xmamerc-keybinding-notes.txt >> doc/x$(TARGET)rc.dist
+ 	
+ doc/gamelist.$(TARGET): all
+@@ -326,7 +326,8 @@
  
  doc/x$(TARGET).6: all src/unix/xmame.6-1 src/unix/xmame.6-3
  	cat src/unix/xmame.6-1 > doc/x$(TARGET).6
 -	./x$(TARGET).$(DISPLAY_METHOD) -manhelp >> doc/x$(TARGET).6
-+	./x$(TARGET).$(DISPLAY_METHOD) -noloadconfig -manhelp >> doc/x$(TARGET).6
++	./x$(TARGET).$(DISPLAY_METHOD) -noloadconfig -manhelp | \
++	 tr "\033" \# >> doc/x$(TARGET).6
  	cat src/unix/xmame.6-3 >> doc/x$(TARGET).6
  
  install: $(INST.$(DISPLAY_METHOD)) install-man
diff --git a/emulators/xpinmame/Makefile b/emulators/xpinmame/Makefile
index 2213ff58dd86..c079af7bd5ca 100644
--- a/emulators/xpinmame/Makefile
+++ b/emulators/xpinmame/Makefile
@@ -19,6 +19,6 @@ DESCR=		${.CURDIR}/pkg-descr
 
 MAMEMESS=	pinmame
 XMAMEVERSION=	0.37b13.1
-PINMAMEVERSION=	0.99b
+PINMAMEVERSION=	0.99b1
 
 .include "${MASTERDIR}/Makefile"