Update to version 0.36b14.1.

4 files changed, 24 insertions, 21 deletions

diff --git a/emulators/xmame/Makefile b/emulators/xmame/Makefile
index 9f80027e0e2..385f06a6050 100644
--- a/emulators/xmame/Makefile
+++ b/emulators/xmame/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.32 1999/11/10 07:54:46 soren Exp $
+# $NetBSD: Makefile,v 1.33 2000/01/20 18:54:49 soren Exp $
 #
 
-DISTNAME=		xmame-0.36b8.1
+DISTNAME=		xmame-0.36b14.1
 CATEGORIES=		emulators games x11
-MASTER_SITES=		http://xmame.retrogames.com/download/
+MASTER_SITES=		http://x.mame.net/download/
 EXTRACT_SUFX=		.tgz
 
 MAINTAINER=		soren@netbsd.org
-HOMEPAGE=		http://xmame.retrogames.com/
+HOMEPAGE=		http://x.mame.net/
 
 DEPENDS=		unzip-5.40:../../archivers/unzip
 DEPENDS+=		xpm-3.4k:../../graphics/xpm
@@ -41,8 +41,10 @@ post-patch:
 		xmamerc.dist >xmamerc)
 
 do-install:
-	(cd ${WRKSRC} && ${INSTALL_PROGRAM} xmame.${DISPLAY_METHOD} ${PREFIX}/bin/xmame)
-	(cd ${WRKSRC}/doc && ${INSTALL_MAN} xmame.man ${PREFIX}/man/man6/xmame.6)
+	(cd ${WRKSRC} && ${INSTALL_PROGRAM} xmame.${DISPLAY_METHOD} \
+		${PREFIX}/bin/xmame)
+	(cd ${WRKSRC}/doc && ${INSTALL_MAN} xmame.man \
+		${PREFIX}/man/man6/xmame.6)
 	${MKDIR} ${ROMPATH}
 	(cd ${WRKSRC}/doc && ${INSTALL_DATA} xmamerc ${ROMPATH}/xmamerc)
 	@${ECHO} Remember to set ROMPATH to ${ROMPATH}.
diff --git a/emulators/xmame/files/md5 b/emulators/xmame/files/md5
index 81eba583d87..060cf58c8aa 100644
--- a/emulators/xmame/files/md5
+++ b/emulators/xmame/files/md5
@@ -1,3 +1,4 @@
-$NetBSD: md5,v 1.11 1999/11/10 07:54:46 soren Exp $
+$NetBSD: md5,v 1.12 2000/01/20 18:54:50 soren Exp $
 
-MD5 (xmame-0.36b8.1.tgz) = 86ab74d20d4106ae840812e63b094624
+#MD5 (xmame-0.36b8.1.tgz) = 86ab74d20d4106ae840812e63b094624
+MD5 (xmame-0.36b14.1.tgz) = 987958ace64913c738fb01469a532e4d
diff --git a/emulators/xmame/files/patch-sum b/emulators/xmame/files/patch-sum
index ec69b792ae4..0a5de40d5bc 100644
--- a/emulators/xmame/files/patch-sum
+++ b/emulators/xmame/files/patch-sum
@@ -1,6 +1,6 @@
-$NetBSD: patch-sum,v 1.3 1999/11/10 07:54:46 soren Exp $
+$NetBSD: patch-sum,v 1.4 2000/01/20 18:54:50 soren Exp $
 
-MD5 (patch-aa) = 637eb930abece25d6669974aa9b969bf
+MD5 (patch-aa) = 77dfd5ade89baa55b61fa2e729bea347
 MD5 (patch-ae) = 6eacece1d254bc63a3a8baf9ad0e7901
 MD5 (patch-ah) = 25feadad02ed54f668d0928a4b3f7d62
 MD5 (patch-ai) = 622fcdcd6adf5896b002f867f97e3936
diff --git a/emulators/xmame/patches/patch-aa b/emulators/xmame/patches/patch-aa
index 543fae0e018..4189923d268 100644
--- a/emulators/xmame/patches/patch-aa
+++ b/emulators/xmame/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.20 1999/11/10 08:01:29 soren Exp $
+$NetBSD: patch-aa,v 1.21 2000/01/20 18:54:50 soren Exp $
 
---- makefile.unix.orig	Fri Nov  5 18:26:11 1999
-+++ makefile.unix	Wed Nov 10 08:42:32 1999
+--- makefile.unix.orig	Wed Jan 12 00:13:10 2000
++++ makefile.unix	Thu Jan 20 19:24:51 2000
 @@ -131,14 +131,14 @@
  # *** Select destination directory for your compiled program , manual page
  # and binary distribution ( if you want to... )
@@ -85,18 +85,18 @@ $NetBSD: patch-aa,v 1.20 1999/11/10 08:01:29 soren Exp $
  # ARCH  = sunos
  ######## ix86/Solaris
 @@ -362,8 +365,15 @@
- DEFS.linux_alpha   = -DLSB_FIRST -DAXP_ASM -DALIGN_INTS -DALIGN_SHORTS -D__LP64__
- DEFS.linux_i386    = -DLSB_FIRST -DX86_ASM
- DEFS.FREEBSD       = -DLSB_FIRST -DX86_ASM
--DEFS.netbsd_i386   = -DLSB_FIRST -DX86_ASM
--DEFS.netbsd_alpha  = -DLSB_FIRST -DAXP_ASM -DALIGN_INTS -DALIGN_SHORTS -D__LP64__
+ DEFS.linux_alpha   = -DLSB_FIRST -DAXP_ASM -DALIGN_INTS -DALIGN_SHORTS -D__LP64__ -DHAVE_SNPRINTF -DHAVE_VSNPRINTF
+ DEFS.linux_i386    = -DLSB_FIRST -DX86_ASM  -DHAVE_SNPRINTF -DHAVE_VSNPRINTF
+ DEFS.FREEBSD       = -DLSB_FIRST -DX86_ASM  -DHAVE_SNPRINTF -DHAVE_VSNPRINTF
+-DEFS.netbsd_i386   = -DLSB_FIRST -DX86_ASM  -DHAVE_SNPRINTF -DHAVE_VSNPRINTF
+-DEFS.netbsd_alpha  = -DLSB_FIRST -DAXP_ASM -DALIGN_INTS -DALIGN_SHORTS -D__LP64__  -DHAVE_SNPRINTF -DHAVE_VSNPRINTF
 +ifeq (${MACHINE},i386)
-+DEFS.netbsd	   = -DLSB_FIRST -DX86_ASM -DNETBSD
++DEFS.netbsd	   = -DLSB_FIRST -DX86_ASM -DNETBSD -DHAVE_SNPRINTF -DHAVE_VSNPRINTF
 +else
 +ifeq (${MACHINE},alpha)
-+DEFS.netbsd	   = -DLSB_FIRST -DAXP_ASM -DALIGN_INTS -DALIGN_SHORTS -D__LP64__
++DEFS.netbsd	   = -DLSB_FIRST -DAXP_ASM -DALIGN_INTS -DALIGN_SHORTS -D__LP64__ -DNETBSD -DHAVE_SNPRINTF -DHAVE_VSNPRINTF
 +else
-+DEFS.netbsd	   = -DLSB_FIRST -DDALIGN_INTS -DALIGN_SHORTS -DNETBSD
++DEFS.netbsd	   = -DLSB_FIRST -DDALIGN_INTS -DALIGN_SHORTS -DNETBSD -DHAVE_SNPRINTF -DHAVE_VSNPRINTF
 +endif
 +endif
  DEFS.sunos	   = -DCLOCKS_PER_SEC=1000000 -DALIGN_INTS -DALIGN_SHORTS