Update xmame and xmess packages to 0.80.1.

Changes:

Release 0.80.1, 13 March 2004
        - Everything from MAME 0.80 (http://x.mame.net/changes-mame.html)
          and MESS 0.80 (http://x.mame.net/changes-mess.html).
        - Improved support for GNU make's -j option, which can especially
          benefit SMP and SMT machines.  (Arnaud G. Gibert)

pkgsrc changes:

	o Make esound support optional via USE_ESOUND (by default is NO).

6 files changed, 28 insertions, 20 deletions

diff --git a/doc/CHANGES b/doc/CHANGES
index 1bd1136c4eb..b547cdf559e 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.5385 2004/03/31 04:33:04 snj Exp $
+$NetBSD: CHANGES,v 1.5386 2004/03/31 04:39:16 xtraeme Exp $
 
 Changes to the packages collection and infrastructure in 2004:
 
@@ -1625,3 +1625,5 @@ Changes to the packages collection and infrastructure in 2004:
 	Added galeon-devel-1.3.14a [xtraeme 2004-03-30]
 	Updated openldap to 2.1.29 [xtraeme 2004-03-31]
 	Updated vim-kde to 6.2.14 [snj 2004-03-31]
+	Updated xmame to 0.80.1 [xtraeme 2004-03-31]
+	Updated xmess to 0.80.1 [xtraeme 2004-03-31]
diff --git a/doc/TODO b/doc/TODO
index 8b5ae7bd972..58442fc97c3 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -1,4 +1,4 @@
-$NetBSD: TODO,v 1.1553 2004/03/30 22:44:44 xtraeme Exp $
+$NetBSD: TODO,v 1.1554 2004/03/31 04:39:17 xtraeme Exp $
 
 Suggested new packages
 ======================
@@ -365,8 +365,6 @@ Suggested package updates
 	o xerces-j-2.6.2
 	o xisp-2.7 [pkg/19566]
 	o xmcd-3.2.1
-	o xmame-0.80.1
-	o xmess-0.80.1
 	o xmms-1.2.10
 	o xmms-alarm-0.3.4
 	o xmms-crossfade-0.3.4
diff --git a/emulators/xmame/Makefile b/emulators/xmame/Makefile
index 9f641e21c66..8ff18fee39c 100644
--- a/emulators/xmame/Makefile
+++ b/emulators/xmame/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.106 2004/02/21 00:08:00 kristerw Exp $
+# $NetBSD: Makefile,v 1.107 2004/03/31 04:39:17 xtraeme Exp $
 #
 
-DISTNAME=		xmame-0.79.1
+DISTNAME=		xmame-0.80.1
 CATEGORIES=		emulators games x11
 MASTER_SITES=		http://x.mame.net/download/
 EXTRACT_SUFX=		.tar.bz2
@@ -14,7 +14,7 @@ RESTRICTED=		"selling is not allowed"
 NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_PKGINSTALL=		YES
 USE_X11=		YES
 USE_GNU_TOOLS+=		make
@@ -24,6 +24,8 @@ UNLIMIT_RESOURCES=	datasize
 
 .include "../../mk/bsd.prefs.mk"
 
+BUILD_DEFS+=		USE_ESOUND
+
 ROMPATH=		${PREFIX}/share/${TARGET}
 SPOOLDIR=		/var/games/${TARGET}
 
@@ -31,7 +33,11 @@ MAKE_FLAGS+=		TARGET="${TARGET:S/x//}"
 MAKE_FLAGS+=		LIBS="${LDFLAGS} ${LIBS}"
 MAKE_FLAGS+=		CFLAGS="${CFLAGS}"
 MAKE_FLAGS+=		X11INC= X11LIB=
+
+.if !empty(USE_ESOUND:M[Yy][Ee][Ss])
 MAKE_FLAGS+=		SOUND_ESOUND=1
+.include "../../audio/esound/buildlink3.mk"
+.endif
 
 MAME_DISP_METHOD?=	x11
 
@@ -105,6 +111,4 @@ do-install:
 	${INSTALL_DATA_DIR} ${ROMPATH}
 	${INSTALL_DATA} ${WRKSRC}/doc/${TARGET}rc ${ROMPATH}/${TARGET}rc
 
-.include "../../audio/esound/buildlink2.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/xmame/distinfo b/emulators/xmame/distinfo
index 68da6f59808..b55ab8c1c6e 100644
--- a/emulators/xmame/distinfo
+++ b/emulators/xmame/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.45 2004/02/21 00:08:00 kristerw Exp $
+$NetBSD: distinfo,v 1.46 2004/03/31 04:39:17 xtraeme Exp $
 
-SHA1 (xmame-0.79.1.tar.bz2) = 8348467534312325802f0ed6182bcd6eb2bfc8ed
-Size (xmame-0.79.1.tar.bz2) = 12369791 bytes
+SHA1 (xmame-0.80.1.tar.bz2) = a45670eac5087fb9c697a1205bb14b7df9d7702b
+Size (xmame-0.80.1.tar.bz2) = 12460829 bytes
 SHA1 (patch-aa) = 0b9ffcb7c4305e7c349f229b2646acb31553d549
 SHA1 (patch-ae) = df9ce91871bfcff611ff8f616482d4ff2e8204a3
diff --git a/emulators/xmess/Makefile b/emulators/xmess/Makefile
index 3c3456235f2..bbdcd8cd2f6 100644
--- a/emulators/xmess/Makefile
+++ b/emulators/xmess/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.47 2004/02/21 00:06:36 kristerw Exp $
+# $NetBSD: Makefile,v 1.48 2004/03/31 04:39:17 xtraeme Exp $
 #
 
-DISTNAME=		xmame-0.79.1
-PKGNAME=		xmess-0.79.1
+DISTNAME=		xmame-0.80.1
+PKGNAME=		xmess-0.80.1
 CATEGORIES=		emulators games x11
 MASTER_SITES=		http://x.mame.net/download/
 EXTRACT_SUFX=		.tar.bz2
@@ -32,7 +32,13 @@ MAKE_FLAGS+=		TARGET="${TARGET:S/x//}"
 MAKE_FLAGS+=		LIBS="${LDFLAGS} ${LIBS}"
 MAKE_FLAGS+=		CFLAGS="${CFLAGS}"
 MAKE_FLAGS+=		X11INC= X11LIB=
+
+BUILD_DEFS+=		USE_ESOUND
+
+.if !empty(USE_ESOUND:M[Yy][Ee][Ss])
 MAKE_FLAGS+=		SOUND_ESOUND=1
+.include "../../audio/esound/buildlink3.mk"
+.endif
 
 MAME_DISP_METHOD?=	x11
 
@@ -107,6 +113,4 @@ do-install:
 	${INSTALL_DATA_DIR} ${ROMPATH}
 	${INSTALL_DATA} ${WRKSRC}/doc/${TARGET}rc ${ROMPATH}/${TARGET}rc
 
-.include "../../audio/esound/buildlink2.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/xmess/distinfo b/emulators/xmess/distinfo
index c94686d9126..a89a80b3249 100644
--- a/emulators/xmess/distinfo
+++ b/emulators/xmess/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.19 2004/02/21 00:06:36 kristerw Exp $
+$NetBSD: distinfo,v 1.20 2004/03/31 04:39:17 xtraeme Exp $
 
-SHA1 (xmame-0.79.1.tar.bz2) = 8348467534312325802f0ed6182bcd6eb2bfc8ed
-Size (xmame-0.79.1.tar.bz2) = 12369791 bytes
+SHA1 (xmame-0.80.1.tar.bz2) = a45670eac5087fb9c697a1205bb14b7df9d7702b
+Size (xmame-0.80.1.tar.bz2) = 12460829 bytes
 SHA1 (patch-aa) = 0b9ffcb7c4305e7c349f229b2646acb31553d549
 SHA1 (patch-ae) = f30af6853b77307126ad4a230d4237bc570a0ca4