4 files changed, 17 insertions, 17 deletions

diff --git a/x11/xscreensaver/files/patch-driver_Makefile.in b/x11/xscreensaver/files/patch-driver_Makefile.in
index 5ae1c2c8de76..ce663e9be6c5 100644
--- a/x11/xscreensaver/files/patch-driver_Makefile.in
+++ b/x11/xscreensaver/files/patch-driver_Makefile.in
@@ -1,5 +1,5 @@
---- driver/Makefile.in.orig	Mon Mar 21 02:18:18 2005
-+++ driver/Makefile.in	Thu Apr 21 01:46:25 2005
+--- driver/Makefile.in.orig	Tue May 23 16:01:35 2006
++++ driver/Makefile.in	Sun Jun  4 00:01:46 2006
 @@ -121,7 +121,7 @@
  		  test-randr    xdpyinfo
  
@@ -9,7 +9,7 @@
  XML_LIBS	= @XML_LIBS@
  
  XDPMS_LIBS	= @XDPMS_LIBS@
-@@ -232,9 +232,8 @@
+@@ -236,9 +236,8 @@
  MEN		= $(MEN_1) @MEN_OSX@
  
  EXTRAS		= README Makefile.in \
@@ -20,7 +20,7 @@
  		  .gdbinit
  VMSFILES	= compile_axp.com compile_decc.com link_axp.com link_decc.com \
  		  vms-getpwnam.c vms-pwd.h vms-hpwd.c vms-validate.c \
-@@ -253,7 +252,7 @@
+@@ -257,7 +256,7 @@
  tests: $(TEST_EXES)
  
  install:   install-program   install-ad    install-scripts \
@@ -29,7 +29,7 @@
  uninstall: uninstall-program uninstall-ad  \
  	   uninstall-gnome   uninstall-man uninstall-xml  
  
-@@ -461,21 +460,6 @@
+@@ -486,21 +485,6 @@
   $$e ""									     ;\
  	  fi ;								\
  	fi
diff --git a/x11/xscreensaver/files/patch-hacks_apple2-main.c b/x11/xscreensaver/files/patch-hacks_apple2-main.c
index 8af7fa07239f..1f1238395572 100644
--- a/x11/xscreensaver/files/patch-hacks_apple2-main.c
+++ b/x11/xscreensaver/files/patch-hacks_apple2-main.c
@@ -1,6 +1,6 @@
---- hacks/apple2-main.c.orig	Wed May 19 21:45:49 2004
-+++ hacks/apple2-main.c	Wed May 19 21:46:13 2004
-@@ -30,6 +30,10 @@
+--- hacks/apple2-main.c.orig	Sun Mar 26 21:34:17 2006
++++ hacks/apple2-main.c	Sun Jun  4 00:01:46 2006
+@@ -39,6 +39,10 @@
  # ifdef HAVE_UTIL_H
  #  include <util.h>
  # endif
@@ -10,4 +10,4 @@
 +#include <libutil.h>
  #endif /* HAVE_FORKPTY */
  
- #undef countof
+ #include "screenhack.h"
diff --git a/x11/xscreensaver/files/patch-hacks_phosphor.c b/x11/xscreensaver/files/patch-hacks_phosphor.c
index e01033342531..df8e706632c0 100644
--- a/x11/xscreensaver/files/patch-hacks_phosphor.c
+++ b/x11/xscreensaver/files/patch-hacks_phosphor.c
@@ -1,6 +1,6 @@
---- hacks/phosphor.c.orig	Wed May 19 21:43:52 2004
-+++ hacks/phosphor.c	Wed May 19 21:44:54 2004
-@@ -33,6 +33,10 @@
+--- hacks/phosphor.c.orig	Fri Mar 31 19:50:00 2006
++++ hacks/phosphor.c	Sun Jun  4 00:01:46 2006
+@@ -41,6 +41,10 @@
  # ifdef HAVE_UTIL_H
  #  include <util.h>
  # endif
@@ -10,4 +10,4 @@
 +#include <libutil.h>
  #endif /* HAVE_FORKPTY */
  
- extern XtAppContext app;
+ #include "screenhack.h"
diff --git a/x11/xscreensaver/files/patch-hacks_webcollage b/x11/xscreensaver/files/patch-hacks_webcollage
index 9cb8dbc0546f..e8109fed28d8 100644
--- a/x11/xscreensaver/files/patch-hacks_webcollage
+++ b/x11/xscreensaver/files/patch-hacks_webcollage
@@ -1,6 +1,6 @@
---- hacks/webcollage.orig	Sun Apr 20 02:07:13 2003
-+++ hacks/webcollage	Sun Apr 20 02:07:52 2003
-@@ -31,6 +31,9 @@
+--- hacks/webcollage.orig	Wed May 17 16:58:51 2006
++++ hacks/webcollage	Sun Jun  4 00:01:46 2006
+@@ -38,6 +38,9 @@
  #
  # Driftnet is the Unix implementation of the MacOS "EtherPEG" program.
  
@@ -10,7 +10,7 @@
  
  require 5;
  use strict;
-@@ -46,10 +49,6 @@
+@@ -53,10 +56,6 @@
  require POSIX;
  use Fcntl ':flock'; # import LOCK_* constants
  use POSIX qw(strftime);