Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 24 Sep 2002 15:08:51 +0200 (CEST)
From:      Stijn Hoop <stijn@win.tue.nl>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/43329: [FIX BENTO]: emulators/xmess
Message-ID:  <200209241308.g8OD8piF082582@pcwin002.win.tue.nl>

next in thread | raw e-mail | index | archive | help

>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 <usb.h>
+ #endif
+ #elif defined(__ARCH_freebsd)
+-#include <libusb.h>
++#include <libusbhid.h>
+ #endif
+ #include <dev/usb/usb.h>
+ #include <dev/usb/usbhid.h>
>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?200209241308.g8OD8piF082582>