4 files changed, 27 insertions, 16 deletions

diff --git a/emulators/xmame/Makefile b/emulators/xmame/Makefile
index 34b122c20830..4061cbcd25a4 100644
--- a/emulators/xmame/Makefile
+++ b/emulators/xmame/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	xmame
-PORTVERSION?=	0.77.1
+PORTVERSION?=	0.78.1
 CATEGORIES=	emulators
 MASTER_SITES=	http://x.mame.net/download/:xmame \
 		http://www.sys2064.com/files/util/:history \
@@ -24,7 +24,6 @@ USE_BZIP2=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
-MAKEFILE=	makefile.unix
 
 MAN6=		x${MAMEMESS}.6
 
@@ -79,18 +78,13 @@ GENERALDOCS=	changes.unix \
 		xmame-gdoc.html \
 		xmame.css
 XMAMEDOCS=
-XMESSDOCS=	mess/cgafont.txt \
-		mess/compilewin.html \
-		mess/credits.htm \
-		mess/credits.txt \
+XMESSDOCS=	mess/credits.htm \
 		mess/faq.htm \
 		mess/imgtool.txt \
-		mess/messhelp.txt \
 		mess/messnew.txt \
-		mess/messold.txt \
 		mess/messroms.txt \
 		mess/sysinfo.dat \
-		mess/windows.txt
+
 PINMAMEDOCS=	pinmame/simulation.txt \
 		pinmame/whatsnew.txt \
 		pinmame/pinmame.txt \
@@ -281,6 +275,15 @@ do-configure:
 		-e "s@^GLLIBS += .*@GLLIBS += ${PTHREAD_LIBS}@g" \
 			${WRKSRC}/makefile.unix
 
+# png.h conflicts with libpng.
+.for file in mess/artworkx.c mess/artworkx.h src/artwork.c \
+	src/common.c src/png.c src/unix/video-drivers/glexport.c
+
+	${REINPLACE_CMD} -e "s@\"png.h\"@\"mame_png.h\"@g" ${WRKSRC}/${file}
+
+.endfor
+	${LN} -s ${WRKSRC}/src/png.h ${WRKSRC}/src/mame_png.h
+
 post-build:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} SDL_VIDEODRIVER=aalib \
 		${GMAKE} doc/x${MAMEMESS}.6
diff --git a/emulators/xmame/distinfo b/emulators/xmame/distinfo
index cbc96f316f40..3330eb05ec1a 100644
--- a/emulators/xmame/distinfo
+++ b/emulators/xmame/distinfo
@@ -1,4 +1,4 @@
-MD5 (xmame/xmame-0.77.1.tar.bz2) = 744fdbac27c08cf13ca979a4b4985041
+MD5 (xmame/xmame-0.78.1.tar.bz2) = e92c61e0040114db3a83b7dbb7fc9449
 MD5 (xmame/uhsdat795.zip) = c30956e15cd8218f558f41013a47f22e
 MD5 (xmame/history.dat.zip) = 8c758537d5f5bc90fc3224b19421ae12
 MD5 (xmame/cheat.zip) = fab0ea562a8dcfd1ce4f3a1d5acc6101
diff --git a/emulators/xmame/files/patch-src-sha1.h b/emulators/xmame/files/patch-src-sha1.h
new file mode 100644
index 000000000000..58c8167fd686
--- /dev/null
+++ b/emulators/xmame/files/patch-src-sha1.h
@@ -0,0 +1,14 @@
+--- src/sha1.h.orig	Fri Jan 30 21:43:41 2004
++++ src/sha1.h	Fri Jan 30 21:45:58 2004
+@@ -26,10 +26,7 @@
+ #ifndef NETTLE_SHA1_H_INCLUDED
+ #define NETTLE_SHA1_H_INCLUDED
+ 
+-#ifndef _STDINT_H
+-typedef unsigned int uint32_t;
+-typedef unsigned char uint8_t;
+-#endif
++#include <sys/types.h>
+ 
+ #define SHA1_DIGEST_SIZE 20
+ #define SHA1_DATA_SIZE 64
diff --git a/emulators/xmame/pkg-plist b/emulators/xmame/pkg-plist
index 3c2383dfd4b5..1e003442393c 100644
--- a/emulators/xmame/pkg-plist
+++ b/emulators/xmame/pkg-plist
@@ -30,18 +30,12 @@ share/%%MAMEMESS%%/%%MAMEMESS%%rc
 %%MAMEONLY%%%%DATFILES%%share/xmame/hiscore.dat
 %%MAMEONLY%%%%DATFILES%%share/xmame/history.dat
 %%MAMEONLY%%%%DATFILES%%share/xmame/cheat.dat
-%%MESSONLY%%%%PORTDOCS%%share/doc/xmess/cgafont.txt
-%%MESSONLY%%%%PORTDOCS%%share/doc/xmess/compilewin.html
 %%MESSONLY%%%%PORTDOCS%%share/doc/xmess/credits.htm
-%%MESSONLY%%%%PORTDOCS%%share/doc/xmess/credits.txt
 %%MESSONLY%%%%PORTDOCS%%share/doc/xmess/faq.htm
 %%MESSONLY%%%%PORTDOCS%%share/doc/xmess/imgtool.txt
-%%MESSONLY%%%%PORTDOCS%%share/doc/xmess/messhelp.txt
 %%MESSONLY%%%%PORTDOCS%%share/doc/xmess/messnew.txt
-%%MESSONLY%%%%PORTDOCS%%share/doc/xmess/messold.txt
 %%MESSONLY%%%%PORTDOCS%%share/doc/xmess/messroms.txt
 %%MESSONLY%%%%PORTDOCS%%share/doc/xmess/sysinfo.dat
-%%MESSONLY%%%%PORTDOCS%%share/doc/xmess/windows.txt
 %%MESSONLY%%share/xmess/history.dat
 %%PINMAMEONLY%%%%PORTDOCS%%share/doc/xpinmame/simulation.txt
 %%PINMAMEONLY%%%%PORTDOCS%%share/doc/xpinmame/whatsnew.txt