Date: Sun, 1 Oct 2000 09:33:45 -0700 From: Simon Karpen <slk@waterbinarytree.org> To: freebsd-gnats-submit@freebsd.org Subject: ports/21680: FIX for ports/x11/XFree86-4 compile failure due to bad patch Message-ID: <20001001093345.A5715@hcf.waterbinarytree.org>
next in thread | raw e-mail | index | archive | help
>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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20001001093345.A5715>