Date: Thu, 14 Nov 2002 14:54:47 +0100 (CET) From: Stijn Hoop <stijn@win.tue.nl> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/45292: [MAINTAINER UPDATE]: emulators/xmame, emulators/xmess Message-ID: <200211141354.gAEDslg1021599@pcwin002.win.tue.nl>
next in thread | raw e-mail | index | archive | help
>Number: 45292 >Category: ports >Synopsis: [MAINTAINER UPDATE]: emulators/xmame, emulators/xmess >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu Nov 14 06:00:03 PST 2002 >Closed-Date: >Last-Modified: >Originator: Stijn Hoop >Release: FreeBSD 4.7-STABLE i386 >Organization: >Environment: System: FreeBSD pcwin002.win.tue.nl 4.7-STABLE FreeBSD 4.7-STABLE #0: Tue Oct 29 13:56:28 CET 2002 stijn@pcwin002.win.tue.nl:/usr/obj/usr/src/sys/PCWIN002 i386 >Description: - Update of xmame and xmess to 0.61.1 - Update datfiles to latest version - Use master site sorting for WITH_DATFILES - (hopefully) fix pkg-plist issues - emulators/xpinmame still broken unfortunately, working on it... >How-To-Repeat: N/A >Fix: - Apply the following patch - cvs rm -f xmame/files/patch-* (watch out, xmame/files/pkg-opts still needed) - cvs rm -f xmess/files/* diff -urN --exclude=CVS /usr/ports/emulators/xmame/Makefile xmame/Makefile --- /usr/ports/emulators/xmame/Makefile Fri Nov 1 06:04:09 2002 +++ xmame/Makefile Thu Nov 14 14:43:08 2002 @@ -6,13 +6,15 @@ # PORTNAME?= xmame -PORTVERSION?= 0.60.1 +PORTVERSION?= 0.61.1 CATEGORIES= emulators -MASTER_SITES= http://x.mame.net/download/ \ - http://www.mame.net/zips/ \ - http://cheat.retrogames.com/ \ - http://www.win.tue.nl/~stijn/xmame/ -DISTNAME= xmame-${XMAMEVERSION:S/p/pre/} +MASTER_SITES= http://x.mame.net/download/:xmame \ + http://www.sys2064.com/files/util/:history \ + http://www.sys2064.com/files/mame/:highscore \ + http://cheat.retrogames.com/:cheat \ + http://www.win.tue.nl/~stijn/xmame/:history,highscore,cheat +DISTNAME= xmame-${XMAMEVERSION:S/.p/-pr/} +DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:xmame DIST_SUBDIR= xmame MAINTAINER?= stijn@win.tue.nl @@ -48,7 +50,10 @@ # Docs list GENERALDOCS= changes.unix \ + ctrlr.txt \ + dga2.txt \ liesmich.unix \ + listinfo.txt \ multiplayer-readme.txt \ xmame-doc-1.html \ xmame-doc-2.html \ @@ -57,7 +62,10 @@ xmame-doc-5.html \ xmame-doc-6.html \ xmame-doc-7.html \ + xmame-doc-8.html \ xmame-doc.html \ + xmame-doc.lyx \ + xmame-doc.txt \ xmame-gdoc-1.html \ xmame-gdoc-2.html \ xmame-gdoc-3.html \ @@ -65,28 +73,19 @@ xmame-gdoc-5.html \ xmame-gdoc-6.html \ xmame-gdoc-7.html \ + xmame-gdoc-8.html \ xmame-gdoc.html \ - xmame-doc.lyx \ - xmame-doc.txt + xmame.css XMAMEDOCS= changes.mame \ - ctrlr.txt \ gamelist.mame \ - readme.mame \ - xmame-doc-8.html \ - xmame-gdoc-8.html \ - xmame.css \ - dga2.txt + readme.mame XMESSDOCS= changes.mess \ credits.mess \ gamelist.mess \ - readme.mess \ - messroms.txt \ imgtool.txt \ + messhelp.txt \ messroms.txt \ - xmame-doc-8.html \ - xmame-gdoc-8.html \ - xmame.css \ - dga2.txt + old-changes.mess PINMAMEDOCS= pinmame/simulation.txt \ pinmame/whatsnew.txt \ pinmame/pinmame.txt \ @@ -122,17 +121,18 @@ BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip -HIVER= 7 +HIVER= 795 -DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} \ - hsdat${HIVER}.zip history.zip cheat.zip +DISTFILES+= uhsdat${HIVER}.zip:highscore history.dat.zip:history \ + cheat.zip:cheat EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} post-extract: cd ${WRKDIR} && \ - unzip -q ${DISTDIR}/${DIST_SUBDIR}/hsdat${HIVER}.zip hiscore.dat + unzip -q ${DISTDIR}/${DIST_SUBDIR}/uhsdat${HIVER}.zip \ + hiscore.dat cd ${WRKDIR} && \ - unzip -q ${DISTDIR}/${DIST_SUBDIR}/history.zip history.dat + unzip -q ${DISTDIR}/${DIST_SUBDIR}/history.dat.zip history.dat cd ${WRKDIR} && \ unzip -q ${DISTDIR}/${DIST_SUBDIR}/cheat.zip cheat.dat .else @@ -248,16 +248,6 @@ ${ECHO_MSG} '-------------------------------------------------------------------------';) .endif -# Some simple patches that don't warrant a separate patch -post-patch: - ${PERL} -pi -e 's@SDL/@SDL11/@' ${WRKSRC}/src/unix/video-drivers/SDL.c - ${PERL} -pi -e 's@png.h@../../png.h@' \ - ${WRKSRC}/src/unix/video-drivers/glexport.c - ${PERL} -pi -e 's@malloc.h@stdlib.h@' \ - ${WRKSRC}/src/unix/video-drivers/gljpg.c - ${PERL} -pi -e 's@asm/io.h@machine/cpufunc.h@' \ - ${WRKSRC}/src/unix/video-drivers/twkuser.c - # The large number of sed regexes here is intended to make this port a whole # lot easier to maintain - please don't convert them into a patch. do-configure: @@ -267,6 +257,7 @@ -e "s@/usr/X11R6@${X11BASE}@g" \ -e "s@-g bin@-g wheel@g" \ -e "s@^ARCH = linux@ARCH = freebsd@g" \ + -e "s@# X11_XV@X11_XV@g" \ -e "s@# X11_DGA@X11_DGA@g" \ -e "s@= x11@= ${DISPLAY_METHOD}@g" \ -e "s@= mame@= ${MAMEMESS}@g" \ diff -urN --exclude=CVS /usr/ports/emulators/xmame/distinfo xmame/distinfo --- /usr/ports/emulators/xmame/distinfo Fri Nov 1 06:04:09 2002 +++ xmame/distinfo Thu Nov 14 14:44:43 2002 @@ -1,7 +1,6 @@ -MD5 (xmame/xmame-0.60.1.tar.bz2) = 887e3956e410b06b92165637ba219070 +MD5 (xmame/xmame-0.61.1.tar.bz2) = 8d0babde89ff1af4280c76f36750a457 MD5 (xmame/xmame-0.59.2.tar.bz2) = f35a5f9a79da963c157867015c284562 -MD5 (xmame/xmame-0.56.2.tar.bz2) = e43dd5e087f954351948fb9848485924 MD5 (xmame/cheat.zip) = b745ea4df1a3a517c00fedae1ee49a14 -MD5 (xmame/history.zip) = 69da5c33e6a78092c6cd75cbeb737c6a -MD5 (xmame/hsdat7.zip) = 9e4a7e36448895f13128a675327e34e4 +MD5 (xmame/history.dat.zip) = 8c758537d5f5bc90fc3224b19421ae12 +MD5 (xmame/uhsdat795.zip) = c30956e15cd8218f558f41013a47f22e MD5 (xmame/xmame-0.59.2-pinmame-1.20.b.patch.gz) = aeefd4f6593d389cddbb7081cfc4eb42 diff -urN --exclude=CVS /usr/ports/emulators/xmame/files/patch-makefile.unix xmame/files/patch-makefile.unix --- /usr/ports/emulators/xmame/files/patch-makefile.unix Thu Oct 31 23:54:17 2002 +++ xmame/files/patch-makefile.unix Thu Jan 1 01:00:00 1970 @@ -1,15 +0,0 @@ ---- makefile.unix.orig Fri May 3 02:53:55 2002 -+++ makefile.unix Thu Oct 31 12:40:33 2002 -@@ -363,6 +363,12 @@ - # XINPUT_DEVICES = 1 - - ############################################################################## -+# *** SDL options, only needed for SDL as display method -+############################################################################## -+# *** The name of your sdl-config executable -+SDL_CONFIG = sdl-config -+ -+############################################################################## - # *** OpenGL info -- configure if you are using the xgl display option - ############################################################################## - GLLIBS= -ldl diff -urN --exclude=CVS /usr/ports/emulators/xmame/files/patch-src::unix::dsp-drivers::oss.c xmame/files/patch-src::unix::dsp-drivers::oss.c --- /usr/ports/emulators/xmame/files/patch-src::unix::dsp-drivers::oss.c Thu Oct 31 23:54:17 2002 +++ xmame/files/patch-src::unix::dsp-drivers::oss.c Thu Jan 1 01:00:00 1970 @@ -1,13 +0,0 @@ ---- src/unix/sysdep/dsp-drivers/oss.c.orig Fri May 3 02:53:54 2002 -+++ src/unix/sysdep/dsp-drivers/oss.c Thu Oct 31 12:46:35 2002 -@@ -29,9 +29,7 @@ - #include <sys/types.h> - #include <sys/stat.h> - #include <sys/ioctl.h> --#ifdef __ARCH_freebsd --#include <machine/soundcard.h> --#elif defined (__ARCH_openbsd) -+#if defined (__ARCH_openbsd) - #include <soundcard.h> - #else - #include <sys/soundcard.h> diff -urN --exclude=CVS /usr/ports/emulators/xmame/files/patch-src::unix::joystick-drivers::joy_usb.c xmame/files/patch-src::unix::joystick-drivers::joy_usb.c --- /usr/ports/emulators/xmame/files/patch-src::unix::joystick-drivers::joy_usb.c Thu Oct 31 23:54:17 2002 +++ xmame/files/patch-src::unix::joystick-drivers::joy_usb.c Thu Jan 1 01:00:00 1970 @@ -1,38 +0,0 @@ ---- src/unix/joystick-drivers/joy_usb.c.orig Fri May 3 02:53:54 2002 -+++ src/unix/joystick-drivers/joy_usb.c Thu Oct 31 13:17:45 2002 -@@ -27,8 +27,12 @@ - #include <usb.h> - #endif - #elif defined(__ARCH_freebsd) -+#ifdef HAVE_USBHID_H -+#include <libusbhid.h> -+#else - #include <libusb.h> - #endif -+#endif - #include <dev/usb/usb.h> - #include <dev/usb/usbhid.h> - -@@ -87,11 +91,13 @@ - priv_joy_data[i].hids = NULL; - - #ifdef HAVE_USBHID_H -+#if defined(__ARCH_netbsd) || (defined(__ARCH_freebsd) && __FreeBSD_version > 500000) - if (ioctl(joy_data[i].fd, USB_GET_REPORT_ID, &report_id) < 0) - { - fprintf(stderr_file, "error: /dev/uhid%d: %s", i, strerror(errno)); - return FALSE; - } -+#endif - - size = hid_report_size(rd, hid_input, report_id); - priv_joy_data[i].offset = 0; -@@ -108,7 +114,7 @@ - priv_joy_data[i].dlen = size; - - is_joystick = 0; --#ifdef HAVE_USBHID_H -+#if defined(__ARCH_netbsd) && defined(HAVE_USBHID_H) - for (d = hid_start_parse(rd, 1 << hid_input, report_id); - hid_get_item(d, &h); ) - #else diff -urN --exclude=CVS /usr/ports/emulators/xmame/files/patch-src::unix::sysdep::mixer-drivers::oss.c xmame/files/patch-src::unix::sysdep::mixer-drivers::oss.c --- /usr/ports/emulators/xmame/files/patch-src::unix::sysdep::mixer-drivers::oss.c Thu Oct 31 23:54:17 2002 +++ xmame/files/patch-src::unix::sysdep::mixer-drivers::oss.c Thu Jan 1 01:00:00 1970 @@ -1,13 +0,0 @@ ---- src/unix/sysdep/mixer-drivers/oss.c.orig Fri May 3 02:53:54 2002 -+++ src/unix/sysdep/mixer-drivers/oss.c Thu Oct 31 12:46:55 2002 -@@ -28,9 +28,7 @@ - #include <sys/types.h> - #include <sys/stat.h> - #include <sys/ioctl.h> --#ifdef __ARCH_freebsd --#include <machine/soundcard.h> --#elif defined (__ARCH_openbsd) -+#if defined (__ARCH_openbsd) - #include <soundcard.h> - #else - #include <sys/soundcard.h> diff -urN --exclude=CVS /usr/ports/emulators/xmame/files/patch-src::unix::unix.mak xmame/files/patch-src::unix::unix.mak --- /usr/ports/emulators/xmame/files/patch-src::unix::unix.mak Thu Oct 31 23:54:17 2002 +++ xmame/files/patch-src::unix::unix.mak Thu Jan 1 01:00:00 1970 @@ -1,56 +0,0 @@ ---- src/unix/unix.mak.orig Fri May 3 02:53:53 2002 -+++ src/unix/unix.mak Thu Oct 31 13:15:25 2002 -@@ -56,14 +56,14 @@ - LIBS.xfx = $(X11LIB) $(JOY_X11_LIBS) -lX11 -lXext -lglide2x - LIBS.svgafx = $(X11LIB) -lvga -lvgagl -lglide2x - LIBS.openstep = -framework AppKit --LIBS.SDL = `sdl-config --libs` -+LIBS.SDL = $(X11LIB) `$(SDL_CONFIG) --libs` - LIBS.photon2 = -L/usr/lib -lph -lphrender - - CFLAGS.x11 = $(X11INC) $(JOY_X11_CFLAGS) $(XINPUT_DEVICES_CFLAGS) - CFLAGS.xgl = $(X11INC) $(JOY_X11_CFLAGS) $(GLCFLAGS) - CFLAGS.xfx = $(X11INC) $(JOY_X11_CFLAGS) -I/usr/include/glide - CFLAGS.svgafx = -I/usr/include/glide --CFLAGS.SDL = -D_REENTRANT -+CFLAGS.SDL = $(X11INC) `$(SDL_CONFIG) --cflags` -D_REENTRANT - CFLAGS.photon2 = - - INST.x11 = doinstall -@@ -235,8 +235,17 @@ - MY_LIBS += -lusb - endif - else -+ifeq ($(ARCH), freebsd) -+ifeq ($(shell test -f /usr/include/libusbhid.h && echo have_usbhid), have_usbhid) -+CONFIG += -DHAVE_USBHID_H -+MY_LIBS += -lusbhid -+else - MY_LIBS += -lusb - endif -+else -+MY_LIBS += -lusb -+endif -+endif - endif - - ifdef EFENCE -@@ -366,7 +375,7 @@ - - doc/x$(TARGET)rc.dist: all src/unix/xmamerc-keybinding-notes.txt - ./x$(TARGET).$(DISPLAY_METHOD) -noloadconfig -showconfig | \ -- grep -v loadconfig > doc/x$(TARGET)rc.dist -+ grep -v loadconfig | tr "\033" \# > doc/x$(TARGET)rc.dist - cat src/unix/xmamerc-keybinding-notes.txt >> doc/x$(TARGET)rc.dist - - doc/gamelist.$(TARGET): all -@@ -375,7 +384,8 @@ - - doc/x$(TARGET).6: all src/unix/xmame.6-1 src/unix/xmame.6-3 - cat src/unix/xmame.6-1 > doc/x$(TARGET).6 -- ./x$(TARGET).$(DISPLAY_METHOD) -manhelp >> doc/x$(TARGET).6 -+ ./x$(TARGET).$(DISPLAY_METHOD) -noloadconfig -manhelp | \ -+ tr "\033" \# >> doc/x$(TARGET).6 - cat src/unix/xmame.6-3 >> doc/x$(TARGET).6 - - install: $(INST.$(DISPLAY_METHOD)) install-man diff -urN --exclude=CVS /usr/ports/emulators/xmame/files/patch-src::unix::video-drivers::svgainput.c xmame/files/patch-src::unix::video-drivers::svgainput.c --- /usr/ports/emulators/xmame/files/patch-src::unix::video-drivers::svgainput.c Thu Oct 31 23:54:17 2002 +++ xmame/files/patch-src::unix::video-drivers::svgainput.c Thu Jan 1 01:00:00 1970 @@ -1,13 +0,0 @@ ---- src/unix/video-drivers/svgainput.c.orig Fri May 3 02:53:54 2002 -+++ src/unix/video-drivers/svgainput.c Thu Oct 31 12:46:04 2002 -@@ -12,6 +12,10 @@ - #include "devices.h" - #include "keyboard.h" - -+#if defined(__ARCH_freebsd) -+#define SIGUNUSED SIGUSR2 -+#endif -+ - static int console_fd = -1; - static int mouse_fd = -1; - static int leds = 0; diff -urN --exclude=CVS /usr/ports/emulators/xmame/pkg-plist xmame/pkg-plist --- /usr/ports/emulators/xmame/pkg-plist Fri Nov 1 06:04:09 2002 +++ xmame/pkg-plist Thu Nov 14 12:12:24 2002 @@ -2,6 +2,8 @@ etc/%%MAMEMESS%%rc.sample share/%%MAMEMESS%%/%%MAMEMESS%%rc %%PORTDOCS%%share/doc/%%MAMEMESS%%/changes.unix +%%PORTDOCS%%share/doc/%%MAMEMESS%%/ctrlr.txt +%%PORTDOCS%%share/doc/%%MAMEMESS%%/dga2.txt %%PORTDOCS%%share/doc/%%MAMEMESS%%/liesmich.unix %%PORTDOCS%%share/doc/%%MAMEMESS%%/multiplayer-readme.txt %%PORTDOCS%%share/doc/%%MAMEMESS%%/xmame-doc-1.html @@ -11,7 +13,10 @@ %%PORTDOCS%%share/doc/%%MAMEMESS%%/xmame-doc-5.html %%PORTDOCS%%share/doc/%%MAMEMESS%%/xmame-doc-6.html %%PORTDOCS%%share/doc/%%MAMEMESS%%/xmame-doc-7.html +%%PORTDOCS%%share/doc/%%MAMEMESS%%/xmame-doc-8.html %%PORTDOCS%%share/doc/%%MAMEMESS%%/xmame-doc.html +%%PORTDOCS%%share/doc/%%MAMEMESS%%/xmame-doc.lyx +%%PORTDOCS%%share/doc/%%MAMEMESS%%/xmame-doc.txt %%PORTDOCS%%share/doc/%%MAMEMESS%%/xmame-gdoc-1.html %%PORTDOCS%%share/doc/%%MAMEMESS%%/xmame-gdoc-2.html %%PORTDOCS%%share/doc/%%MAMEMESS%%/xmame-gdoc-3.html @@ -21,30 +26,20 @@ %%PORTDOCS%%share/doc/%%MAMEMESS%%/xmame-gdoc-7.html %%PORTDOCS%%share/doc/%%MAMEMESS%%/xmame-gdoc-8.html %%PORTDOCS%%share/doc/%%MAMEMESS%%/xmame-gdoc.html -%%PORTDOCS%%share/doc/%%MAMEMESS%%/xmame-doc.lyx -%%PORTDOCS%%share/doc/%%MAMEMESS%%/xmame-doc.txt -%%PORTDOCS%%share/doc/%%MAMEMESS%%/dga2.txt +%%PORTDOCS%%share/doc/%%MAMEMESS%%/xmame.css %%MAMEONLY%%%%DATFILES%%share/xmame/hiscore.dat %%MAMEONLY%%%%DATFILES%%share/xmame/history.dat %%MAMEONLY%%%%DATFILES%%share/xmame/cheat.dat %%MAMEONLY%%%%PORTDOCS%%share/doc/xmame/changes.mame -%%MAMEONLY%%%%PORTDOCS%%share/doc/xmame/ctrlr.txt %%MAMEONLY%%%%PORTDOCS%%share/doc/xmame/gamelist.mame %%MAMEONLY%%%%PORTDOCS%%share/doc/xmame/readme.mame -%%MAMEONLY%%%%PORTDOCS%%share/doc/xmame/xmame-doc-8.html -%%MAMEONLY%%%%PORTDOCS%%share/doc/xmame/xmame-gdoc-8.html -%%MAMEONLY%%%%PORTDOCS%%share/doc/xmame/xmame.css -%%MAMEONLY%%%%PORTDOCS%%share/doc/xmame/dga2.txt %%MESSONLY%%%%PORTDOCS%%share/doc/xmess/changes.mess %%MESSONLY%%%%PORTDOCS%%share/doc/xmess/credits.mess %%MESSONLY%%%%PORTDOCS%%share/doc/xmess/gamelist.mess -%%MESSONLY%%%%PORTDOCS%%share/doc/xmess/readme.mess -%%MESSONLY%%%%PORTDOCS%%share/doc/xmess/messroms.txt %%MESSONLY%%%%PORTDOCS%%share/doc/xmess/imgtool.txt -%%MESSONLY%%%%PORTDOCS%%share/doc/xmess/xmame-doc-8.html -%%MESSONLY%%%%PORTDOCS%%share/doc/xmess/xmame-gdoc-8.html -%%MESSONLY%%%%PORTDOCS%%share/doc/xmess/xmame.css -%%MESSONLY%%%%PORTDOCS%%share/doc/xmess/dga2.txt +%%MESSONLY%%%%PORTDOCS%%share/doc/xmess/messhelp.txt +%%MESSONLY%%%%PORTDOCS%%share/doc/xmess/messroms.txt +%%MESSONLY%%%%PORTDOCS%%share/doc/xmess/old-changes.mess %%MESSONLY%%share/xmess/history.dat %%PINMAMEONLY%%%%PORTDOCS%%share/doc/xpinmame/simulation.txt %%PINMAMEONLY%%%%PORTDOCS%%share/doc/xpinmame/whatsnew.txt diff -urN --exclude=CVS /usr/ports/emulators/xmess/Makefile xmess/Makefile --- /usr/ports/emulators/xmess/Makefile Fri Nov 1 06:04:09 2002 +++ xmess/Makefile Thu Nov 14 14:01:21 2002 @@ -6,12 +6,11 @@ # PORTNAME= xmess -PORTVERSION= 0.56.2 +PORTVERSION= 0.61.1 MAINTAINER= stijn@win.tue.nl MASTERDIR= ${.CURDIR}/../xmame -PATCHDIR= ${.CURDIR}/files COMMENT= ${.CURDIR}/pkg-comment DESCR= ${.CURDIR}/pkg-descr diff -urN --exclude=CVS /usr/ports/emulators/xmess/files/patch-makefile.unix xmess/files/patch-makefile.unix --- /usr/ports/emulators/xmess/files/patch-makefile.unix Thu Oct 31 23:50:26 2002 +++ xmess/files/patch-makefile.unix Thu Jan 1 01:00:00 1970 @@ -1,15 +0,0 @@ ---- makefile.unix.orig Fri May 3 02:53:55 2002 -+++ makefile.unix Thu Oct 31 12:40:33 2002 -@@ -363,6 +363,12 @@ - # XINPUT_DEVICES = 1 - - ############################################################################## -+# *** SDL options, only needed for SDL as display method -+############################################################################## -+# *** The name of your sdl-config executable -+SDL_CONFIG = sdl-config -+ -+############################################################################## - # *** OpenGL info -- configure if you are using the xgl display option - ############################################################################## - GLLIBS= -ldl diff -urN --exclude=CVS /usr/ports/emulators/xmess/files/patch-src::unix::dsp-drivers::oss.c xmess/files/patch-src::unix::dsp-drivers::oss.c --- /usr/ports/emulators/xmess/files/patch-src::unix::dsp-drivers::oss.c Thu Oct 31 23:50:26 2002 +++ xmess/files/patch-src::unix::dsp-drivers::oss.c Thu Jan 1 01:00:00 1970 @@ -1,13 +0,0 @@ ---- src/unix/sysdep/dsp-drivers/oss.c.orig Fri May 3 02:53:54 2002 -+++ src/unix/sysdep/dsp-drivers/oss.c Thu Oct 31 12:46:35 2002 -@@ -29,9 +29,7 @@ - #include <sys/types.h> - #include <sys/stat.h> - #include <sys/ioctl.h> --#ifdef __ARCH_freebsd --#include <machine/soundcard.h> --#elif defined (__ARCH_openbsd) -+#if defined (__ARCH_openbsd) - #include <soundcard.h> - #else - #include <sys/soundcard.h> diff -urN --exclude=CVS /usr/ports/emulators/xmess/files/patch-src::unix::joystick-drivers::joy_usb.c xmess/files/patch-src::unix::joystick-drivers::joy_usb.c --- /usr/ports/emulators/xmess/files/patch-src::unix::joystick-drivers::joy_usb.c Thu Oct 31 23:50:26 2002 +++ xmess/files/patch-src::unix::joystick-drivers::joy_usb.c Thu Jan 1 01:00:00 1970 @@ -1,46 +0,0 @@ ---- src/unix/joystick-drivers/joy_usb.c.orig Sat Nov 3 02:22:56 2001 -+++ src/unix/joystick-drivers/joy_usb.c Thu Oct 31 15:27:02 2002 -@@ -23,8 +23,12 @@ - #if defined(__ARCH_netbsd) - #include <usb.h> - #elif defined(__ARCH_freebsd) -+#ifdef HAVE_USBHID_H -+#include <libusbhid.h> -+#else - #include <libusb.h> - #endif -+#endif - #include <dev/usb/usb.h> - #include <dev/usb/usbhid.h> - -@@ -82,7 +86,22 @@ - - priv_joy_data[i].hids = NULL; - -+#if defined(__ARCH_freebsd) && __FreeBSD_version > 500000 -+ if (ioctl(joy_data[i].fd, USB_GET_REPORT_ID, &report_id) < 0) -+ { -+ fprintf(stderr_file, "error: /dev/uhid%d: %s", i, strerror(errno)); -+ return FALSE; -+ } -+#endif -+ -+#if defined(__ARCH_freebsd) && defined(HAVE_USBHID_H) -+ size = hid_report_size(rd, hid_input, report_id); -+ priv_joy_data[i].offset = 0; -+#else - size = hid_report_size(rd, hid_input, &report_id); -+ priv_joy_data[i].offset = (report_id != 0); -+#endif -+ - if ((priv_joy_data[i].data_buf = malloc(size)) == NULL) - { - fprintf(stderr_file, "error: couldn't malloc %d bytes\n", size); -@@ -90,7 +109,6 @@ - return FALSE; - } - priv_joy_data[i].dlen = size; -- priv_joy_data[i].offset = (report_id != 0); - - is_joystick = 0; - for (d = hid_start_parse(rd, 1 << hid_input); hid_get_item(d, &h); ) diff -urN --exclude=CVS /usr/ports/emulators/xmess/files/patch-src::unix::sysdep::mixer-drivers::oss.c xmess/files/patch-src::unix::sysdep::mixer-drivers::oss.c --- /usr/ports/emulators/xmess/files/patch-src::unix::sysdep::mixer-drivers::oss.c Thu Oct 31 23:50:26 2002 +++ xmess/files/patch-src::unix::sysdep::mixer-drivers::oss.c Thu Jan 1 01:00:00 1970 @@ -1,13 +0,0 @@ ---- src/unix/sysdep/mixer-drivers/oss.c.orig Fri May 3 02:53:54 2002 -+++ src/unix/sysdep/mixer-drivers/oss.c Thu Oct 31 12:46:55 2002 -@@ -28,9 +28,7 @@ - #include <sys/types.h> - #include <sys/stat.h> - #include <sys/ioctl.h> --#ifdef __ARCH_freebsd --#include <machine/soundcard.h> --#elif defined (__ARCH_openbsd) -+#if defined (__ARCH_openbsd) - #include <soundcard.h> - #else - #include <sys/soundcard.h> diff -urN --exclude=CVS /usr/ports/emulators/xmess/files/patch-src::unix::unix.mak xmess/files/patch-src::unix::unix.mak --- /usr/ports/emulators/xmess/files/patch-src::unix::unix.mak Thu Oct 31 23:50:26 2002 +++ xmess/files/patch-src::unix::unix.mak Thu Jan 1 01:00:00 1970 @@ -1,56 +0,0 @@ ---- src/unix/unix.mak.orig Mon Dec 31 09:19:03 2001 -+++ src/unix/unix.mak Thu Oct 31 15:25:37 2002 -@@ -51,14 +51,14 @@ - LIBS.xfx = $(X11LIB) $(JOY_X11_LIBS) -lX11 -lXext -lglide2x - LIBS.svgafx = $(X11LIB) -lvga -lvgagl -lglide2x - LIBS.openstep = -framework AppKit --LIBS.SDL = `sdl-config --libs` -+LIBS.SDL = $(X11LIB) `$(SDL_CONFIG) --libs` - LIBS.photon2 = -L/usr/lib -lph -lphrender - - CFLAGS.x11 = $(X11INC) $(JOY_X11_CFLAGS) - CFLAGS.xgl = $(X11INC) $(JOY_X11_CFLAGS) $(GLCFLAGS) - CFLAGS.xfx = $(X11INC) $(JOY_X11_CFLAGS) -I/usr/include/glide - CFLAGS.svgafx = -I/usr/include/glide --CFLAGS.SDL = -D_REENTRANT -+CFLAGS.SDL = $(X11INC) `$(SDL_CONFIG) --cflags` -D_REENTRANT - CFLAGS.photon2 = - - INST.x11 = doinstall -@@ -210,8 +210,17 @@ - endif - ifdef JOY_USB - CONFIG += -DUSB_JOYSTICK -+ifeq ($(ARCH), freebsd) -+ifeq ($(shell test -f /usr/include/libusbhid.h && echo have_usbhid), have_usbhid) -+CONFIG += -DHAVE_USBHID_H -+MY_LIBS += -lusbhid -+else - MY_LIBS += -lusb - endif -+else -+MY_LIBS += -lusb -+endif -+endif - - ifdef EFENCE - MY_LIBS += -lefence -@@ -340,7 +349,7 @@ - - doc/x$(TARGET)rc.dist: all src/unix/xmamerc-keybinding-notes.txt - ./x$(TARGET).$(DISPLAY_METHOD) -noloadconfig -showconfig | \ -- grep -v loadconfig > doc/x$(TARGET)rc.dist -+ grep -v loadconfig | tr "\033" \# > doc/x$(TARGET)rc.dist - cat src/unix/xmamerc-keybinding-notes.txt >> doc/x$(TARGET)rc.dist - - doc/gamelist.$(TARGET): all -@@ -349,7 +358,8 @@ - - doc/x$(TARGET).6: all src/unix/xmame.6-1 src/unix/xmame.6-3 - cat src/unix/xmame.6-1 > doc/x$(TARGET).6 -- ./x$(TARGET).$(DISPLAY_METHOD) -manhelp >> doc/x$(TARGET).6 -+ ./x$(TARGET).$(DISPLAY_METHOD) -noloadconfig -manhelp | \ -+ tr "\033" \# >> doc/x$(TARGET).6 - cat src/unix/xmame.6-3 >> doc/x$(TARGET).6 - - install: $(INST.$(DISPLAY_METHOD)) install-man diff -urN --exclude=CVS /usr/ports/emulators/xmess/files/patch-src::unix::video-drivers::svgainput.c xmess/files/patch-src::unix::video-drivers::svgainput.c --- /usr/ports/emulators/xmess/files/patch-src::unix::video-drivers::svgainput.c Thu Oct 31 23:50:26 2002 +++ xmess/files/patch-src::unix::video-drivers::svgainput.c Thu Jan 1 01:00:00 1970 @@ -1,13 +0,0 @@ ---- src/unix/video-drivers/svgainput.c.orig Fri May 3 02:53:54 2002 -+++ src/unix/video-drivers/svgainput.c Thu Oct 31 12:46:04 2002 -@@ -12,6 +12,10 @@ - #include "devices.h" - #include "keyboard.h" - -+#if defined(__ARCH_freebsd) -+#define SIGUNUSED SIGUSR2 -+#endif -+ - static int console_fd = -1; - static int mouse_fd = -1; - static int leds = 0; >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200211141354.gAEDslg1021599>