1 files changed, 32 insertions, 47 deletions
diff --git a/x11/xautolock/files/patch-aa b/x11/xautolock/files/patch-aa
index c10821e552d3..e289ea9c0f96 100644
--- a/x11/xautolock/files/patch-aa
+++ b/x11/xautolock/files/patch-aa
@@ -1,47 +1,32 @@
-*** xautolock.c.orig	Sat Jul 20 17:32:41 1996
---- xautolock.c	Sat Jul 20 17:56:41 1996
-***************
-*** 196,201 ****
---- 196,203 ----
-   *  with vroot.h, because it needs to know the real root window.
-   */
-  
-+ #include <sys/param.h>
-+ 
-  #if defined(hpux) || defined (__hpux)
-  #ifndef _HPUX_SOURCE
-  #define _HPUX_SOURCE
-***************
-*** 235,241 ****
---- 237,247 ----
-  #endif /* !NOSTDHDRS */
-  
-  #if !defined (apollo) && !defined (VMS)
-+ 
-+ #if !defined (BSD) 
-  #include <malloc.h>
-+ #endif /* !BSD */
-+ 
-  #include <unistd.h>
-  #endif /* !apollo && !VMS */
-  
-***************
-*** 1587,1593 ****
-  #else /* VMS */
-    if (locker_pid)
-    {
-! #if !defined (UTEKV) && !defined (SYSV) && !defined(SVR4)
-      union wait  status;  /* childs process status */
-  #else /* !UTEKV && !SYSV && !SVR4 */
-      int         status;  /* childs process status */
---- 1593,1602 ----
-  #else /* VMS */
-    if (locker_pid)
-    {
-! 
-! #if defined (BSD)
-!     int status;
-! #elif !defined (UTEKV) && !defined (SYSV) && !defined(SVR4)
-      union wait  status;  /* childs process status */
-  #else /* !UTEKV && !SYSV && !SVR4 */
-      int         status;  /* childs process status */
+--- xautolock.c.orig	Thu Oct 30 19:41:58 1997
++++ xautolock.c	Thu Mar 12 10:52:02 1998
+@@ -248,6 +248,8 @@
+  *  with vroot.h, because it needs to know the real root window.
+  */
+ 
++#include <sys/param.h>
++
+ #if defined(hpux) || defined (__hpux)
+ #ifndef _HPUX_SOURCE
+ #define _HPUX_SOURCE
+@@ -308,7 +310,9 @@
+ #endif /* !NOSTDHDRS */
+ 
+ #if !defined (apollo) && !defined (VMS)
++#if !defined (BSD)
+ #include <malloc.h>
++#endif /* !BSD */
+ #include <unistd.h>
+ #endif /* !apollo && !VMS */
+ 
+@@ -1842,7 +1846,9 @@
+ #else /* VMS */
+   if (locker_pid)
+   {
+-#if !defined (UTEKV) && !defined (SYSV) && !defined(SVR4)
++#if defined (BSD)
++    int status;
++#elif !defined (UTEKV) && !defined (SYSV) && !defined(SVR4)
+     union wait  status;      /* childs process status */
+ #else /* !UTEKV && !SYSV && !SVR4 */
+     int         status = 0;  /* childs process status */