ports/79450: [Maintainer Update] emulators/xmame to 0.95

Sat Apr 2 15:30:05 UTC 2005

>Number:         79450
>Category:       ports
>Synopsis:       [Maintainer Update] emulators/xmame to 0.95
>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:   Sat Apr 02 15:30:03 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Miguel Mendez
>Release:        FreeBSD 5.4-PRERELEASE i386
>Organization:
>Environment:


System: FreeBSD 5.4-PRERELEASE #0: Mon Feb 28 20:41:06 CET 2005
    root at scienide.energyhq.es.eu.org:/usr/obj/usr/src/sys/SCIENIDE.SMP



>Description:


Changelog was not availabe at the moment od sending this PR, but
should appear at: http://x.mame.net/changes-unix.html

The following patches are no longer needed:

- patch-makefile.mes
- patch-src-unix-unix.mak
- patch-src-unix-joystick-drivers-joy_usb.c

The former 2 aren't needed anymore since xmess doesn't build messtest
by default, the latter is redundant since we pass ARCH=freebsd

Two patches are new (provided by Greg Lewis) that fix build on RELENG_4

- patch-src-unix-video-drivers-xf86_dga1.c
- patch-src-unix-video-drivers-xf86_dga2.c

We now install two xmess tools: imgtool and dat2html



>How-To-Repeat:





>Fix:

--- xmame.diff begins here ---
diff -ruN xmame.old/Makefile xmame/Makefile
--- xmame.old/Makefile	Sat Mar 19 05:20:33 2005
+++ xmame/Makefile	Sat Apr  2 12:58:25 2005
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	xmame
-PORTVERSION?=	0.94
+PORTVERSION?=	0.95
 CATEGORIES=	emulators
 MASTER_SITES=	http://x.mame.net/download/:xmame \
 		http://www.sys2064.com/files/util/:history \
@@ -273,6 +273,12 @@
 	${INSTALL_PROGRAM} ${WRKSRC}/romcmp ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/chdman ${PREFIX}/bin
 .endif
+
+.if ${MAMEMESS} == "mess"
+	${INSTALL_PROGRAM} ${WRKSRC}/imgtool ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/dat2html ${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	Sat Mar 19 05:20:33 2005
+++ xmame/distinfo	Sat Apr  2 09:45:50 2005
@@ -1,5 +1,5 @@
-MD5 (xmame/xmame-0.94.tar.bz2) = 755133f9c6712621fa0e1bedef88b0a9
-SIZE (xmame/xmame-0.94.tar.bz2) = 15388074
+MD5 (xmame/xmame-0.95.tar.bz2) = e2571ce90bdf1517eea4d8085170fe6c
+SIZE (xmame/xmame-0.95.tar.bz2) = 15460834
 MD5 (xmame/uhsdat795.zip) = c30956e15cd8218f558f41013a47f22e
 SIZE (xmame/uhsdat795.zip) = 43750
 MD5 (xmame/history.dat.zip) = 8c758537d5f5bc90fc3224b19421ae12
diff -ruN xmame.old/files/patch-makefile.mes xmame/files/patch-makefile.mes
--- xmame.old/files/patch-makefile.mes	Tue Feb 15 20:42:31 2005
+++ xmame/files/patch-makefile.mes	Thu Jan  1 01:00:00 1970
@@ -1,11 +0,0 @@
---- makefile.mes.orig	Mon Feb 14 18:03:35 2005
-+++ makefile.mes	Mon Feb 14 18:05:09 2005
-@@ -344,7 +344,7 @@
- 		$(OBJ)/mess/windows/parallel.o			\
- 		$(OBJ)/mess/windows/strconv.o			
- 	@echo Linking $@...
--	$(LD) $(LDFLAGS) $(CONSOLE_PROGRAM) $^ -Wl,--allow-multiple-definition $(ZLIB) $(LIBS) -lwinmm -o $@
-+	touch $@
- 
- # secondary libraries
- $(OBJ)/libexpat.a: $(OBJ)/expat/xmlparse.o $(OBJ)/expat/xmlrole.o $(OBJ)/expat/xmltok.o
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	Tue Oct 12 00:37:23 2004
+++ xmame/files/patch-src-unix-joystick-drivers-joy_usb.c	Thu Jan  1 01:00:00 1970
@@ -1,11 +0,0 @@
---- 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/files/patch-src-unix-unix.mak xmame/files/patch-src-unix-unix.mak
--- xmame.old/files/patch-src-unix-unix.mak	Tue Feb 15 20:42:31 2005
+++ xmame/files/patch-src-unix-unix.mak	Thu Jan  1 01:00:00 1970
@@ -1,11 +0,0 @@
---- src/unix/unix.mak.orig	Mon Feb 14 18:08:49 2005
-+++ src/unix/unix.mak	Mon Feb 14 18:09:12 2005
-@@ -599,7 +599,7 @@
- 	$(OBJDIR)/sysdep/rc.o \
- 	$(OBJDIR)/tststubs.o
- 	$(CC_COMMENT) @echo 'Linking $@...'
--	$(CC_COMPILE) $(LD) $(LDFLAGS) $(MY_LIBS) $^ -Wl,--allow-multiple-definition -o $@
-+	touch $@
- 
- $(OBJDIR)/tststubs.o: src/unix/tststubs.c
- 	$(CC_COMPILE) $(CC) $(MY_CFLAGS) -o $@ -c $<
diff -ruN xmame.old/files/patch-src-unix-video-drivers-xf86_dga1.c xmame/files/patch-src-unix-video-drivers-xf86_dga1.c
--- xmame.old/files/patch-src-unix-video-drivers-xf86_dga1.c	Thu Jan  1 01:00:00 1970
+++ xmame/files/patch-src-unix-video-drivers-xf86_dga1.c	Wed Mar 23 18:58:44 2005
@@ -0,0 +1,13 @@
+$FreeBSD$
+
+--- src/unix/video-drivers/xf86_dga1.c.orig	Sun Mar 20 22:10:35 2005
++++ src/unix/video-drivers/xf86_dga1.c	Sun Mar 20 22:12:24 2005
+@@ -7,6 +7,7 @@
+ #include <string.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
++#include <sys/time.h>
+ #include <sys/resource.h>
+ #include <X11/Xlib.h>
+ #include <X11/Xutil.h>
+
diff -ruN xmame.old/files/patch-src-unix-video-drivers-xf86_dga2.c xmame/files/patch-src-unix-video-drivers-xf86_dga2.c
--- xmame.old/files/patch-src-unix-video-drivers-xf86_dga2.c	Thu Jan  1 01:00:00 1970
+++ xmame/files/patch-src-unix-video-drivers-xf86_dga2.c	Wed Mar 23 18:58:44 2005
@@ -0,0 +1,13 @@
+$FreeBSD$
+
+--- src/unix/video-drivers/xf86_dga2.c.orig	Sun Mar 20 22:16:38 2005
++++ src/unix/video-drivers/xf86_dga2.c	Sun Mar 20 22:16:53 2005
+@@ -10,6 +10,7 @@
+ #include <string.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
++#include <sys/time.h>
+ #include <sys/resource.h>
+ #include <X11/Xlib.h>
+ #include <X11/Xutil.h>
+
diff -ruN xmame.old/pkg-plist xmame/pkg-plist
--- xmame.old/pkg-plist	Fri Jan 28 17:41:37 2005
+++ xmame/pkg-plist	Sat Apr  2 12:56:59 2005
@@ -2,6 +2,8 @@
 %%MAMEONLY%%bin/xml2info
 %%MAMEONLY%%bin/chdman
 %%MAMEONLY%%bin/romcmp
+%%MESSONLY%%bin/imgtool
+%%MESSONLY%%bin/dat2html
 etc/%%MAMEMESS%%rc.sample
 share/%%MAMEMESS%%/%%MAMEMESS%%rc
 %%PORTDOCS%%share/doc/%%MAMEMESS%%/changes.unix
--- xmame.diff ends here ---



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

