Fix building errors for emulators/xmame, while keeping joystick

support.

Rename of the files/ section on maintainers request.

PR:		ports/43328, ports/44042
Submitted by:	Stijn Hoop <stijn@win.tue.nl>,Kyle Martin <mkm@ieee.org>
Approved by:	Stijn Hoop <stijn@win.tue.nl>

9 files changed, 99 insertions, 55 deletions

diff --git a/emulators/xmame/Makefile b/emulators/xmame/Makefile
index 386034e8fc0c..24b18300e24d 100644
--- a/emulators/xmame/Makefile
+++ b/emulators/xmame/Makefile
@@ -57,7 +57,6 @@ GENERALDOCS=	changes.unix \
 		xmame-doc-5.html \
 		xmame-doc-6.html \
 		xmame-doc-7.html \
-		xmame-doc-8.html \
 		xmame-doc.html \
 		xmame-gdoc-1.html \
 		xmame-gdoc-2.html \
@@ -66,23 +65,28 @@ GENERALDOCS=	changes.unix \
 		xmame-gdoc-5.html \
 		xmame-gdoc-6.html \
 		xmame-gdoc-7.html \
-		xmame-gdoc-8.html \
 		xmame-gdoc.html \
-		xmame.css \
 		xmame-doc.lyx \
-		xmame-doc.txt \
-		ctrlr.txt \
-		dga2.txt
+		xmame-doc.txt
 XMAMEDOCS=	changes.mame \
+		ctrlr.txt \
 		gamelist.mame \
-		readme.mame
+		readme.mame \
+		xmame-doc-8.html \
+		xmame-gdoc-8.html \
+		xmame.css \
+		dga2.txt
 XMESSDOCS=	changes.mess \
 		credits.mess \
 		gamelist.mess \
 		readme.mess \
 		messroms.txt \
 		imgtool.txt \
-		messroms.txt
+		messroms.txt \
+		xmame-doc-8.html \
+		xmame-gdoc-8.html \
+		xmame.css \
+		dga2.txt
 PINMAMEDOCS=	pinmame/simulation.txt \
 		pinmame/whatsnew.txt \
 		pinmame/pinmame.txt \
@@ -189,7 +193,6 @@ pre-everything::
 .endif
 LIB_DEPENDS=    SDL-1.1.4:${PORTSDIR}/devel/sdl12
 SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
-MAKE_ENV+=	SDL_CONFIG=${SDL_CONFIG}
 DISPLAY_METHOD=	SDL
 .endif
 .endif
@@ -227,16 +230,6 @@ NETWORK=\#\
 .endif
 .endif
 
-# USB joysticks are only enabled on -STABLE because of conflicting USB
-# prototypes in -STABLE & -CURRENT.
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500000
-JOYUSBCOMMENT=\#\ 
-.else
-JOYUSBCOMMENT=
-.endif
-
 #
 # Regular targets
 #
@@ -275,12 +268,14 @@ do-configure:
 		-e "s@-g bin@-g wheel@g" \
 		-e "s@^ARCH  = linux@ARCH  = freebsd@g" \
 		-e "s@# X11_DGA@X11_DGA@g" \
-		-e "s@# JOY_USB@${JOYUSBCOMMENT}JOY_USB@g" \
 		-e "s@= x11@= ${DISPLAY_METHOD}@g" \
 		-e "s@= mame@= ${MAMEMESS}@g" \
 		-e "s@# X86_ASM@${ASM_COMMENT}X86_ASM@g" \
 		-e "s@# SOUND_ESOUND@${ESOUNDCOMMENT}SOUND_ESOUND@g" \
 		-e "s@# MAME_NET@${NETWORK}MAME_NET@g" \
+		-e "s@# LIBS.*@LIBS = -L${LOCALBASE}/lib@g" \
+		-e "s@sdl-config@${SDL_CONFIG}@g" \
+		-e "s@# JOY_USB@JOY_USB@g" \
 		-e "s@GLLIBS=.-ldl@GLLIBS= ${PTHREAD_LIBS}@g" \
 			${WRKSRC}/makefile.unix > ${WRKSRC}/Makefile
 
@@ -324,4 +319,4 @@ post-install:
 	${INSTALL_DATA} ${WRKDIR}/cheat.dat ${PREFIX}/share/xmame
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/emulators/xmame/distinfo b/emulators/xmame/distinfo
index 977c6eee6c02..99364fb09ce7 100644
--- a/emulators/xmame/distinfo
+++ b/emulators/xmame/distinfo
@@ -1,7 +1,7 @@
 MD5 (xmame/xmame-0.60.1.tar.bz2) = 887e3956e410b06b92165637ba219070
+MD5 (xmame/xmame-0.59.2.tar.bz2) = f35a5f9a79da963c157867015c284562
 MD5 (xmame/xmame-0.56.2.tar.bz2) = e43dd5e087f954351948fb9848485924
-MD5 (xmame/xmame-0.37b14.2.tar.bz2) = 34bfba3d1412a8f8e1abd4d738de3f27
 MD5 (xmame/cheat.zip) = b745ea4df1a3a517c00fedae1ee49a14
 MD5 (xmame/history.zip) = 69da5c33e6a78092c6cd75cbeb737c6a
 MD5 (xmame/hsdat7.zip) = 9e4a7e36448895f13128a675327e34e4
-MD5 (xmame/xmame-0.37b14.2-pinmame-0.99b3.patch.gz) = aeefd4f6593d389cddbb7081cfc4eb42
+MD5 (xmame/xmame-0.59.2-pinmame-1.20.b.patch.gz) = aeefd4f6593d389cddbb7081cfc4eb42
diff --git a/emulators/xmame/files/patch-makefile.unix b/emulators/xmame/files/patch-makefile.unix
new file mode 100644
index 000000000000..9e5497739efb
--- /dev/null
+++ b/emulators/xmame/files/patch-makefile.unix
@@ -0,0 +1,15 @@
+--- 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 --git a/emulators/xmame/files/patch-ae b/emulators/xmame/files/patch-src::unix::dsp-drivers::oss.c
index 6ef50783d527..67a8e0fccb8c 100644
--- a/emulators/xmame/files/patch-ae
+++ b/emulators/xmame/files/patch-src::unix::dsp-drivers::oss.c
@@ -1,5 +1,5 @@
---- src/unix/sysdep/dsp-drivers/oss.c.orig	Sun Sep  8 01:57:34 2002
-+++ src/unix/sysdep/dsp-drivers/oss.c	Sun Sep  8 01:57:47 2002
+--- 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>
diff --git a/emulators/xmame/files/patch-src::unix::joystick-drivers::joy_usb.c b/emulators/xmame/files/patch-src::unix::joystick-drivers::joy_usb.c
new file mode 100644
index 000000000000..3a2f4505781e
--- /dev/null
+++ b/emulators/xmame/files/patch-src::unix::joystick-drivers::joy_usb.c
@@ -0,0 +1,38 @@
+--- 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 --git a/emulators/xmame/files/patch-af b/emulators/xmame/files/patch-src::unix::sysdep::mixer-drivers::oss.c
index cb1e38e0bf9d..0b85c3d945ba 100644
--- a/emulators/xmame/files/patch-af
+++ b/emulators/xmame/files/patch-src::unix::sysdep::mixer-drivers::oss.c
@@ -1,5 +1,5 @@
---- src/unix/sysdep/mixer-drivers/oss.c.orig	Thu May  2 19:53:54 2002
-+++ src/unix/sysdep/mixer-drivers/oss.c	Sun Sep  8 02:05:16 2002
+--- 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>
diff --git a/emulators/xmame/files/patch-ac b/emulators/xmame/files/patch-src::unix::unix.mak
index cc654ce32acb..6dbc33860acc 100644
--- a/emulators/xmame/files/patch-ac
+++ b/emulators/xmame/files/patch-src::unix::unix.mak
@@ -1,50 +1,40 @@
---- src/unix/unix.mak.orig	Fri May  3 04:53:53 2002
-+++ src/unix/unix.mak	Mon May  6 14:04:08 2002
-@@ -50,20 +50,20 @@
- 
- # svga and ggi also use $(X11LIB) since that's where zlib often is
- LIBS.x11        = $(X11LIB) $(JOY_X11_LIBS) $(XINPUT_DEVICES_LIBS) -lX11 -lXext
--LIBS.svgalib    = $(X11LIB) -lvga -lvgagl
-+LIBS.svgalib    = -L$(LOCALBASE)/lib -lvga -lvgagl
- LIBS.ggi        = $(X11LIB) -lggi
--LIBS.xgl        = $(X11LIB) $(JOY_X11_LIBS) -lX11 -lXext $(GLLIBS) -ljpeg
-+LIBS.xgl        = $(X11LIB) $(JOY_X11_LIBS) -lX11 -lXext $(GLLIBS) -L$(LOCALBASE)/lib -ljpeg
+--- 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	= `$(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.xgl      = -DGLU_VERSION_1_2 $(X11INC) $(JOY_X11_CFLAGS) $(GLCFLAGS) -I$(LOCALBASE)/include $(PTHREAD_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`
++CFLAGS.SDL      = $(X11INC) `$(SDL_CONFIG) --cflags` -D_REENTRANT
  CFLAGS.photon2	=
  
  INST.x11        = doinstall
-@@ -235,9 +235,18 @@
+@@ -235,8 +235,17 @@
  MY_LIBS += -lusb
  endif
  else
 +ifeq ($(ARCH), freebsd)
-+ifeq ($(shell test -f /usr/include/usbhid.h && echo have_usbhid), have_usbhid)
++ifeq ($(shell test -f /usr/include/libusbhid.h && echo have_usbhid), have_usbhid)
 +CONFIG += -DHAVE_USBHID_H
 +MY_LIBS += -lusbhid
 +else
-+MY_LIBS += /usr/lib/libusb.a
-+endif
-+else
  MY_LIBS += -lusb
  endif
- endif
++else
++MY_LIBS += -lusb
++endif
 +endif
+ endif
  
  ifdef EFENCE
- MY_LIBS += -lefence
 @@ -366,7 +375,7 @@
  	
  doc/x$(TARGET)rc.dist: all src/unix/xmamerc-keybinding-notes.txt
diff --git a/emulators/xmame/files/patch-ad b/emulators/xmame/files/patch-src::unix::video-drivers::svgainput.c
index b0462f7c8942..0095664f3723 100644
--- a/emulators/xmame/files/patch-ad
+++ b/emulators/xmame/files/patch-src::unix::video-drivers::svgainput.c
@@ -1,10 +1,10 @@
---- src/unix/video-drivers/svgainput.c.orig	Tue Oct 16 11:06:30 2001
-+++ src/unix/video-drivers/svgainput.c	Tue Oct 16 11:05:37 2001
+--- 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"
  
-+#ifdef __FreeBSD__
++#if defined(__ARCH_freebsd)
 +#define	SIGUNUSED	SIGUSR2
 +#endif
 +
diff --git a/emulators/xmame/pkg-plist b/emulators/xmame/pkg-plist
index 06e7500dcd52..a870472cdbca 100644
--- a/emulators/xmame/pkg-plist
+++ b/emulators/xmame/pkg-plist
@@ -11,7 +11,6 @@ share/%%MAMEMESS%%/%%MAMEMESS%%rc
 %%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-gdoc-1.html
 %%PORTDOCS%%share/doc/%%MAMEMESS%%/xmame-gdoc-2.html
@@ -22,23 +21,30 @@ share/%%MAMEMESS%%/%%MAMEMESS%%rc
 %%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.css
 %%PORTDOCS%%share/doc/%%MAMEMESS%%/xmame-doc.lyx
 %%PORTDOCS%%share/doc/%%MAMEMESS%%/xmame-doc.txt
-%%PORTDOCS%%share/doc/%%MAMEMESS%%/ctrlr.txt
 %%PORTDOCS%%share/doc/%%MAMEMESS%%/dga2.txt
 %%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%%share/xmess/history.dat
 %%PINMAMEONLY%%%%PORTDOCS%%share/doc/xpinmame/simulation.txt
 %%PINMAMEONLY%%%%PORTDOCS%%share/doc/xpinmame/whatsnew.txt