diff options
| author | wiz <wiz> | 2011-02-06 05:00:57 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2011-02-06 05:00:57 +0000 |
| commit | 9260bd83f6a71b5d25f1ecff4187e5d67a1a56af (patch) | |
| tree | 21aa735fb531c9d356f7a22ef95ecf46ccc86b61 /emulators | |
| parent | 10d2361f1e24070479ae7cd739c9241868227ac6 (diff) | |
| download | pkgsrc-9260bd83f6a71b5d25f1ecff4187e5d67a1a56af.tar.gz | |
Remove xmame und xmess -- use mame/mess instead.
Ok kristerw
Diffstat (limited to 'emulators')
26 files changed, 1 insertions, 1029 deletions
diff --git a/emulators/Makefile b/emulators/Makefile index d0aba0f56af..1dc91dfc755 100644 --- a/emulators/Makefile +++ b/emulators/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.185 2011/02/03 22:24:45 wiz Exp $ +# $NetBSD: Makefile,v 1.186 2011/02/06 05:00:57 wiz Exp $ # COMMENT= Emulators for other operating systems @@ -227,8 +227,6 @@ SUBDIR+= xbeeb SUBDIR+= xcopilot SUBDIR+= xhomer SUBDIR+= xm7 -SUBDIR+= xmame -SUBDIR+= xmess SUBDIR+= xtrs SUBDIR+= xyame SUBDIR+= yabause diff --git a/emulators/xmame/DESCR b/emulators/xmame/DESCR deleted file mode 100644 index d8b8e545719..00000000000 --- a/emulators/xmame/DESCR +++ /dev/null @@ -1,8 +0,0 @@ -Xmame is the X11 port of the MAME arcade game emulator. - -MAME is a virtual machine emulator; it includes emulators for numerous -CPUs, sound and video chips used in arcade games, as well as special -purpose decoding PALs and detailed information about the memory layout of -each game. - -To play games in Xmame you must have a copy of the original game ROMs. diff --git a/emulators/xmame/MESSAGE b/emulators/xmame/MESSAGE deleted file mode 100644 index f677c690126..00000000000 --- a/emulators/xmame/MESSAGE +++ /dev/null @@ -1,10 +0,0 @@ -=========================================================================== -$NetBSD: MESSAGE,v 1.2 2002/09/24 12:29:59 wiz Exp $ - -Some games, especially encrypted newer Neo-Geo games, require lots -of memory to decrypt the graphic ROMs. In case the graphics look -garbled, try doing - ulimit -d unlimited -before running xmame. - -=========================================================================== diff --git a/emulators/xmame/Makefile b/emulators/xmame/Makefile deleted file mode 100644 index dbcf24eb785..00000000000 --- a/emulators/xmame/Makefile +++ /dev/null @@ -1,135 +0,0 @@ -# $NetBSD: Makefile,v 1.155 2009/12/23 18:42:43 joerg Exp $ -# - -DISTNAME= xmame-0.106 -CATEGORIES= emulators games x11 -MASTER_SITES= http://x.mame.net/download/ -EXTRACT_SUFX= .tar.bz2 - -MAINTAINER= kristerw@NetBSD.org -HOMEPAGE= http://x.mame.net/ -COMMENT= X11 emulator for old arcade machines -LICENSE= mame-license - -RESTRICTED= selling is not allowed -NO_SRC_ON_CDROM= ${RESTRICTED} -NO_BIN_ON_CDROM= ${RESTRICTED} - -CONFLICTS= sdlmame-[0-9]* - -PKG_DESTDIR_SUPPORT= user-destdir -MAKE_JOBS_SAFE= no - -USE_TOOLS+= gmake -MAKE_FILE= makefile.unix -TARGET= ${PKGBASE} -UNLIMIT_RESOURCES= datasize - -.include "../../mk/bsd.prefs.mk" -.include "options.mk" - -ROMPATH= ${PREFIX}/share/${TARGET} -SPOOLDIR= ${VARBASE}/games/${TARGET} - -MAKE_FLAGS+= TARGET="${TARGET:S/x//}" -MAKE_FLAGS+= X11INC= X11LIB= - -# Network support is broken since xmame-0.85 -#MAKE_FLAGS+= XMAME_NET=1 - -# Determine which CPU-specific code to use. -.for MARCH in alpha m68k i386 ia64 mips -MAME_CPU.${MARCH}?= ${MARCH} -.endfor -MAME_CPU.x86_64?= amd64 -.if !defined(MAME_CPU.${MACHINE_ARCH}) -. include "../../mk/endian.mk" -_MAME_CPU.big-endian= risc -_MAME_CPU.little-endian= risc_lsb -_MAME_CPU.unknown-endian= risc # assume unknown == big -MAME_CPU.${MACHINE_ARCH}?= ${_MAME_CPU.${MACHINE_ENDIAN}-endian} -.endif - -# Determine which operating system defaults to use. -MAME_ARCH.NetBSD?= netbsd -MAME_ARCH.Linux?= linux -MAME_ARCH.SunOS?= solaris -MAME_ARCH.DragonFly?= dragonfly -.if !defined(MAME_ARCH.${OPSYS}) -MAME_ARCH.${OPSYS}?= generic -.endif - -MAKE_FLAGS+= DISPLAY_METHOD=${MAME_DISP_METHOD:Q} -MAKE_FLAGS+= MY_CPU="${MAME_CPU.${MACHINE_ARCH}}" -MAKE_FLAGS+= ARCH="${MAME_ARCH.${OPSYS}}" - -.if ${X11_TYPE} == "modular" -.include "../../x11/libXv/buildlink3.mk" -.include "../../x11/libXxf86dga/buildlink3.mk" -.include "../../x11/libXxf86vm/buildlink3.mk" -MAKE_FLAGS+= X11_DGA=1 -MAKE_FLAGS+= X11_XV=1 -.else -. if exists(${X11BASE}/include/X11/extensions/xf86dga.h) -MAKE_FLAGS+= X11_DGA=1 -. endif -. if exists(${X11BASE}/include/X11/extensions/Xv.h) -MAKE_FLAGS+= X11_XV=1 -. endif -.endif - -# If supported, add appropriate definitions to build joystick drivers. -.if exists(/usr/include/machine/joystick.h) || \ - exists(/usr/include/linux/joystick.h) -MAKE_FLAGS+= JOY_STANDARD=1 -.endif -.if ${OPSYS} == "NetBSD" -. if exists(/usr/lib/libusb.a) || exists(/usr/lib/libusbhid.a) -MAKE_FLAGS+= JOY_USB=1 -. endif -.endif - -OWN_DIRS= ${SPOOLDIR} -INSTALLATION_DIRS= bin ${PKGMANDIR}/man6 - -post-configure: - cd ${WRKSRC}/doc; \ - ${SED} -e "s|@ROMPATH@|${ROMPATH}|g" \ - -e "s|@SPOOLDIR@|${SPOOLDIR}|g" \ - ${TARGET}rc.dist > ${TARGET}rc -.if !empty(MAKE_FLAGS:M*USB*) - ${LN} -fs /usr/include/usb.h ${BUILDLINK_DIR}/include - for FILE in /usr/lib/libusb*; do \ - ${LN} -fs $$FILE ${BUILDLINK_DIR}/lib; \ - done -.endif - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${TARGET}.${MAME_DISP_METHOD} \ - ${DESTDIR}${PREFIX}/bin/${TARGET} - ${INSTALL_PROGRAM} ${WRKSRC}/romcmp ${DESTDIR}${PREFIX}/bin/romcmp - ${INSTALL_PROGRAM} ${WRKSRC}/chdman ${DESTDIR}${PREFIX}/bin/chdman - ${INSTALL_PROGRAM} ${WRKSRC}/xml2info ${DESTDIR}${PREFIX}/bin/xml2info - ${INSTALL_MAN} ${WRKSRC}/doc/${TARGET}.6 \ - ${DESTDIR}${PREFIX}/${PKGMANDIR}/man6/${TARGET}.6 - ${INSTALL_DATA_DIR} ${DESTDIR}${ROMPATH} - ${INSTALL_DATA} ${WRKSRC}/doc/${TARGET}rc \ - ${DESTDIR}${ROMPATH}/${TARGET}rc - ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/html/xmame/ - ${INSTALL_DATA} ${WRKSRC}/doc/*.html \ - ${DESTDIR}${PREFIX}/share/doc/html/xmame/ - ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/xmame - ${INSTALL_DATA} ${WRKSRC}/doc/xmame-doc.txt \ - ${DESTDIR}${PREFIX}/share/doc/xmame - -# Pragma once is not needed, and case warnings/errors on gcc -SUBST_CLASSES+= pragma -SUBST_STAGE.pragma= pre-configure -SUBST_FILES.pragma= src/*.h src/*/*.h -SUBST_SED.pragma= -e "s|\#pragma once||g" - -.include "../../devel/zlib/buildlink3.mk" -.include "../../textproc/expat/buildlink3.mk" -.include "../../x11/libXext/buildlink3.mk" -.include "../../x11/xextproto/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/emulators/xmame/PLIST b/emulators/xmame/PLIST deleted file mode 100644 index 1f34da68a15..00000000000 --- a/emulators/xmame/PLIST +++ /dev/null @@ -1,24 +0,0 @@ -@comment $NetBSD: PLIST,v 1.5 2009/06/14 17:51:10 joerg Exp $ -bin/chdman -bin/romcmp -bin/xmame -bin/xml2info -man/man6/xmame.6 -share/doc/html/xmame/xmame-doc-2.html -share/doc/html/xmame/xmame-doc-3.html -share/doc/html/xmame/xmame-doc-4.html -share/doc/html/xmame/xmame-doc-5.html -share/doc/html/xmame/xmame-doc-6.html -share/doc/html/xmame/xmame-doc-7.html -share/doc/html/xmame/xmame-doc.html -share/doc/html/xmame/xmame-gdoc-1.html -share/doc/html/xmame/xmame-gdoc-2.html -share/doc/html/xmame/xmame-gdoc-3.html -share/doc/html/xmame/xmame-gdoc-4.html -share/doc/html/xmame/xmame-gdoc-5.html -share/doc/html/xmame/xmame-gdoc-6.html -share/doc/html/xmame/xmame-gdoc-7.html -share/doc/html/xmame/xmame-gdoc-8.html -share/doc/html/xmame/xmame-gdoc.html -share/doc/xmame/xmame-doc.txt -share/xmame/xmamerc diff --git a/emulators/xmame/distinfo b/emulators/xmame/distinfo deleted file mode 100644 index afbd8543218..00000000000 --- a/emulators/xmame/distinfo +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: distinfo,v 1.73 2006/06/15 17:33:03 dillo Exp $ - -SHA1 (xmame-0.106.tar.bz2) = 7ae50f869067e101e053ca18e6f788297fcad9e2 -RMD160 (xmame-0.106.tar.bz2) = eab4fa232d59fce5b2216f942f8bc58a992f8d26 -Size (xmame-0.106.tar.bz2) = 17117298 bytes -SHA1 (patch-aa) = b3bd9a8e3a55483fe074453b7ddfc5d111bd9d58 -SHA1 (patch-ab) = 04312e7fad1c39da40bdc9ec84074c676e8eb7e2 -SHA1 (patch-ac) = f4e0f614577924d19713e1862efa1e6d42e791c4 -SHA1 (patch-ad) = 087e162f8b05d894532e6d5091d8b0008c3f0e80 -SHA1 (patch-ae) = efd91447d33b6cb1246bbd2264f92b4ab9be44e0 -SHA1 (patch-af) = 1498df9c05561ee0ace376203506aeb3ecbc9e72 -SHA1 (patch-ag) = c33b9f3f8c81756abcb1bb1d81820f522f3f7293 diff --git a/emulators/xmame/options.mk b/emulators/xmame/options.mk deleted file mode 100644 index 459080f46e6..00000000000 --- a/emulators/xmame/options.mk +++ /dev/null @@ -1,24 +0,0 @@ -# $NetBSD: options.mk,v 1.3 2005/09/03 18:16:07 xtraeme Exp $ -# - -PKG_OPTIONS_VAR= PKG_OPTIONS.xmame -PKG_OPTIONS_OPTIONAL_GROUPS= video -PKG_OPTIONS_GROUP.video= sdl opengl -PKG_SUPPORTED_OPTIONS= esound - -.include "../../mk/bsd.options.mk" - -.if !empty(PKG_OPTIONS:Msdl) -MAME_DISP_METHOD?= SDL -.include "../../devel/SDL/buildlink3.mk" -.elif !empty(PKG_OPTIONS:Mopengl) -MAME_DISP_METHOD?= xgl -.include "../../graphics/Mesa/buildlink3.mk" -.else -MAME_DISP_METHOD?= x11 -.endif - -.if !empty(PKG_OPTIONS:Mesound) -MAKE_FLAGS+= SOUND_ESOUND=1 -.include "../../audio/esound/buildlink3.mk" -.endif diff --git a/emulators/xmame/patches/patch-aa b/emulators/xmame/patches/patch-aa deleted file mode 100644 index c555bcb0a48..00000000000 --- a/emulators/xmame/patches/patch-aa +++ /dev/null @@ -1,166 +0,0 @@ -$NetBSD: patch-aa,v 1.40 2006/06/15 11:40:00 dillo Exp $ - ---- makefile.unix.orig 2006-05-15 18:53:34.000000000 +0200 -+++ makefile.unix -@@ -33,7 +33,7 @@ - ########################################################################### - - # Uncomment one of these. --TARGET = mame -+# TARGET = mame - # TARGET = mess - # TARGET = mage - # TARGET = mmsnd -@@ -97,7 +97,7 @@ - # just as well. However, stay away from the `cc' Ultrix compiler if - # possible. - --CC = @gcc -+# CC = @gcc - # CC = @cc - # CC = @icc - # CC = @c89 -@@ -118,7 +118,7 @@ - - # If you want to use whatever CFLAGS are currently set in your - # environment, then comment this out. --CFLAGS = -+# CFLAGS = - - - ########################################################################### -@@ -127,7 +127,7 @@ - ########################################################################### - - # GCC on x86 --CFLAGS = -O2 -+# CFLAGS = -O2 - - # GCC on x86 with some optimizations - # CFLAGS = -O2 -mtune=i686 -fomit-frame-pointer -fstrength-reduce -ffast-math -@@ -181,13 +181,13 @@ - ######################################################################### - - # Check for C89 + GNU extensions compliance. -- CFLAGS += -std=gnu89 -+ # CFLAGS += -std=gnu89 - - # Show all warnings. -- CFLAGS += -Wall -+ # CFLAGS += -Wall - - # Don't warn about unused variables. -- CFLAGS += -Wno-unused -+ # CFLAGS += -Wno-unused - - # Warn about declarations after statements. - # CFLAGS += -Wdeclaration-after-statement -@@ -328,16 +328,16 @@ - ifeq ($(CC),icc) - - # Optimizations for the Intel compiler. -- CFLAGS = -O3 -rcd -Xa -ipo -ipo_obj -+ # CFLAGS = -O3 -rcd -Xa -ipo -ipo_obj - - else - ifeq ($(CC),sun-forte) - # - # sun-forte given above is just an artifice to get us into this section -- CC = cc -+ # CC = cc - - # uncomment to set compiler defaults oriented for maximum performance -- XOPT += -fast -+ # XOPT += -fast - - # Choose one optimization level; - #XOPT += -xO0 -@@ -346,7 +346,7 @@ - #XOPT += -xO3 - # -xO4 and above automatically inline - #XOPT += -xO4 -- XOPT += -xO5 -+ # XOPT += -xO5 - - # uncomment for code generation targeted to the local machine; this - # supplies -xarch, -xcpu, -xtarget. It also seems to cause an annoying -@@ -354,11 +354,11 @@ - # older hardware, which apparently can't be disabled. As an alternative, - # the particular -xtarget for your system could be specified; - # -xtarget=ultra2/2300 -- XTARGET += -native -+ # XTARGET += -native - #XTARGET += -xtarget=ultra2/2300 - - # uncomment to inline library math functions -- EXTRA_OPTS += -xlibmil -+ # EXTRA_OPTS += -xlibmil - - ###################################################### - # Additional options for parallelization optimizations -@@ -374,7 +374,7 @@ - - # Sparc only, uncomment to do loop restructuring optimizations - # and speculative prefetch for v8plusa and above -- EXTRA_OPTS += -xdepend -xsafe=mem -+ # EXTRA_OPTS += -xdepend -xsafe=mem - - ################################################# - # Additional options for glx builds -@@ -384,14 +384,14 @@ - # (libGLU dlopen() complains of missing name mangled symbols) - # GLCFLAGS += -DSUN_FORTE_DLOPEN_LIBCRUN='\"libCrun.so.1\"' - -- CFLAGS= $(XOPT) $(XTARGET) $(XPARALLEL) $(EXTRA_OPTS) -- LDFLAGS=$(XOPT) $(XTARGET) $(XPARALLEL) $(EXTRA_OPTS) -+ # CFLAGS= $(XOPT) $(XTARGET) $(XPARALLEL) $(EXTRA_OPTS) -+ # LDFLAGS=$(XOPT) $(XTARGET) $(XPARALLEL) $(EXTRA_OPTS) - - # uncomment for silence... -- CFLAGS += -erroff -+ # CFLAGS += -erroff - # Tell xmame that we really are in fact elf. If not supplied, - # SHARED_PREFIX is set causing dlopen()'s to fail. -- CFLAGS += -D__ELF__ -+ # CFLAGS += -D__ELF__ - endif - endif - endif -@@ -614,7 +614,7 @@ - ########################################################################### - - # Linux --ARCH = linux -+# ARCH = linux - - # FreeBSD - # ARCH = freebsd -@@ -727,7 +727,7 @@ - # use SDL. - - # X11 (including Glide & OpenGL if enabled below) --DISPLAY_METHOD = x11 -+# DISPLAY_METHOD = x11 - - # SDL library - # DISPLAY_METHOD = SDL -@@ -758,7 +758,7 @@ - X11_MITSHM = 1 - - # Use Xv extension for hardware scaling. --X11_XV = 1 -+# X11_XV = 1 - - # Enable XFree86 DGA. This also causes "make install" to set the suid bit - # on the executable. -@@ -782,8 +782,8 @@ - # X11LIB = -L/usr/lib/X11 - - # Standard location for XFree86 --X11INC = -I/usr/X11R6/include --X11LIB = -L/usr/X11R6/lib -+# X11INC = -I/usr/X11R6/include -+# X11LIB = -L/usr/X11R6/lib - - # Standard location for Sun systems - # X11INC = -I/usr/openwin/include diff --git a/emulators/xmame/patches/patch-ab b/emulators/xmame/patches/patch-ab deleted file mode 100644 index 9d47af99a39..00000000000 --- a/emulators/xmame/patches/patch-ab +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-ab,v 1.32 2006/06/15 11:40:00 dillo Exp $ - ---- src/unix/unix.mak.orig 2006-05-26 06:52:07.000000000 +0200 -+++ src/unix/unix.mak -@@ -242,7 +242,7 @@ CFLAGS += $(IL) $(CFLAGS.$(MY_CPU)) \ - $(COREDEFS) $(SOUNDDEFS) $(CPUDEFS) $(ASMDEFS) \ - $(INCLUDES) $(INCLUDE_PATH) - --LIBS += $(LIBS.$(ARCH)) $(LIBS.$(DISPLAY_METHOD)) -+LIBS += $(LIBS.$(ARCH)) $(LIBS.$(DISPLAY_METHOD)) -lexpat - - ifdef DEBUG - CFLAGS += -DMAME_DEBUG -@@ -559,15 +559,15 @@ xlistdev: src/unix/contrib/tools/xlistde - - romcmp: $(OBJ)/romcmp.o $(OBJ)/unzip.o $(ZLIB) - @echo 'Linking $@...' -- $(LD) $(LDFLAGS) $^ $(LIBS) -o $@ -+ $(LD) $(LDFLAGS) $^ -lz -o $@ - - chdman: $(OBJ)/chdman.o $(OBJ)/chd.o $(OBJ)/chdcd.o $(OBJ)/cdrom.o $(OBJ)/md5.o $(OBJ)/sha1.o $(OBJ)/version.o $(ZLIB) $(OSTOOLOBJS) - @echo 'Linking $@...' -- $(LD) $(LDFLAGS) $^ $(LIBS) -o $@ -+ $(LD) $(LDFLAGS) $^ -lz -o $@ - - xml2info: $(OBJ)/xml2info.o $(EXPAT) - @echo 'Linking $@...' -- $(LD) $(LDFLAGS) $^ $(LIBS) -o $@ -+ $(LD) $(LDFLAGS) $^ -lexpat -lz -o $@ - - jedutil: $(OBJ)/jedutil.o $(OBJ)/jedparse.o $(OSDBGOBJS) - @echo 'Linking $@...' diff --git a/emulators/xmame/patches/patch-ac b/emulators/xmame/patches/patch-ac deleted file mode 100644 index ba82517536d..00000000000 --- a/emulators/xmame/patches/patch-ac +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ac,v 1.12 2005/11/17 19:55:55 joerg Exp $ - ---- src/unix/video-drivers/xf86_dga1.c.orig 2005-11-17 15:56:02.000000000 +0000 -+++ src/unix/video-drivers/xf86_dga1.c -@@ -6,6 +6,7 @@ - #include <stdlib.h> - #include <string.h> - #include <sys/types.h> -+#include <sys/time.h> - #include <sys/wait.h> - #include <sys/resource.h> - #include <X11/Xlib.h> diff --git a/emulators/xmame/patches/patch-ad b/emulators/xmame/patches/patch-ad deleted file mode 100644 index 883d348e305..00000000000 --- a/emulators/xmame/patches/patch-ad +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ad,v 1.6 2005/11/17 19:55:55 joerg Exp $ - ---- src/unix/video-drivers/xf86_dga2.c.orig 2005-11-17 16:14:12.000000000 +0000 -+++ src/unix/video-drivers/xf86_dga2.c -@@ -9,6 +9,7 @@ - #include <stdlib.h> - #include <string.h> - #include <sys/types.h> -+#include <sys/time.h> - #include <sys/wait.h> - #include <sys/resource.h> - #include <X11/Xlib.h> diff --git a/emulators/xmame/patches/patch-ae b/emulators/xmame/patches/patch-ae deleted file mode 100644 index da73e4b3592..00000000000 --- a/emulators/xmame/patches/patch-ae +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-ae,v 1.23 2005/10/14 20:57:49 kristerw Exp $ - ---- src/unix/doc/xmamerc.dist.orig Sat Nov 6 21:40:52 2004 -+++ src/unix/doc/xmamerc.dist Sat Nov 6 21:42:31 2004 -@@ -62,10 +62,10 @@ - analogstick 0 - - ### Fileio Related ### --rompath /usr/local/share/xmame/roms -+rompath @ROMPATH@ - snapshot_directory . --cheat_file /usr/local/share/xmame/cheat.dat --hiscore_file /usr/local/share/xmame/hiscore.dat -+cheat_file @SPOOLDIR@/cheat.dat -+hiscore_file @SPOOLDIR@/hiscore.dat - - ### Mame Related ### - defaultgame robby diff --git a/emulators/xmame/patches/patch-af b/emulators/xmame/patches/patch-af deleted file mode 100644 index beb69b3d9a9..00000000000 --- a/emulators/xmame/patches/patch-af +++ /dev/null @@ -1,40 +0,0 @@ -$NetBSD: patch-af,v 1.7 2005/11/17 19:55:55 joerg Exp $ - ---- src/unix/joystick-drivers/joy_standard.c.orig 2005-11-17 16:17:48.000000000 +0000 -+++ src/unix/joystick-drivers/joy_standard.c -@@ -6,7 +6,7 @@ static int use_old_driver = 0; - - struct rc_option joy_standard_opts[] = { - /* name, shortname, type, dest, deflt, min, max, func, help */ --#if defined(__ARCH_netbsd) || defined(__ARCH_freebsd) || defined(__ARCH_openbsd) -+#if defined(__ARCH_netbsd) || defined(__ARCH_freebsd) || defined(__ARCH_openbsd) || defined(__ARCH_dragonfly) - { "joydevname", "jdev", rc_string, &joy_dev, - "/dev/joy", 0, 0, NULL, - "Joystick device prefix (defaults to /dev/joy)" }, -@@ -29,7 +29,7 @@ struct rc_option joy_standard_opts[] = { - #include <sys/ioctl.h> - - /* specific joystick for PC clones */ --#if defined(__ARCH_netbsd) || defined(__ARCH_freebsd) || defined(__ARCH_openbsd) -+#if defined(__ARCH_netbsd) || defined(__ARCH_freebsd) || defined(__ARCH_openbsd) || defined(__ARCH_dragonfly) - - #include <machine/joystick.h> - typedef struct joystick joy_struct; -@@ -142,7 +142,7 @@ void joy_standard_init(void) - /* fall through to the next case */ - case 1: - joy_data[i].num_axes = 2; --#if defined(__ARCH_netbsd) || defined(__ARCH_freebsd) || defined(__ARCH_openbsd) -+#if defined(__ARCH_netbsd) || defined(__ARCH_freebsd) || defined(__ARCH_openbsd) || defined(__ARCH_dragonfly) - joy_data[i].num_buttons = 2; - #else - joy_data[i].num_buttons = JOY_BUTTONS; -@@ -217,7 +217,7 @@ void joy_standard_poll(void) - continue; - - /* get value of buttons */ --#if defined(__ARCH_netbsd) || defined(__ARCH_freebsd) || defined(__ARCH_openbsd) -+#if defined(__ARCH_netbsd) || defined(__ARCH_freebsd) || defined(__ARCH_openbsd) || defined(__ARCH_dragonfly) - joy_data[i].buttons[0] = my_joy_data.b1; - joy_data[i].buttons[1] = my_joy_data.b2; - #else diff --git a/emulators/xmame/patches/patch-ag b/emulators/xmame/patches/patch-ag deleted file mode 100644 index 67c2b4650f8..00000000000 --- a/emulators/xmame/patches/patch-ag +++ /dev/null @@ -1,36 +0,0 @@ -$NetBSD: patch-ag,v 1.4 2005/11/17 19:55:55 joerg Exp $ - ---- src/unix/joystick-drivers/joy_usb.c.orig 2005-11-17 16:19:51.000000000 +0000 -+++ src/unix/joystick-drivers/joy_usb.c -@@ -22,7 +22,7 @@ struct rc_option joy_usb_opts[] = { - #ifdef USB_JOYSTICK - - --#if !defined(__ARCH_openbsd) && !defined(__ARCH_netbsd) && !defined(__ARCH_freebsd) -+#if !defined(__ARCH_openbsd) && !defined(__ARCH_netbsd) && !defined(__ARCH_freebsd) && !defined(__ARCH_dragonfly) - #error "USB joysticks are only supported under OpenBSD, NetBSD and FreeBSD. Patches to support other archs are welcome ;)" - #endif - -@@ -47,8 +47,13 @@ struct rc_option joy_usb_opts[] = { - #include <sys/ioctl.h> - #endif - -+#ifdef __ARCH_dragonfly -+#include <bus/usb/usb.h> -+#include <bus/usb/usbhid.h> -+#else - #include <dev/usb/usb.h> - #include <dev/usb/usbhid.h> -+#endif - - int axis_usage[] = { - HUG_X, HUG_Y, HUG_Z, -@@ -118,7 +123,7 @@ static int joy_initialize_hid(int i) - } - - #if defined(HAVE_USBHID_H) || defined(HAVE_LIBUSBHID_H) --#if defined(__ARCH_openbsd) || defined(__ARCH_netbsd) || (defined(__ARCH_freebsd) && __FreeBSD_version > 500000) -+#if defined(__ARCH_openbsd) || defined(__ARCH_netbsd) || (defined(__ARCH_freebsd) && __FreeBSD_version > 500000) || defined(__ARCH_dragonfly) - if (ioctl(joy_data[i].fd, USB_GET_REPORT_ID, &report_id) < 0) - { - fprintf(stderr_file, "error: /dev/uhid%d: %s", i, strerror(errno)); diff --git a/emulators/xmess/DESCR b/emulators/xmess/DESCR deleted file mode 100644 index d30a206a69e..00000000000 --- a/emulators/xmess/DESCR +++ /dev/null @@ -1,8 +0,0 @@ -X-MESS is the X11 port of the MESS game console emulator. - -MESS is a virtual machine emulator; it includes emulators for the CPUs, -sound and video chips used in game consoles, as well as special purpose -PALs and detailed information about the memory layout of each machine. - -To play games in X-MESS you must have a copy of the original game, -extracted from a cartridge, floppy or tape image. diff --git a/emulators/xmess/Makefile b/emulators/xmess/Makefile deleted file mode 100644 index 0a066693293..00000000000 --- a/emulators/xmess/Makefile +++ /dev/null @@ -1,131 +0,0 @@ -# $NetBSD: Makefile,v 1.94 2009/05/19 08:59:13 wiz Exp $ -# - -DISTNAME= xmame-0.106 -PKGNAME= xmess-0.106 -CATEGORIES= emulators games x11 -MASTER_SITES= http://x.mame.net/download/ -EXTRACT_SUFX= .tar.bz2 - -MAINTAINER= kristerw@NetBSD.org -HOMEPAGE= http://x.mame.net/ -COMMENT= X11 emulator for old computers and console machines -LICENSE= mame-license - -RESTRICTED= selling is not allowed -NO_SRC_ON_CDROM= ${RESTRICTED} -NO_BIN_ON_CDROM= ${RESTRICTED} - -PKG_DESTDIR_SUPPORT= user-destdir - -CONFLICTS= sdlmess-[0-9]* - -USE_TOOLS+= gmake -MAKE_FILE= makefile.unix -TARGET= ${PKGBASE} -UNLIMIT_RESOURCES= datasize - -.include "../../mk/bsd.prefs.mk" -.include "options.mk" - -ROMPATH= ${PREFIX}/share/${TARGET} -SPOOLDIR= ${VARBASE}/games/${TARGET} - -MAKE_FLAGS+= TARGET="${TARGET:S/x//}" -MAKE_FLAGS+= X11INC= X11LIB= - -# Network support is broken since xmame-0.85 -#MAKE_FLAGS+= XMAME_NET=1 - -# Determine which CPU-specific code to use. -.for MARCH in alpha m68k i386 ia64 mips -MAME_CPU.${MARCH}?= ${MARCH} -.endfor -MAME_CPU.x86_64?= amd64 -.if !defined(MAME_CPU.${MACHINE_ARCH}) -. include "../../mk/endian.mk" -_MAME_CPU.big-endian= risc -_MAME_CPU.little-endian= risc_lsb -_MAME_CPU.unknown-endian= risc # assume unknown == big -MAME_CPU.${MACHINE_ARCH}?= ${_MAME_CPU.${MACHINE_ENDIAN}-endian} -.endif - -# Determine which operating system defaults to use. -MAME_ARCH.NetBSD?= netbsd -MAME_ARCH.Linux?= linux -MAME_ARCH.SunOS?= solaris -MAME_ARCH.DragonFly?= dragonfly -.if !defined(MAME_ARCH.${OPSYS}) -MAME_ARCH.${OPSYS}?= generic -.endif - -MAKE_FLAGS+= DISPLAY_METHOD=${MAME_DISP_METHOD:Q} -MAKE_FLAGS+= MY_CPU="${MAME_CPU.${MACHINE_ARCH}}" -MAKE_FLAGS+= ARCH="${MAME_ARCH.${OPSYS}}" - -.if ${X11_TYPE} == "modular" -.include "../../x11/libXv/buildlink3.mk" -.include "../../x11/libXxf86dga/buildlink3.mk" -.include "../../x11/libXxf86vm/buildlink3.mk" -MAKE_FLAGS+= X11_DGA=1 -MAKE_FLAGS+= X11_XV=1 -.else -. if exists(${X11BASE}/include/X11/extensions/xf86dga.h) -MAKE_FLAGS+= X11_DGA=1 -. endif -. if exists(${X11BASE}/include/X11/extensions/Xv.h) -MAKE_FLAGS+= X11_XV=1 -. endif -.endif - -# If supported, add appropriate definitions to build joystick drivers. -.if exists(/usr/include/machine/joystick.h) || \ - exists(/usr/include/linux/joystick.h) -MAKE_FLAGS+= JOY_STANDARD=1 -.endif -.if ${OPSYS} == "NetBSD" -. if exists(/usr/lib/libusb.a) || exists(/usr/lib/libusbhid.a) -MAKE_FLAGS+= JOY_USB=1 -. endif -.endif - -# This should be supported with the proper defines -#.include "../../x11/libXi/buildlink3.mk" -#.include "../../x11/libXinerama/buildlink3.mk" - -OWN_DIRS= ${SPOOLDIR} -INSTALLATION_DIRS= bin ${PKGMANDIR}/man6 - -post-configure: - cd ${WRKSRC}/doc; \ - ${SED} -e "s|@ROMPATH@|${ROMPATH}|g" \ - -e "s|@SPOOLDIR@|${SPOOLDIR}|g" \ - ${TARGET}rc.dist > ${TARGET}rc -.if !empty(MAKE_FLAGS:M*USB*) - ${LN} -fs /usr/include/usb.h ${BUILDLINK_DIR}/include - for FILE in /usr/lib/libusb*; do \ - ${LN} -fs $$FILE ${BUILDLINK_DIR}/lib; \ - done -.endif - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${TARGET}.${MAME_DISP_METHOD} \ - ${DESTDIR}${PREFIX}/bin/${TARGET} - ${INSTALL_PROGRAM} ${WRKSRC}/imgtool ${DESTDIR}${PREFIX}/bin/imgtool - ${INSTALL_MAN} ${WRKSRC}/doc/${TARGET}.6 \ - ${DESTDIR}${PREFIX}/${PKGMANDIR}/man6/${TARGET}.6 - ${INSTALL_DATA_DIR} ${DESTDIR}${ROMPATH} - ${INSTALL_DATA} ${WRKSRC}/doc/${TARGET}rc \ - ${DESTDIR}${ROMPATH}/${TARGET}rc - -# Pragma once is not needed, and case warnings/errors on gcc -SUBST_CLASSES+= pragma -SUBST_STAGE.pragma= pre-configure -SUBST_FILES.pragma= src/*.h src/*/*.h -SUBST_SED.pragma= -e "s|\#pragma once||g" - -.include "../../devel/zlib/buildlink3.mk" -.include "../../textproc/expat/buildlink3.mk" -.include "../../x11/libXext/buildlink3.mk" -.include "../../x11/xextproto/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/emulators/xmess/PLIST b/emulators/xmess/PLIST deleted file mode 100644 index d75c9d8f856..00000000000 --- a/emulators/xmess/PLIST +++ /dev/null @@ -1,5 +0,0 @@ -@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:51:10 joerg Exp $ -bin/imgtool -bin/xmess -man/man6/xmess.6 -share/xmess/xmessrc diff --git a/emulators/xmess/distinfo b/emulators/xmess/distinfo deleted file mode 100644 index aa12052da5f..00000000000 --- a/emulators/xmess/distinfo +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: distinfo,v 1.46 2006/06/15 11:40:00 dillo Exp $ - -SHA1 (xmame-0.106.tar.bz2) = 7ae50f869067e101e053ca18e6f788297fcad9e2 -RMD160 (xmame-0.106.tar.bz2) = eab4fa232d59fce5b2216f942f8bc58a992f8d26 -Size (xmame-0.106.tar.bz2) = 17117298 bytes -SHA1 (patch-aa) = b3bd9a8e3a55483fe074453b7ddfc5d111bd9d58 -SHA1 (patch-ab) = 04312e7fad1c39da40bdc9ec84074c676e8eb7e2 -SHA1 (patch-ac) = f4e0f614577924d19713e1862efa1e6d42e791c4 -SHA1 (patch-ad) = 087e162f8b05d894532e6d5091d8b0008c3f0e80 -SHA1 (patch-ae) = cf9b2684b4bdfdec7d2f09bcc424b7ee79d7f45a -SHA1 (patch-af) = 1498df9c05561ee0ace376203506aeb3ecbc9e72 -SHA1 (patch-ag) = c33b9f3f8c81756abcb1bb1d81820f522f3f7293 diff --git a/emulators/xmess/options.mk b/emulators/xmess/options.mk deleted file mode 100644 index e3d734e7378..00000000000 --- a/emulators/xmess/options.mk +++ /dev/null @@ -1,23 +0,0 @@ -# $NetBSD: options.mk,v 1.3 2005/09/03 18:16:07 xtraeme Exp $ -# - -PKG_OPTIONS_VAR= PKG_OPTIONS.xmess -PKG_OPTIONS_OPTIONAL_GROUPS= video -PKG_OPTIONS_GROUP.video= sdl opengl -PKG_SUPPORTED_OPTIONS= esound -.include "../../mk/bsd.options.mk" - -.if !empty(PKG_OPTIONS:Msdl) -MAME_DISP_METHOD?= SDL -.include "../../devel/SDL/buildlink3.mk" -.elif !empty(PKG_OPTIONS:Mopengl) -MAME_DISP_METHOD?= xgl -.include "../../graphics/Mesa/buildlink3.mk" -.else -MAME_DISP_METHOD?= x11 -.endif - -.if !empty(PKG_OPTIONS:Mesound) -MAKE_FLAGS+= SOUND_ESOUND=1 -.include "../../audio/esound/buildlink3.mk" -.endif diff --git a/emulators/xmess/patches/patch-aa b/emulators/xmess/patches/patch-aa deleted file mode 100644 index eda48783269..00000000000 --- a/emulators/xmess/patches/patch-aa +++ /dev/null @@ -1,166 +0,0 @@ -$NetBSD: patch-aa,v 1.25 2006/06/15 11:40:00 dillo Exp $ - ---- makefile.unix.orig 2006-05-15 18:53:34.000000000 +0200 -+++ makefile.unix -@@ -33,7 +33,7 @@ - ########################################################################### - - # Uncomment one of these. --TARGET = mame -+# TARGET = mame - # TARGET = mess - # TARGET = mage - # TARGET = mmsnd -@@ -97,7 +97,7 @@ - # just as well. However, stay away from the `cc' Ultrix compiler if - # possible. - --CC = @gcc -+# CC = @gcc - # CC = @cc - # CC = @icc - # CC = @c89 -@@ -118,7 +118,7 @@ - - # If you want to use whatever CFLAGS are currently set in your - # environment, then comment this out. --CFLAGS = -+# CFLAGS = - - - ########################################################################### -@@ -127,7 +127,7 @@ - ########################################################################### - - # GCC on x86 --CFLAGS = -O2 -+# CFLAGS = -O2 - - # GCC on x86 with some optimizations - # CFLAGS = -O2 -mtune=i686 -fomit-frame-pointer -fstrength-reduce -ffast-math -@@ -181,13 +181,13 @@ - ######################################################################### - - # Check for C89 + GNU extensions compliance. -- CFLAGS += -std=gnu89 -+ # CFLAGS += -std=gnu89 - - # Show all warnings. -- CFLAGS += -Wall -+ # CFLAGS += -Wall - - # Don't warn about unused variables. -- CFLAGS += -Wno-unused -+ # CFLAGS += -Wno-unused - - # Warn about declarations after statements. - # CFLAGS += -Wdeclaration-after-statement -@@ -328,16 +328,16 @@ - ifeq ($(CC),icc) - - # Optimizations for the Intel compiler. -- CFLAGS = -O3 -rcd -Xa -ipo -ipo_obj -+ # CFLAGS = -O3 -rcd -Xa -ipo -ipo_obj - - else - ifeq ($(CC),sun-forte) - # - # sun-forte given above is just an artifice to get us into this section -- CC = cc -+ # CC = cc - - # uncomment to set compiler defaults oriented for maximum performance -- XOPT += -fast -+ # XOPT += -fast - - # Choose one optimization level; - #XOPT += -xO0 -@@ -346,7 +346,7 @@ - #XOPT += -xO3 - # -xO4 and above automatically inline - #XOPT += -xO4 -- XOPT += -xO5 -+ # XOPT += -xO5 - - # uncomment for code generation targeted to the local machine; this - # supplies -xarch, -xcpu, -xtarget. It also seems to cause an annoying -@@ -354,11 +354,11 @@ - # older hardware, which apparently can't be disabled. As an alternative, - # the particular -xtarget for your system could be specified; - # -xtarget=ultra2/2300 -- XTARGET += -native -+ # XTARGET += -native - #XTARGET += -xtarget=ultra2/2300 - - # uncomment to inline library math functions -- EXTRA_OPTS += -xlibmil -+ # EXTRA_OPTS += -xlibmil - - ###################################################### - # Additional options for parallelization optimizations -@@ -374,7 +374,7 @@ - - # Sparc only, uncomment to do loop restructuring optimizations - # and speculative prefetch for v8plusa and above -- EXTRA_OPTS += -xdepend -xsafe=mem -+ # EXTRA_OPTS += -xdepend -xsafe=mem - - ################################################# - # Additional options for glx builds -@@ -384,14 +384,14 @@ - # (libGLU dlopen() complains of missing name mangled symbols) - # GLCFLAGS += -DSUN_FORTE_DLOPEN_LIBCRUN='\"libCrun.so.1\"' - -- CFLAGS= $(XOPT) $(XTARGET) $(XPARALLEL) $(EXTRA_OPTS) -- LDFLAGS=$(XOPT) $(XTARGET) $(XPARALLEL) $(EXTRA_OPTS) -+ # CFLAGS= $(XOPT) $(XTARGET) $(XPARALLEL) $(EXTRA_OPTS) -+ # LDFLAGS=$(XOPT) $(XTARGET) $(XPARALLEL) $(EXTRA_OPTS) - - # uncomment for silence... -- CFLAGS += -erroff -+ # CFLAGS += -erroff - # Tell xmame that we really are in fact elf. If not supplied, - # SHARED_PREFIX is set causing dlopen()'s to fail. -- CFLAGS += -D__ELF__ -+ # CFLAGS += -D__ELF__ - endif - endif - endif -@@ -614,7 +614,7 @@ - ########################################################################### - - # Linux --ARCH = linux -+# ARCH = linux - - # FreeBSD - # ARCH = freebsd -@@ -727,7 +727,7 @@ - # use SDL. - - # X11 (including Glide & OpenGL if enabled below) --DISPLAY_METHOD = x11 -+# DISPLAY_METHOD = x11 - - # SDL library - # DISPLAY_METHOD = SDL -@@ -758,7 +758,7 @@ - X11_MITSHM = 1 - - # Use Xv extension for hardware scaling. --X11_XV = 1 -+# X11_XV = 1 - - # Enable XFree86 DGA. This also causes "make install" to set the suid bit - # on the executable. -@@ -782,8 +782,8 @@ - # X11LIB = -L/usr/lib/X11 - - # Standard location for XFree86 --X11INC = -I/usr/X11R6/include --X11LIB = -L/usr/X11R6/lib -+# X11INC = -I/usr/X11R6/include -+# X11LIB = -L/usr/X11R6/lib - - # Standard location for Sun systems - # X11INC = -I/usr/openwin/include diff --git a/emulators/xmess/patches/patch-ab b/emulators/xmess/patches/patch-ab deleted file mode 100644 index a274905acf4..00000000000 --- a/emulators/xmess/patches/patch-ab +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-ab,v 1.21 2006/06/15 11:40:00 dillo Exp $ - ---- src/unix/unix.mak.orig 2006-05-26 06:52:07.000000000 +0200 -+++ src/unix/unix.mak -@@ -242,7 +242,7 @@ CFLAGS += $(IL) $(CFLAGS.$(MY_CPU)) \ - $(COREDEFS) $(SOUNDDEFS) $(CPUDEFS) $(ASMDEFS) \ - $(INCLUDES) $(INCLUDE_PATH) - --LIBS += $(LIBS.$(ARCH)) $(LIBS.$(DISPLAY_METHOD)) -+LIBS += $(LIBS.$(ARCH)) $(LIBS.$(DISPLAY_METHOD)) -lexpat - - ifdef DEBUG - CFLAGS += -DMAME_DEBUG -@@ -559,15 +559,15 @@ xlistdev: src/unix/contrib/tools/xlistde - - romcmp: $(OBJ)/romcmp.o $(OBJ)/unzip.o $(ZLIB) - @echo 'Linking $@...' -- $(LD) $(LDFLAGS) $^ $(LIBS) -o $@ -+ $(LD) $(LDFLAGS) $^ -lz -o $@ - - chdman: $(OBJ)/chdman.o $(OBJ)/chd.o $(OBJ)/chdcd.o $(OBJ)/cdrom.o $(OBJ)/md5.o $(OBJ)/sha1.o $(OBJ)/version.o $(ZLIB) $(OSTOOLOBJS) - @echo 'Linking $@...' -- $(LD) $(LDFLAGS) $^ $(LIBS) -o $@ -+ $(LD) $(LDFLAGS) $^ -lz -o $@ - - xml2info: $(OBJ)/xml2info.o $(EXPAT) - @echo 'Linking $@...' -- $(LD) $(LDFLAGS) $^ $(LIBS) -o $@ -+ $(LD) $(LDFLAGS) $^ -lexpat -lz -o $@ - - jedutil: $(OBJ)/jedutil.o $(OBJ)/jedparse.o $(OSDBGOBJS) - @echo 'Linking $@...' diff --git a/emulators/xmess/patches/patch-ac b/emulators/xmess/patches/patch-ac deleted file mode 100644 index 7d4e7cc1af5..00000000000 --- a/emulators/xmess/patches/patch-ac +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ac,v 1.7 2005/11/17 19:54:09 joerg Exp $ - ---- src/unix/video-drivers/xf86_dga1.c.orig 2005-11-17 15:56:02.000000000 +0000 -+++ src/unix/video-drivers/xf86_dga1.c -@@ -6,6 +6,7 @@ - #include <stdlib.h> - #include <string.h> - #include <sys/types.h> -+#include <sys/time.h> - #include <sys/wait.h> - #include <sys/resource.h> - #include <X11/Xlib.h> diff --git a/emulators/xmess/patches/patch-ad b/emulators/xmess/patches/patch-ad deleted file mode 100644 index bb8844ceba5..00000000000 --- a/emulators/xmess/patches/patch-ad +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ad,v 1.5 2005/11/17 19:54:09 joerg Exp $ - ---- src/unix/video-drivers/xf86_dga2.c.orig 2005-11-17 16:14:12.000000000 +0000 -+++ src/unix/video-drivers/xf86_dga2.c -@@ -9,6 +9,7 @@ - #include <stdlib.h> - #include <string.h> - #include <sys/types.h> -+#include <sys/time.h> - #include <sys/wait.h> - #include <sys/resource.h> - #include <X11/Xlib.h> diff --git a/emulators/xmess/patches/patch-ae b/emulators/xmess/patches/patch-ae deleted file mode 100644 index c43f464a1f2..00000000000 --- a/emulators/xmess/patches/patch-ae +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-ae,v 1.10 2004/11/07 16:11:48 kristerw Exp $ - ---- doc/xmessrc.dist.orig Sun Nov 7 13:51:40 2004 -+++ doc/xmessrc.dist Sun Nov 7 13:53:30 2004 -@@ -66,11 +66,11 @@ - analogstick 0 - - ### Fileio Related ### --biospath /usr/local/share/xmess/bios --softwarepath /usr/local/share/xmess/software --hash_directory /usr/local/share/xmess/hash -+biospath @ROMPATH@/bios -+softwarepath @ROMPATH@/software -+hash_directory @ROMPATH@/hash - snapshot_directory . --hiscore_file /usr/local/share/xmess/hiscore.dat -+hiscore_file @SPOOLDIR@/hiscore.dat - - ### Mess Related ### - language english diff --git a/emulators/xmess/patches/patch-af b/emulators/xmess/patches/patch-af deleted file mode 100644 index 4421fa9076d..00000000000 --- a/emulators/xmess/patches/patch-af +++ /dev/null @@ -1,40 +0,0 @@ -$NetBSD: patch-af,v 1.4 2005/11/17 19:54:09 joerg Exp $ - ---- src/unix/joystick-drivers/joy_standard.c.orig 2005-11-17 16:17:48.000000000 +0000 -+++ src/unix/joystick-drivers/joy_standard.c -@@ -6,7 +6,7 @@ static int use_old_driver = 0; - - struct rc_option joy_standard_opts[] = { - /* name, shortname, type, dest, deflt, min, max, func, help */ --#if defined(__ARCH_netbsd) || defined(__ARCH_freebsd) || defined(__ARCH_openbsd) -+#if defined(__ARCH_netbsd) || defined(__ARCH_freebsd) || defined(__ARCH_openbsd) || defined(__ARCH_dragonfly) - { "joydevname", "jdev", rc_string, &joy_dev, - "/dev/joy", 0, 0, NULL, - "Joystick device prefix (defaults to /dev/joy)" }, -@@ -29,7 +29,7 @@ struct rc_option joy_standard_opts[] = { - #include <sys/ioctl.h> - - /* specific joystick for PC clones */ --#if defined(__ARCH_netbsd) || defined(__ARCH_freebsd) || defined(__ARCH_openbsd) -+#if defined(__ARCH_netbsd) || defined(__ARCH_freebsd) || defined(__ARCH_openbsd) || defined(__ARCH_dragonfly) - - #include <machine/joystick.h> - typedef struct joystick joy_struct; -@@ -142,7 +142,7 @@ void joy_standard_init(void) - /* fall through to the next case */ - case 1: - joy_data[i].num_axes = 2; --#if defined(__ARCH_netbsd) || defined(__ARCH_freebsd) || defined(__ARCH_openbsd) -+#if defined(__ARCH_netbsd) || defined(__ARCH_freebsd) || defined(__ARCH_openbsd) || defined(__ARCH_dragonfly) - joy_data[i].num_buttons = 2; - #else - joy_data[i].num_buttons = JOY_BUTTONS; -@@ -217,7 +217,7 @@ void joy_standard_poll(void) - continue; - - /* get value of buttons */ --#if defined(__ARCH_netbsd) || defined(__ARCH_freebsd) || defined(__ARCH_openbsd) -+#if defined(__ARCH_netbsd) || defined(__ARCH_freebsd) || defined(__ARCH_openbsd) || defined(__ARCH_dragonfly) - joy_data[i].buttons[0] = my_joy_data.b1; - joy_data[i].buttons[1] = my_joy_data.b2; - #else diff --git a/emulators/xmess/patches/patch-ag b/emulators/xmess/patches/patch-ag deleted file mode 100644 index 764093c4683..00000000000 --- a/emulators/xmess/patches/patch-ag +++ /dev/null @@ -1,36 +0,0 @@ -$NetBSD: patch-ag,v 1.4 2005/11/17 19:54:09 joerg Exp $ - ---- src/unix/joystick-drivers/joy_usb.c.orig 2005-11-17 16:19:51.000000000 +0000 -+++ src/unix/joystick-drivers/joy_usb.c -@@ -22,7 +22,7 @@ struct rc_option joy_usb_opts[] = { - #ifdef USB_JOYSTICK - - --#if !defined(__ARCH_openbsd) && !defined(__ARCH_netbsd) && !defined(__ARCH_freebsd) -+#if !defined(__ARCH_openbsd) && !defined(__ARCH_netbsd) && !defined(__ARCH_freebsd) && !defined(__ARCH_dragonfly) - #error "USB joysticks are only supported under OpenBSD, NetBSD and FreeBSD. Patches to support other archs are welcome ;)" - #endif - -@@ -47,8 +47,13 @@ struct rc_option joy_usb_opts[] = { - #include <sys/ioctl.h> - #endif - -+#ifdef __ARCH_dragonfly -+#include <bus/usb/usb.h> -+#include <bus/usb/usbhid.h> -+#else - #include <dev/usb/usb.h> - #include <dev/usb/usbhid.h> -+#endif - - int axis_usage[] = { - HUG_X, HUG_Y, HUG_Z, -@@ -118,7 +123,7 @@ static int joy_initialize_hid(int i) - } - - #if defined(HAVE_USBHID_H) || defined(HAVE_LIBUSBHID_H) --#if defined(__ARCH_openbsd) || defined(__ARCH_netbsd) || (defined(__ARCH_freebsd) && __FreeBSD_version > 500000) -+#if defined(__ARCH_openbsd) || defined(__ARCH_netbsd) || (defined(__ARCH_freebsd) && __FreeBSD_version > 500000) || defined(__ARCH_dragonfly) - if (ioctl(joy_data[i].fd, USB_GET_REPORT_ID, &report_id) < 0) - { - fprintf(stderr_file, "error: /dev/uhid%d: %s", i, strerror(errno)); |