Bug 21680

Summary: FIX for x11/XFree86-4 compile failure due to bad patch
Product: Ports & Packages Reporter: Simon Karpen <slk>
Component: Individual Port(s)Assignee: freebsd-ports (Nobody) <ports>
Status: Closed FIXED    
Severity: Affects Only Me    
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   

Description Simon Karpen 2000-10-01 17:30:01 UTC
        In ports/x11/XFree86-4, patch-k fails to apply because it was
        created one directory level too high

Fix: 

-- 
Simon Karpen	slk@waterbinarytree.org
Bell Labs Unix -- Reach out and grep someone.--Xj7sFJNTn0yhhxbZ7V4IfzrdNnlAk0nveIu4V5I1YYCyys7w
Content-Type: text/plain; name="file.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="file.diff"

--- 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 ----
How-To-Repeat: 
        cd /usr/ports/X11/XFree86-4
        make
Comment 1 jmz freebsd_committer freebsd_triage 2000-10-01 17:31:16 UTC
State Changed
From-To: open->closed

Already fixed.