6 files changed, 52 insertions, 14 deletions
diff --git a/emulators/xmame/Makefile b/emulators/xmame/Makefile
index 4d3000fdbff..e630c843039 100644
--- a/emulators/xmame/Makefile
+++ b/emulators/xmame/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.121 2004/11/08 10:03:41 xtraeme Exp $
+# $NetBSD: Makefile,v 1.122 2004/11/27 01:30:40 kristerw Exp $
 #
 
-DISTNAME=		xmame-0.87
+DISTNAME=		xmame-0.88
 CATEGORIES=		emulators games x11
 MASTER_SITES=		http://x.mame.net/download/
 EXTRACT_SUFX=		.tar.bz2
@@ -33,7 +33,7 @@ MAKE_FLAGS+=		LIBS="${LDFLAGS} ${LIBS}"
 MAKE_FLAGS+=		CFLAGS="${CFLAGS}"
 MAKE_FLAGS+=		X11INC= X11LIB=
 
-# Network support is broken in xmame-0.85
+# Network support is broken since xmame-0.85
 #MAKE_FLAGS+=		XMAME_NET=1
 
 # Determine which CPU-specific code to use.
@@ -71,7 +71,7 @@ MAKE_FLAGS+=		X11_XV=1
 # If supported, add appropriate definitions to build joystick drivers.
 .if exists(/usr/include/machine/joystick.h) ||				\
     exists(/usr/include/linux/joystick.h)
-MAKE_FLAGS+=		JOY_I386=1
+MAKE_FLAGS+=		JOY_STANDARD=1
 .endif
 .if ${OPSYS} == "NetBSD"
 .  if exists(/usr/lib/libusb.a) || exists(/usr/lib/libusbhid.a)
diff --git a/emulators/xmame/distinfo b/emulators/xmame/distinfo
index 0ffcadf6664..37f5829b035 100644
--- a/emulators/xmame/distinfo
+++ b/emulators/xmame/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.57 2004/11/06 21:41:52 kristerw Exp $
+$NetBSD: distinfo,v 1.58 2004/11/27 01:30:40 kristerw Exp $
 
-SHA1 (xmame-0.87.tar.bz2) = dbd70ba76c141412181d8f12fe40e32b32df8867
-Size (xmame-0.87.tar.bz2) = 14601566 bytes
+SHA1 (xmame-0.88.tar.bz2) = c0dbc5d7bd6f1c6032fe582b8f12d5fbf5eb1af8
+Size (xmame-0.88.tar.bz2) = 14799683 bytes
 SHA1 (patch-aa) = b9f486be58b306a815269f859c1031d24c966df1
+SHA1 (patch-ab) = be758f3dd91930a84dc798a40163fc8b970de56e
 SHA1 (patch-ae) = 26c68fff67e3146638cef7e366b57c928274f562
diff --git a/emulators/xmame/patches/patch-ab b/emulators/xmame/patches/patch-ab
new file mode 100644
index 00000000000..3b8c2a812ff
--- /dev/null
+++ b/emulators/xmame/patches/patch-ab
@@ -0,0 +1,18 @@
+$NetBSD: patch-ab,v 1.30 2004/11/27 01:30:40 kristerw Exp $
+
+--- src/unix/unix.mak.orig	Mon Nov 22 00:09:03 2004
++++ src/unix/unix.mak	Mon Nov 22 00:12:39 2004
+@@ -545,11 +545,11 @@
+ 
+ romcmp: $(OBJ)/romcmp.o $(OBJ)/unzip.o $(ZLIB)
+ 	$(CC_COMMENT) @echo 'Linking $@...'
+-	$(CC_COMPILE) $(LD) $(LDFLAGS) $^ $(LIBS) -o $@
++	$(CC_COMPILE) $(LD) $(LDFLAGS) $^ -lz $(LIBS) -o $@
+ 
+ chdman: $(OBJ)/chdman.o $(OBJ)/chd.o $(OBJ)/chdcd.o $(OBJ)/md5.o $(OBJ)/sha1.o $(OBJ)/version.o $(ZLIB)
+ 	$(CC_COMMENT) @echo 'Linking $@...'
+-	$(CC_COMPILE) $(LD) $(LDFLAGS) $^ $(LIBS) -o $@
++	$(CC_COMPILE) $(LD) $(LDFLAGS) $^ -lz $(LIBS) -o $@
+ 
+ xml2info: $(OBJ)/xml2info.o $(EXPAT)
+ 	$(CC_COMMENT) @echo 'Linking $@...'
diff --git a/emulators/xmess/Makefile b/emulators/xmess/Makefile
index b76f07ac7fc..341b83aa681 100644
--- a/emulators/xmess/Makefile
+++ b/emulators/xmess/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.62 2004/11/08 10:07:02 xtraeme Exp $
+# $NetBSD: Makefile,v 1.63 2004/11/27 01:31:19 kristerw Exp $
 #
 
-DISTNAME=		xmame-0.87
-PKGNAME=		xmess-0.87
+DISTNAME=		xmame-0.88
+PKGNAME=		xmess-0.88
 CATEGORIES=		emulators games x11
 MASTER_SITES=		http://x.mame.net/download/
 EXTRACT_SUFX=		.tar.bz2
@@ -72,7 +72,7 @@ MAKE_FLAGS+=		X11_XV=1
 # If supported, add appropriate definitions to build joystick drivers.
 .if exists(/usr/include/machine/joystick.h) ||				\
     exists(/usr/include/linux/joystick.h)
-MAKE_FLAGS+=		JOY_I386=1
+MAKE_FLAGS+=		JOY_STANDARD=1
 .endif
 .if ${OPSYS} == "NetBSD"
 .  if exists(/usr/lib/libusb.a) || exists(/usr/lib/libusbhid.a)
diff --git a/emulators/xmess/distinfo b/emulators/xmess/distinfo
index 3d86c1f5f50..8c231fa209f 100644
--- a/emulators/xmess/distinfo
+++ b/emulators/xmess/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.30 2004/11/07 16:11:48 kristerw Exp $
+$NetBSD: distinfo,v 1.31 2004/11/27 01:31:20 kristerw Exp $
 
-SHA1 (xmame-0.87.tar.bz2) = dbd70ba76c141412181d8f12fe40e32b32df8867
-Size (xmame-0.87.tar.bz2) = 14601566 bytes
+SHA1 (xmame-0.88.tar.bz2) = c0dbc5d7bd6f1c6032fe582b8f12d5fbf5eb1af8
+Size (xmame-0.88.tar.bz2) = 14799683 bytes
 SHA1 (patch-aa) = b9f486be58b306a815269f859c1031d24c966df1
+SHA1 (patch-ab) = be758f3dd91930a84dc798a40163fc8b970de56e
 SHA1 (patch-ae) = cf9b2684b4bdfdec7d2f09bcc424b7ee79d7f45a
diff --git a/emulators/xmess/patches/patch-ab b/emulators/xmess/patches/patch-ab
new file mode 100644
index 00000000000..fb1fadbf074
--- /dev/null
+++ b/emulators/xmess/patches/patch-ab
@@ -0,0 +1,18 @@
+$NetBSD: patch-ab,v 1.19 2004/11/27 01:31:20 kristerw Exp $
+
+--- src/unix/unix.mak.orig	Mon Nov 22 00:09:03 2004
++++ src/unix/unix.mak	Mon Nov 22 00:12:39 2004
+@@ -545,11 +545,11 @@
+ 
+ romcmp: $(OBJ)/romcmp.o $(OBJ)/unzip.o $(ZLIB)
+ 	$(CC_COMMENT) @echo 'Linking $@...'
+-	$(CC_COMPILE) $(LD) $(LDFLAGS) $^ $(LIBS) -o $@
++	$(CC_COMPILE) $(LD) $(LDFLAGS) $^ -lz $(LIBS) -o $@
+ 
+ chdman: $(OBJ)/chdman.o $(OBJ)/chd.o $(OBJ)/chdcd.o $(OBJ)/md5.o $(OBJ)/sha1.o $(OBJ)/version.o $(ZLIB)
+ 	$(CC_COMMENT) @echo 'Linking $@...'
+-	$(CC_COMPILE) $(LD) $(LDFLAGS) $^ $(LIBS) -o $@
++	$(CC_COMPILE) $(LD) $(LDFLAGS) $^ -lz $(LIBS) -o $@
+ 
+ xml2info: $(OBJ)/xml2info.o $(EXPAT)
+ 	$(CC_COMMENT) @echo 'Linking $@...'