Upgrade this beast to the most recent version.

Most of the old patches are no longer needed.  The app-defaults
have been slightly modfied (so `image' is the default mode
again, giving us the daemon image).

1 files changed, 13 insertions, 47 deletions

diff --git a/x11/xlockmore/files/patch-aa b/x11/xlockmore/files/patch-aa
index cbe41d048b73..f8d6ca778ab0 100644
--- a/x11/xlockmore/files/patch-aa
+++ b/x11/xlockmore/files/patch-aa
@@ -1,51 +1,17 @@
-diff -rc xlockmore.orig/XLock.ad xlockmore/XLock.ad
-*** xlockmore.orig/XLock.ad	Sun Oct 23 22:23:15 1994
---- xlockmore/XLock.ad	Wed Nov  9 15:08:35 1994
+*** XLock.ad.orig	Wed Feb 22 23:36:30 1995
+--- XLock.ad	Wed Feb 22 23:36:56 1995
 ***************
-*** 1,4 ****
+*** 1,6 ****
 ! XLock.mode: blank
+  !XLock.mode: random
+! !XLock.mode: life
   XLock.font: -b&h-lucida-medium-r-normal-sans-24-*-*-*-*-*-iso8859-1
-  XLock.background: White
-  XLock.foreground: Black
---- 1,4 ----
-! XLock.mode: random
+  !XLock.background: White
+  !XLock.foreground: Black
+--- 1,6 ----
+! !XLock.mode: blank
+  !XLock.mode: random
+! XLock.mode: life
   XLock.font: -b&h-lucida-medium-r-normal-sans-24-*-*-*-*-*-iso8859-1
-  XLock.background: White
-  XLock.foreground: Black
-diff -rc xlockmore.orig/xlock.c xlockmore/xlock.c
-*** xlockmore.orig/xlock.c	Mon Oct 17 07:41:41 1994
---- xlockmore/xlock.c	Wed Nov  9 14:52:07 1994
-***************
-*** 530,536 ****
-  #else
-      struct passwd *pw;
-  
-! #ifdef __NetBSD__
-      seteuid(0);                       /* Need to be root now on NetBSD */
-  #endif
-      pw = (struct passwd *)getpwnam("root");
---- 530,536 ----
-  #else
-      struct passwd *pw;
-  
-! #if defined(__FreeBSD__) || defined(__NetBSD__)
-      seteuid(0);                       /* Need to be root now on NetBSD */
-  #endif
-      pw = (struct passwd *)getpwnam("root");
-***************
-*** 555,561 ****
-  
-      user = pw->pw_name;
-  #endif
-! #ifdef __NetBSD__
-      seteuid(getuid());                /* Don't need to be root anymore */
-  #endif
-  #endif
---- 555,561 ----
-  
-      user = pw->pw_name;
-  #endif
-! #if defined(__FreeBSD__) || defined(__NetBSD__)
-      seteuid(getuid());                /* Don't need to be root anymore */
-  #endif
-  #endif
+  !XLock.background: White
+  !XLock.foreground: Black