From owner-freebsd-x11@FreeBSD.ORG Fri Apr 13 08:29:34 2012 Return-Path: Delivered-To: freebsd-x11@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D4239106566B for ; Fri, 13 Apr 2012 08:29:34 +0000 (UTC) (envelope-from conrads@cox.net) Received: from eastrmfepo103.cox.net (eastrmfepo103.cox.net [68.230.241.215]) by mx1.freebsd.org (Postfix) with ESMTP id 6AE208FC0C for ; Fri, 13 Apr 2012 08:29:34 +0000 (UTC) Received: from eastrmimpo306.cox.net ([68.230.241.238]) by eastrmfepo103.cox.net (InterMail vM.8.01.04.00 201-2260-137-20101110) with ESMTP id <20120413082928.DGOL8874.eastrmfepo103.cox.net@eastrmimpo306.cox.net>; Fri, 13 Apr 2012 04:29:28 -0400 Received: from serene.no-ip.org ([98.164.83.206]) by eastrmimpo306.cox.net with bizsmtp id xLVT1i00B4T5sES02LVTSA; Fri, 13 Apr 2012 04:29:27 -0400 X-CT-Class: Clean X-CT-Score: 0.00 X-CT-RefID: str=0001.0A020205.4F87E3E7.009A,ss=1,re=0.000,fgs=0 X-CT-Spam: 0 X-Authority-Analysis: v=1.1 cv=CRPD+Qc8oD39miT01U+idCnfgtTI0UgUfEDugnPCZ2w= c=1 sm=1 a=znDT18OmubkA:10 a=G8Uczd0VNMoA:10 a=kj9zAlcOel0A:10 a=cRs4AX/51puMaUeRAuoQtw==:17 a=pGLkceISAAAA:8 a=6I5d2MoRAAAA:8 a=kviXuzpPAAAA:8 a=mZy4a6HNAAIAE5RnhnEA:9 a=3qqHhXgJ1UOJ7i2KLaYA:7 a=CjuIK1q_8ugA:10 a=MSl-tDqOz04A:10 a=4vB-4DCPJfMA:10 a=cRs4AX/51puMaUeRAuoQtw==:117 X-CM-Score: 0.00 Authentication-Results: cox.net; none Received: from cox.net (localhost [127.0.0.1]) by serene.no-ip.org (8.14.5/8.14.5) with ESMTP id q3D8TRYj065104; Fri, 13 Apr 2012 03:29:27 -0500 (CDT) (envelope-from conrads@cox.net) Date: Fri, 13 Apr 2012 03:29:21 -0500 From: "Conrad J. Sabatier" To: meowthink Message-ID: <20120413032921.0613b021@cox.net> In-Reply-To: <1334239310395-5635729.post@n5.nabble.com> References: <20120411232308.5c2007d5@cox.net> <1334239310395-5635729.post@n5.nabble.com> X-Mailer: Claws Mail 3.8.0 (GTK+ 2.24.6; amd64-portbld-freebsd10.0) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: freebsd-x11@freebsd.org Subject: Re: Upgrade of xorg-server to 1.12.0,1 fails with dtrace error X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: X11 on FreeBSD -- maintaining and support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Apr 2012 08:29:35 -0000 On Thu, 12 Apr 2012 07:01:50 -0700 (PDT) meowthink wrote: > You need add > #define zoneid_t id_t > to get d script compiled properly > > A patch can be found here: > http://www.freebsd.org/cgi/query-pr.cgi?pr=158529&cat=ports The patch doesn't quite apply cleanly against the version currently in the xorg-dev trunk. Even so, I went back and hand-patched the broken sections, and stillget the same errors with the dtrace stuff. :-( Here's the output from running the patch: root:/usr/ports# patch -p0 < ~conrads/Downloads/xorg-server.diff Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: x11-servers/xorg-server/Makefile |=================================================================== |RCS file: /a/.cvsup/ports/x11-servers/xorg-server/Makefile,v |retrieving revision 1.80 |diff -u -p -r1.80 Makefile |--- x11-servers/xorg-server/Makefile 27 Feb 2011 23:16:09 -0000 1.80 |+++ x11-servers/xorg-server/Makefile 30 Jun 2011 08:04:53 -0000 -------------------------- Patching file x11-servers/xorg-server/Makefile using Plan A... Hunk #1 failed at 36. Hunk #2 succeeded at 138 (offset 14 lines). 1 out of 2 hunks failed--saving rejects to x11-servers/xorg-server/Makefile.rej Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: x11-servers/xorg-server/files/patch-dix-Xserver.d |=================================================================== |RCS file: x11-servers/xorg-server/files/patch-dix-Xserver.d |diff -N x11-servers/xorg-server/files/patch-dix-Xserver.d |--- /dev/null 1 Jan 1970 00:00:00 -0000 |+++ x11-servers/xorg-server/files/patch-dix-Xserver.d 25 Jun 2011 04:08:20 -0000 -------------------------- (Creating file x11-servers/xorg-server/files/patch-dix-Xserver.d...) Patching file x11-servers/xorg-server/files/patch-dix-Xserver.d using Plan A... Hunk #1 succeeded at 1. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: x11-servers/xorg-server/files/patch-hw-xfree86-Makefile.in |=================================================================== |RCS file: x11-servers/xorg-server/files/patch-hw-xfree86-Makefile.in |diff -N x11-servers/xorg-server/files/patch-hw-xfree86-Makefile.in |--- /dev/null 1 Jan 1970 00:00:00 -0000 |+++ x11-servers/xorg-server/files/patch-hw-xfree86-Makefile.in 25 Jun 2011 04:08:20 -0000 -------------------------- (Creating file x11-servers/xorg-server/files/patch-hw-xfree86-Makefile.in...) Patching file x11-servers/xorg-server/files/patch-hw-xfree86-Makefile.in using Plan A... Hunk #1 succeeded at 1. done root:/usr/ports# -- Conrad J. Sabatier conrads@cox.net