From owner-freebsd-ports Tue Sep 24 6:10:11 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 A594337B401 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 78EB643E88 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 g8ODA2Co061510 for ; Tue, 24 Sep 2002 06:10:02 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8ODA2MF061509; Tue, 24 Sep 2002 06:10:02 -0700 (PDT) Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1EC4637B401 for ; Tue, 24 Sep 2002 06:08:53 -0700 (PDT) Received: from pcwin002.win.tue.nl (pcwin002.win.tue.nl [131.155.71.72]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4F5C243E42 for ; Tue, 24 Sep 2002 06:08:52 -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 g8OD8pPt082583 for ; Tue, 24 Sep 2002 15:08:51 +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 g8OD8piF082582; Tue, 24 Sep 2002 15:08:51 +0200 (CEST) Message-Id: <200209241308.g8OD8piF082582@pcwin002.win.tue.nl> Date: Tue, 24 Sep 2002 15:08:51 +0200 (CEST) From: Stijn Hoop Reply-To: Stijn Hoop To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/43329: [FIX BENTO]: emulators/xmess 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: 43329 >Category: ports >Synopsis: [FIX BENTO]: 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: Tue Sep 24 06:10:02 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/xmess: - Disable USB joystick code to avoid breakage on -STABLE wrt to the libusb.h / libusbhid.h conflicts. - Please commit this at the same time as the FIX BENTO PR for emulators/xmame, this is a slave port of that port. >How-To-Repeat: N/A >Fix: diff -urN --exclude=CVS /usr/ports/emulators/xmess/Makefile xmess/Makefile --- /usr/ports/emulators/xmess/Makefile Sun Jan 6 05:33:45 2002 +++ xmess/Makefile Tue Sep 24 14:40:41 2002 @@ -11,7 +11,7 @@ MAINTAINER= stijn@win.tue.nl MASTERDIR= ${.CURDIR}/../xmame -PATCHDIR= $(.CURDIR)/files +PATCHDIR= ${.CURDIR}/files COMMENT= ${.CURDIR}/pkg-comment DESCR= ${.CURDIR}/pkg-descr 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 Jan 1 01:00:00 1970 +++ xmess/files/patch-src-unix::joystick-drivers::joy_usb.c Tue Sep 24 14:26:48 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 >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message