From owner-freebsd-ports Fri Apr 5 13:38:23 2002 Delivered-To: freebsd-ports@freebsd.org Received: from Awfulhak.org (gw.Awfulhak.org [217.204.245.18]) by hub.freebsd.org (Postfix) with ESMTP id 11ECF37B419 for ; Fri, 5 Apr 2002 13:37:57 -0800 (PST) Received: from hak.lan.Awfulhak.org (root@hak.lan.Awfulhak.org [IPv6:fec0::1:12]) by Awfulhak.org (8.12.2/8.11.6) with ESMTP id g35LbfCu005677; Fri, 5 Apr 2002 22:37:41 +0100 (BST) (envelope-from brian@freebsd-services.com) Received: from hak.lan.Awfulhak.org (brian@localhost [127.0.0.1]) by hak.lan.Awfulhak.org (8.12.2/8.12.2) with ESMTP id g35Lbeq7055237; Fri, 5 Apr 2002 22:37:40 +0100 (BST) (envelope-from brian@freebsd-services.com) Message-Id: <200204052137.g35Lbeq7055237@hak.lan.Awfulhak.org> X-Mailer: exmh version 2.5 07/13/2001 with nmh-1.0.4 To: Will Andrews Cc: Eric Liedtke , freebsd-ports@FreeBSD.ORG Subject: Re: XFree86-4.2.0 ioctl question [-current ioccom.h __P related] In-Reply-To: Message from Will Andrews of "Fri, 22 Mar 2002 09:34:46 EST." <20020322143446.GL22998@squall.waterspout.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Fri, 05 Apr 2002 22:37:40 +0100 From: Brian Somers 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 > On Fri, Mar 22, 2002 at 01:01:57AM -0600, Eric Liedtke wrote: > > While trying to build the XFree86-4-Server port this evening(cvsuped > > today around 1PM CST) > > the build died due to a redefinition of xf86ioctl. The file > > /usr/ports/x11-servers/XFree86-4-Server/work/xc/programs/Xserver/include/xf86_ansic.h > > Yes, this is a problem recently identified on the -current > mailing list that someone else is looking into. When they have a > patch, I will integrate it ASAP. > > Regards, > -- > wca There's another problem too. machine/joystick.h has disappeared in -current. It used to be a symlink to sys/joystick.h, but now there's just sys/joystick.h. I sent the attached patch to taguchi@tohoku.iij.ad.jp on March 29, but haven't had a reply yet (use patch -p0). -- Brian http://www.freebsd-services.com/ Don't _EVER_ lose your sense of humour ! Index: Makefile =================================================================== RCS file: /home/ncvs/ports/x11-servers/XFree86-4-Server/Makefile,v retrieving revision 1.111 diff -u -r1.111 Makefile --- Makefile 2 Apr 2002 02:03:30 -0000 1.111 +++ Makefile 3 Apr 2002 03:39:27 -0000 @@ -26,6 +26,8 @@ DIST_SUBDIR= xc WRKSRC= ${WRKDIR}/xc PATCHDIR= ${.CURDIR}/../../x11/XFree86-4-libraries/files +EXTRA_PATCHES= ${MASTERDIR}/files/patch-joycal.c \ + ${MASTERDIR}/files/patch-bsd_jstk.c SCRIPTS_ENV= OSVERSION=${OSVERSION} \ HasXdmAuth=${HasXdmAuth} \ HasSecureRPC=${HasSecureRPC} \ --- /dev/null Fri Apr 5 22:33:00 2002 +++ files/patch-bsd_jstk.c Fri Mar 29 10:32:13 2002 @@ -0,0 +1,14 @@ +--- ./programs/Xserver/hw/xfree86/os-support/bsd/bsd_jstk.c.orig Sat Jul 25 17:56:34 1998 ++++ ./programs/Xserver/hw/xfree86/os-support/bsd/bsd_jstk.c Fri Mar 29 04:44:43 2002 +@@ -29,7 +29,11 @@ + #include + #include + #include ++#ifdef __FreeBSD__ ++#include ++#else + #include ++#endif + #include + + #ifdef XFree86LOADER --- /dev/null Fri Apr 5 22:33:00 2002 +++ files/patch-joycal.c Fri Mar 29 10:32:13 2002 @@ -0,0 +1,14 @@ +--- ./programs/Xserver/hw/xfree86/etc/joycal.c.orig Sat Nov 22 00:00:18 1997 ++++ ./programs/Xserver/hw/xfree86/etc/joycal.c Fri Mar 29 04:45:06 2002 +@@ -6,7 +6,11 @@ + #include + #include + #if defined (__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) ++#ifdef __FreeBSD__ ++#include ++#else + #include ++#endif + #define JS_RETURN sizeof(struct joystick) + #define JS_DATA_TYPE joystick + #define button_down(j) (j.b1 | j.b2) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message