ports/71252: [Maintainer update] emulators/xmame to 0.86

[Miguel Mendez]

>Number:         71252
>Category:       ports
>Synopsis:       [Maintainer update] emulators/xmame to 0.86
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Sep 01 16:30:37 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Miguel Mendez
>Release:        FreeBSD 5.3-BETA2 i386
>Organization:
>Environment:


System: FreeBSD 5.3-BETA2 #0: Sat Aug 28 22:02:36 CEST 2004
    root at scienide.energyhq.es.eu.org:/usr/obj/usr/src/sys/SCIENIDE



>Description:


I was holding this in hope they would get networking fixed. No dice.
*NETWORKING DOESN'T WORK IN THIS VERSION* and is disabled in 
the Makefile.

Some people have reported success on !i386, so I've removed the ARCH
restriction for now. We'll see how it turns out.

This version makes gxmame stop working, see the other PR about gxmame for a fix.



>How-To-Repeat:





>Fix:


--- xmame.diff begins here ---
diff -ruN xmame.old/Makefile xmame/Makefile
--- xmame.old/Makefile	Fri Jul  2 10:20:55 2004
+++ xmame/Makefile	Wed Sep  1 18:24:35 2004
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	xmame
-PORTVERSION?=	0.83.1
+PORTVERSION?=	0.86
 CATEGORIES=	emulators
 MASTER_SITES=	http://x.mame.net/download/:xmame \
 		http://www.sys2064.com/files/util/:history \
@@ -214,24 +214,26 @@
 ESOUNDCOMMENT=\#
 .endif
 
+# XXX Network support is *broken* in 0.85+, leave commented out for now
 # Option WITH_NETWORK
-.if ${MAMEMESS} == "mame"
-.if !defined(WITH_NETWORK)
-WITH_NETWORK=	yes
-.endif
+#.if ${MAMEMESS} == "mame"
+#.if !defined(WITH_NETWORK)
+WITH_NETWORK=	no
+#.endif
 
 .if ${WITH_NETWORK:L} != "no"
 NETWORK=
 .else
 NETWORK=\#
 .endif
-.endif
+#.endif
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} != "i386" && ${OSVERSION} >= 502102
-BROKEN=		"Does not compile on 5.x !i386"
-.endif
+# Some people have reported success buidling on other arches
+#.if ${ARCH} != "i386" && ${OSVERSION} >= 502102
+#BROKEN=		"Does not compile on 5.x !i386"
+#.endif
 
 #
 # Regular targets
@@ -300,6 +302,9 @@
 		${WRKSRC}/doc/x${MAMEMESS}rc.dist.sed > ${WRKSRC}/doc/x${MAMEMESS}rc.dist
 
 post-install:
+.if ${MAMEMESS} == "mame"
+	${INSTALL_PROGRAM} ${WRKSRC}/xml2info ${PREFIX}/bin
+.endif
 	${MV} ${PREFIX}/bin/x${MAMEMESS}.${DISPLAY_METHOD} \
 		${PREFIX}/bin/x${MAMEMESS}
 	${CHOWN} root:games ${PREFIX}/bin/x${MAMEMESS}
diff -ruN xmame.old/distinfo xmame/distinfo
--- xmame.old/distinfo	Fri Jul  2 10:20:55 2004
+++ xmame/distinfo	Wed Sep  1 11:38:06 2004
@@ -1,5 +1,5 @@
-MD5 (xmame/xmame-0.83.1.tar.bz2) = d524570f1a2aa516798c873be9c25ebd
-SIZE (xmame/xmame-0.83.1.tar.bz2) = 12914490
+MD5 (xmame/xmame-0.86.tar.bz2) = b16782cd620ef970233eacd65462ad74
+SIZE (xmame/xmame-0.86.tar.bz2) = 14538952
 MD5 (xmame/uhsdat795.zip) = c30956e15cd8218f558f41013a47f22e
 SIZE (xmame/uhsdat795.zip) = 43750
 MD5 (xmame/history.dat.zip) = 8c758537d5f5bc90fc3224b19421ae12
diff -ruN xmame.old/files/patch-src-sha1.h xmame/files/patch-src-sha1.h
--- xmame.old/files/patch-src-sha1.h	Sun Feb  1 02:13:46 2004
+++ xmame/files/patch-src-sha1.h	Thu Jan  1 01:00:00 1970
@@ -1,14 +0,0 @@
---- 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 -ruN xmame.old/files/patch-src-unix-joystick-drivers-joy_usb.c xmame/files/patch-src-unix-joystick-drivers-joy_usb.c
--- xmame.old/files/patch-src-unix-joystick-drivers-joy_usb.c	Thu Jan  1 01:00:00 1970
+++ xmame/files/patch-src-unix-joystick-drivers-joy_usb.c	Sun Aug 22 15:33:14 2004
@@ -0,0 +1,11 @@
+--- src/unix/joystick-drivers/joy_usb.c.orig	Sun Aug 22 15:31:47 2004
++++ src/unix/joystick-drivers/joy_usb.c	Sun Aug 22 15:32:30 2004
+@@ -20,7 +20,7 @@
+ };
+ 
+ #ifdef USB_JOYSTICK
+-
++#define __ARCH_freebsd
+ #if !defined(__ARCH_netbsd) && !defined(__ARCH_freebsd)
+ #error "USB joysticks are only supported under NetBSD and FreeBSD.  Patches to support other archs are welcome ;)"
+ #endif
diff -ruN xmame.old/pkg-plist xmame/pkg-plist
--- xmame.old/pkg-plist	Mon May 17 16:52:29 2004
+++ xmame/pkg-plist	Wed Sep  1 17:33:49 2004
@@ -1,4 +1,5 @@
 bin/%%MAMEMESS%%
+%%MAMEONLY%%bin/xml2info
 etc/%%MAMEMESS%%rc.sample
 share/%%MAMEMESS%%/%%MAMEMESS%%rc
 %%PORTDOCS%%share/doc/%%MAMEMESS%%/changes.unix
--- xmame.diff ends here ---



>Release-Note:
>Audit-Trail:
>Unformatted: