Date: Sat, 19 Oct 2002 17:04:19 -0700 (PDT) From: "Steven G. Kargl" <kargl@troutmask.apl.washington.edu> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/44291: Fix build of x11-toolkits/plib on -current Message-ID: <200210200004.g9K04J8j078304@troutmask.apl.washington.edu>
next in thread | raw e-mail | index | archive | help
>Number: 44291 >Category: ports >Synopsis: Fix build of x11-toolkits/plib on -current >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Sat Oct 19 17:10:01 PDT 2002 >Closed-Date: >Last-Modified: >Originator: Steven G. Kargl >Release: FreeBSD 5.0-CURRENT i386 >Organization: apl/uw >Environment: System: FreeBSD troutmask.apl.washington.edu 5.0-CURRENT FreeBSD 5.0-CURRENT #0: Wed Sep 4 12:10:46 PDT 2002 kargl@troutmask.apl.washington.edu:/usr/obj/usr/src/sys/TROUTMASK i386 >Description: x11-toolkits/plib does not build because machine/joystick.h is actually located in sys. >How-To-Repeat: cd x11-toolkits/plib ; make >Fix: Replace files/patch-src::js::js.h with the following patch. --- src/js/js.h.orig Sat Oct 19 16:41:00 2002 +++ src/js/js.h Sat Oct 19 16:49:23 2002 @@ -63,7 +63,11 @@ # include <fcntl.h> # if defined(__FreeBSD__) || defined(__NetBSD__) -# include <machine/joystick.h> +# if __FreeBSD_version >= 500000 +# include <sys/joystick.h> +# elif +# include <machine/joystick.h> +# endif # define JS_DATA_TYPE joystick # define JS_RETURN (sizeof(struct JS_DATA_TYPE)) # elif defined(__linux__) @@ -132,9 +136,9 @@ -/*#if defined(__FreeBSD__) || defined(__NetBSD__) +#if defined(__FreeBSD__) || defined(__NetBSD__) int id ; -#endif*/ +#endif #ifdef WIN32 JOYINFOEX js ; UINT js_id ; >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?200210200004.g9K04J8j078304>