3 files changed, 43 insertions, 16 deletions

diff --git a/x11/xscreensaver/files/patch-ab b/x11/xscreensaver/files/patch-ab
index d75477c6e95c..7614a2a1ddea 100644
--- a/x11/xscreensaver/files/patch-ab
+++ b/x11/xscreensaver/files/patch-ab
@@ -1,6 +1,24 @@
---- configure.orig	Fri May 31 20:43:47 2002
-+++ configure	Wed Jun  5 00:58:27 2002
-@@ -17452,13 +17452,13 @@
+--- configure.orig	Thu Aug 14 02:52:10 2003
++++ configure	Sun Sep  7 15:52:28 2003
+@@ -2380,7 +2380,7 @@
+   if test -n "$GCC"; then
+     echo "$as_me:$LINENO: result: Turning on gcc compiler warnings." >&5
+ echo "${ECHO_T}Turning on gcc compiler warnings." >&6
+-    CC="$CC -pedantic -Wall -Wstrict-prototypes -Wnested-externs"
++    CC="$CC -Wall -Wstrict-prototypes -Wnested-externs"
+     # supposedly gcc 3.4 will have "-Wdeclaration-after-statement"
+     # and then perhaps we can do without -pedantic?
+   else
+@@ -12859,7 +12859,7 @@
+       ok="yes"
+       pkg_check_version gtk+       1.2     ; ac_gtk_version_string="$vers"
+       pkg_check_version glib       1.0
+-      pkg_check_version gdk_pixbuf 0.1
++      # pkg_check_version gdk_pixbuf 0.1 - pick this up later
+       have_gtk="$ok"
+ 
+       # Now check for Gnome...
+@@ -17886,13 +17886,13 @@
  # Now that we know whether we have Gnome, we can decide where the XML
  # config files get installed.
  #
diff --git a/x11/xscreensaver/files/patch-driver_Makefile.in b/x11/xscreensaver/files/patch-driver_Makefile.in
index f5e2704ba1ff..b3bb8c2f32e6 100644
--- a/x11/xscreensaver/files/patch-driver_Makefile.in
+++ b/x11/xscreensaver/files/patch-driver_Makefile.in
@@ -1,6 +1,15 @@
---- driver/Makefile.in.Dist	Wed Oct 23 20:26:18 2002
-+++ driver/Makefile.in	Thu Oct 24 23:20:33 2002
-@@ -216,8 +216,6 @@
+--- driver/Makefile.in.orig	Thu Aug 14 02:52:11 2003
++++ driver/Makefile.in	Sun Sep  7 16:02:47 2003
+@@ -121,7 +121,7 @@
+ 		  test-apm   test-fade   xdpyinfo
+ 
+ MOTIF_LIBS	= @MOTIF_LIBS@ @XPM_LIBS@ $(XMU_LIBS)
+-GTK_LIBS	= @GTK_LIBS@ $(XMU_LIBS)
++GTK_LIBS	= @GTK_LIBS@ @XPM_LIBS@ $(XMU_LIBS)
+ XML_LIBS	= @XML_LIBS@
+ 
+ XDPMS_LIBS	= @XDPMS_LIBS@
+@@ -219,8 +219,6 @@
  EXTRAS		= README Makefile.in XScreenSaver.ad.in xscreensaver.pam \
  		  xscreensaver-demo.glade xscreensaver-demo.glade2 \
  		  xscreensaver-demo.glade2p \
@@ -9,7 +18,7 @@
  		  xscreensaver.kss.in \
  		  .gdbinit
  VMSFILES	= compile_axp.com compile_decc.com link_axp.com link_decc.com \
-@@ -451,107 +449,6 @@
+@@ -454,107 +452,6 @@
   $$e ""									     ;\
  	  fi ;								\
  	fi
@@ -116,4 +125,4 @@
 -	 fi
  
  # xscreensaver.xpm
- install-gnome:: $(LOGO)
+ # into /usr/share/pixmaps/
diff --git a/x11/xscreensaver/files/patch-driver_xscreensaver-getimage-file b/x11/xscreensaver/files/patch-driver_xscreensaver-getimage-file
index 5a9ed975f5ff..db5f51c2d293 100644
--- a/x11/xscreensaver/files/patch-driver_xscreensaver-getimage-file
+++ b/x11/xscreensaver/files/patch-driver_xscreensaver-getimage-file
@@ -1,6 +1,6 @@
---- driver/xscreensaver-getimage-file.orig	Sun Jan 19 21:27:38 2003
-+++ driver/xscreensaver-getimage-file	Fri Apr 18 23:02:37 2003
-@@ -42,7 +42,7 @@
+--- driver/xscreensaver-getimage-file.orig	Sat Jun 28 19:01:43 2003
++++ driver/xscreensaver-getimage-file	Fri Aug 15 02:46:20 2003
+@@ -43,7 +43,7 @@
  # So we do it like this instead:
  #
  BEGIN {
@@ -9,12 +9,12 @@
      require Fcntl;
      import  Fcntl ':mode';    # if not, look for it in "Fcntl".
    }
-@@ -139,7 +139,7 @@
-     if (S_ISDIR($mode)) {
+@@ -149,7 +149,7 @@
        push @dirs, $file;
+       $dir_count++;
        print STDERR "$progname:   found dir  $file\n" if ($verbose > 2);
 -    } elsif (S_ISREG($mode) || S_ISLNK($mode)) {
 +    } elsif (S_ISREG($mode) || (-l "$file")) {
-       push @all_files, $file;
-       print STDERR "$progname:   found file $file\n" if ($verbose > 2);
-     } elsif ($verbose > 2) {
+ 
+       if ($file =~ m/[~%\#]$/ ||               # backup file, or
+           ! ($file =~ m/$good_file_re/io)) {   # no image extension