From owner-freebsd-ports Tue Sep 24 6:10: 8 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AA16137B404 for ; Tue, 24 Sep 2002 06:10:03 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 14C7743E81 for ; Tue, 24 Sep 2002 06:10:02 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8ODA1Co061497 for ; Tue, 24 Sep 2002 06:10:01 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8ODA1FP061496; Tue, 24 Sep 2002 06:10:01 -0700 (PDT) Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EF75B37B401 for ; Tue, 24 Sep 2002 06:07:15 -0700 (PDT) Received: from pcwin002.win.tue.nl (pcwin002.win.tue.nl [131.155.71.72]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4A03F43E7B for ; Tue, 24 Sep 2002 06:07:15 -0700 (PDT) (envelope-from stijn@pcwin002.win.tue.nl) Received: from pcwin002.win.tue.nl (orb_rules@localhost [127.0.0.1]) by pcwin002.win.tue.nl (8.12.5/8.12.3) with ESMTP id g8OD7EPt082239 for ; Tue, 24 Sep 2002 15:07:14 +0200 (CEST) (envelope-from stijn@pcwin002.win.tue.nl) Received: (from stijn@localhost) by pcwin002.win.tue.nl (8.12.5/8.12.4/Submit) id g8OD7Ej5082234; Tue, 24 Sep 2002 15:07:14 +0200 (CEST) Message-Id: <200209241307.g8OD7Ej5082234@pcwin002.win.tue.nl> Date: Tue, 24 Sep 2002 15:07:14 +0200 (CEST) From: Stijn Hoop Reply-To: Stijn Hoop To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/43328: [FIX BENTO]: emulators/xmame Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 43328 >Category: ports >Synopsis: [FIX BENTO]: emulators/xmame >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: Tue Sep 24 06:10:01 PDT 2002 >Closed-Date: >Last-Modified: >Originator: Stijn Hoop >Release: FreeBSD 4.6-STABLE i386 >Organization: N/A >Environment: System: FreeBSD pcwin002.win.tue.nl 4.6-STABLE FreeBSD 4.6-STABLE #0: Wed Aug 21 04:35:22 CEST 2002 src@pcwin002.win.tue.nl:/usr/obj/usr/src/sys/PCWIN002 i386 >Description: - Fix bento errors for emulators/xmame: - Build on -STABLE fails due to the libusb.h/libusbhid.h API change. Disable USB joysticks for now to get xmame to build. - This PR also includes fixes for xmess/xpinmame, both slave ports. Please commit the PRs that I'm about to send for those at the same time so as to avoid master/slave breakage. >How-To-Repeat: N/A >Fix: - Added files/patch-ag, to partially fix USB problems. diff -urN --exclude=CVS /usr/ports/emulators/xmame/Makefile xmame/Makefile --- /usr/ports/emulators/xmame/Makefile Sat Aug 31 05:34:12 2002 +++ xmame/Makefile Tue Sep 24 14:53:41 2002 @@ -57,7 +57,6 @@ 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 @@ 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 \ @@ -229,12 +233,14 @@ # USB joysticks are only enabled on -STABLE because of conflicting USB # prototypes in -STABLE & -CURRENT. +# Disabled again 24/9/2002 because -STABLE has changed it's API and I +# can't figure out how to make it work before 4.7-RELEASE. .include .if ${OSVERSION} >= 500000 JOYUSBCOMMENT=\#\ .else -JOYUSBCOMMENT= +JOYUSBCOMMENT=\#\ .endif # diff -urN --exclude=CVS /usr/ports/emulators/xmame/files/patch-ac xmame/files/patch-ac --- /usr/ports/emulators/xmame/files/patch-ac Wed May 15 05:33:41 2002 +++ xmame/files/patch-ac Tue Aug 27 16:33:22 2002 @@ -31,7 +31,7 @@ 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 diff -urN --exclude=CVS /usr/ports/emulators/xmame/files/patch-ag xmame/files/patch-ag --- /usr/ports/emulators/xmame/files/patch-ag Thu Jan 1 01:00:00 1970 +++ xmame/files/patch-ag Tue Sep 24 15:03:30 2002 @@ -0,0 +1,11 @@ +--- src/unix/joystick-drivers/joy_usb.c.orig Fri May 3 04:53:54 2002 ++++ src/unix/joystick-drivers/joy_usb.c Tue Aug 27 16:27:46 2002 +@@ -27,7 +27,7 @@ + #include + #endif + #elif defined(__ARCH_freebsd) +-#include ++#include + #endif + #include + #include diff -urN --exclude=CVS /usr/ports/emulators/xmame/pkg-plist xmame/pkg-plist --- /usr/ports/emulators/xmame/pkg-plist Wed May 15 05:33:46 2002 +++ xmame/pkg-plist Tue Sep 24 14:54:01 2002 @@ -11,7 +11,6 @@ %%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 @@ %%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 >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message