From owner-freebsd-ports Sun Oct 1 9:30:14 2000 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id C5B9A37B66F for ; Sun, 1 Oct 2000 09:30:01 -0700 (PDT) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id JAA62135; Sun, 1 Oct 2000 09:30:01 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from hcf.waterbinarytree.org (40bc256c.dsl.flashcom.net [64.188.37.108]) by hub.freebsd.org (Postfix) with ESMTP id 9E4EC37B66C for ; Sun, 1 Oct 2000 09:27:02 -0700 (PDT) Received: (from slk@localhost) by hcf.waterbinarytree.org (8.10.1/8.10.1) id e91GXj214521 for freebsd-gnats-submit@freebsd.org; Sun, 1 Oct 2000 09:33:45 -0700 (PDT) Message-Id: <20001001093345.A5715@hcf.waterbinarytree.org> Date: Sun, 1 Oct 2000 09:33:45 -0700 From: Simon Karpen Reply-To: slk@waterbinarytree.org To: freebsd-gnats-submit@freebsd.org Subject: ports/21680: FIX for ports/x11/XFree86-4 compile failure due to bad patch Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 21680 >Category: ports >Synopsis: FIX for x11/XFree86-4 compile failure due to bad patch >Confidential: no >Severity: critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Sun Oct 01 09:30:01 PDT 2000 >Closed-Date: >Last-Modified: >Originator: Simon Karpen >Release: FreeBSD 4.1.1-RELEASE i386 >Organization: Well Watered Binary Trees >Environment: Clean install of 4.1.1-RELEASE, cvsup'd ports to -STABLE >Description: In ports/x11/XFree86-4, patch-k fails to apply because it was created one directory level too high >How-To-Repeat: cd /usr/ports/X11/XFree86-4 make >Fix: --- patch-k.orig Sat Sep 30 22:44:01 2000 +++ patch-k Sat Sep 30 22:44:03 2000 @@ -1,5 +1,5 @@ -*** xc/programs/Xserver/hw/xfree86/input/mouse/mouse.c.orig Sat Jul 1 01:39 :02 2000 ---- xc/programs/Xserver/hw/xfree86/input/mouse/mouse.c Fri Sep 22 11:30:18 2000 +*** programs/Xserver/hw/xfree86/input/mouse/mouse.c.orig Sat Jul 1 01:39 :02 2000 +--- programs/Xserver/hw/xfree86/input/mouse/mouse.c Fri Sep 22 11:30:18 2000 *************** *** 584,591 **** { 0xc0, 0x00, 0x00, 0x00, 6, 0x00, 0xff, MPF_NONE }, /* NetScroll */ :02 2000 +--- programs/Xserver/hw/xfree86/input/mouse/mouse.c Fri Sep 22 11:30:18 2000 *************** *** 584,591 **** { 0xc0, 0x00, 0x00, 0x00, 6, 0x00, 0xff, MPF_NONE }, /* NetScroll */ @@ -19,8 +19,8 @@ }; /* -*** xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_mouse.c.orig Sat Feb 12 21:45:41 2000 ---- xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_mouse.c Fri Sep 22 11:30 :18 2000 +*** programs/Xserver/hw/xfree86/os-support/bsd/bsd_mouse.c.orig Sat Feb 12 21:45:41 2000 +--- programs/Xserver/hw/xfree86/os-support/bsd/bsd_mouse.c Fri Sep 22 11:30 :18 2000 *************** *** 165,171 **** --- 165,179 ---- -- Simon Karpen slk@waterbinarytree.org Bell Labs Unix -- Reach out and grep someone. >Release-Note: >Audit-Trail: >Unformatted: X-send-pr-version: 3.2 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message