Skip site navigation (1)Skip section navigation (2)
Date:      Tue,  4 Mar 2003 21:43:31 -0600 (CST)
From:      "Matthew D.Fuller" <fullermd@over-yonder.net>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/48941: [PATCH] XFree86 3.x compile error
Message-ID:  <20030305034331.C565A20F33@mortis.over-yonder.net>

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

>Number:         48941
>Category:       ports
>Synopsis:       [PATCH] XFree86 3.x compile error
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Mar 04 19:50:07 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Matthew D. Fuller
>Release:        FreeBSD 5.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD mortis.sighup.org 5.0-CURRENT FreeBSD 5.0-CURRENT #0: Wed Jan 8 18:46:11 CST 2003 fullermd@mortis.sighup.org:/usr/obj/usr/src/sys/MORTIS i386


	
>Description:
	XFree86 3.3.6 fails to compile in several ways.  The first occurs
	when you try to link in pam support, in that it tries to stick a
	pointer to the misc_conv() function into a structure.  I don't know
	enough about PAM to track this one down.

	The other is in the joystick header files, which I can patch.  With
	this patch, and PAM disabled, the compile works fine.
>How-To-Repeat:
	cd /usr/ports/x11/XFree86 && make
>Fix:

--- programs/Xserver/hw/xfree86/os-support/bsd/bsd_jstk.c.orig	Tue Mar  4 16:29:48 2003
+++ programs/Xserver/hw/xfree86/os-support/bsd/bsd_jstk.c	Tue Mar  4 16:29:55 2003
@@ -28,7 +28,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 #include <string.h>
-#include <machine/joystick.h>
+#include <sys/joystick.h>
 #include <fcntl.h>
 
 #define JS_RETURN sizeof(struct joystick)
--- programs/Xserver/hw/xfree86/etc/joycal.c.orig	Tue Mar  4 18:30:16 2003
+++ programs/Xserver/hw/xfree86/etc/joycal.c	Tue Mar  4 18:30:25 2003
@@ -6,7 +6,7 @@
 #include <unistd.h>
 #include <string.h>
 #if defined (__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-#include <machine/joystick.h>
+#include <sys/joystick.h>
 #define JS_RETURN sizeof(struct joystick)
 #define JS_DATA_TYPE joystick
 #define button_down(j) (j.b1 | j.b2)
>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports-bugs" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030305034331.C565A20F33>