Update to 5.05. Most of this was obtained from x11/xscreensaver.

10 files changed, 49 insertions, 114 deletions

diff --git a/x11/xscreensaver-gnome/files/extra-patch-nodriver b/x11/xscreensaver-gnome/files/extra-patch-nodriver
index d341fc44545d..b7eb1621aedf 100644
--- a/x11/xscreensaver-gnome/files/extra-patch-nodriver
+++ b/x11/xscreensaver-gnome/files/extra-patch-nodriver
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Mon Sep 12 20:24:57 2005
-+++ Makefile.in	Mon Sep 12 20:25:15 2005
-@@ -6,7 +6,7 @@
+--- Makefile.in.orig	2008-07-06 16:33:27.000000000 -0400
++++ Makefile.in	2008-07-06 16:35:46.000000000 -0400
+@@ -6,7 +6,7 @@ srcdir		= @srcdir@
  VPATH		= @srcdir@
  
  SHELL		= /bin/sh
 -SUBDIRS		= utils driver hacks hacks/glx po
-+SUBDIRS		= utils hacks hacks/glx
- TARFILES	= README README.VMS README.debugging INSTALL \
++SUBDIRS		= utils hacks hacks/glx po
+ SUBDIRS2	= $(SUBDIRS) OSX
+ TARFILES	= README README.hacking README.VMS INSTALL \
  		  configure configure.in Makefile.in config.h.in \
- 		  config.h-vms install-sh setup.com config.guess aclocal.m4 \
diff --git a/x11/xscreensaver-gnome/files/patch-ab b/x11/xscreensaver-gnome/files/patch-ab
deleted file mode 100644
index dce689cd2cbf..000000000000
--- a/x11/xscreensaver-gnome/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Wed Mar 23 02:35:18 2005
-+++ configure	Wed Mar 23 02:36:54 2005
-@@ -2666,7 +2666,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"
-     OBJCC="$OBJCC -Wall"
-     # supposedly gcc 3.4 will have "-Wdeclaration-after-statement"
-     # and then perhaps we can do without -pedantic?
diff --git a/x11/xscreensaver-gnome/files/patch-driver_Makefile.in b/x11/xscreensaver-gnome/files/patch-driver_Makefile.in
index ed9995479280..1ab88ba9ffeb 100644
--- a/x11/xscreensaver-gnome/files/patch-driver_Makefile.in
+++ b/x11/xscreensaver-gnome/files/patch-driver_Makefile.in
@@ -1,11 +1,43 @@
---- driver/Makefile.in.orig	Sun Apr  3 21:14:26 2005
-+++ driver/Makefile.in	Sun Apr  3 21:14:39 2005
-@@ -253,7 +253,7 @@
- tests: $(TEST_EXES)
+--- driver/Makefile.in.orig	2007-11-13 00:39:35.000000000 -0800
++++ driver/Makefile.in	2007-12-08 23:23:01.000000000 -0800
+@@ -81,8 +81,8 @@
  
- install:   install-program   install-ad    install-scripts \
--	   install-gnome     install-man   install-xml install-pam
-+	   install-gnome     install-man   install-xml
- uninstall: uninstall-program uninstall-ad  \
- 	   uninstall-gnome   uninstall-man uninstall-xml  
  
+ AD_DIR		= @APPDEFAULTS@
+-PAM_DIR		= /etc/pam.d
+-PAM_CONF	= /etc/pam.conf
++PAM_DIR		= ${prefix}/etc/pam.d
++PAM_CONF	= ${prefix}/etc/pam.conf
+ 
+ UTILS_SRC	= $(srcdir)/../utils
+ UTILS_BIN	= ../utils
+@@ -239,7 +239,6 @@
+ EXTRAS		= README Makefile.in \
+ 		  XScreenSaver.ad.in XScreenSaver-Xm.ad xscreensaver.pam \
+ 		  xscreensaver-demo.glade2 xscreensaver-demo.glade2p \
+-		  screensaver-properties.desktop.in \
+ 		  .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 \
+@@ -490,21 +489,6 @@
+ 	  fi ;								\
+ 	fi
+ 
+-# screensaver-properties.desktop
+-# into /usr/share/applications/
+-install-gnome:: screensaver-properties.desktop
+-	@if [ "$(GTK_DATADIR)" != "" ]; then				      \
+-	   if [ ! -d "$(install_prefix)$(GTK_APPDIR)" ]; then		      \
+-	     echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)"	     ;\
+-		  $(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)"	     ;\
+-	   fi								     ;\
+-	   name2=gnome-screensaver-properties.desktop			     ;\
+-	   echo $(INSTALL_DATA) screensaver-properties.desktop		      \
+-		  $(install_prefix)$(GTK_APPDIR)/$$name2		     ;\
+-		$(INSTALL_DATA) screensaver-properties.desktop		      \
+-		  $(install_prefix)$(GTK_APPDIR)/$$name2		     ;\
+-	 fi
+-
+ 
+ # xscreensaver.xpm
+ # into /usr/share/pixmaps/
diff --git a/x11/xscreensaver-gnome/files/patch-driver_passwd-pam.c b/x11/xscreensaver-gnome/files/patch-driver_passwd-pam.c
deleted file mode 100644
index 0bd646582ff0..000000000000
--- a/x11/xscreensaver-gnome/files/patch-driver_passwd-pam.c
+++ /dev/null
@@ -1,30 +0,0 @@
---- driver/passwd-pam.c.orig	Sat Jul 12 04:44:38 2003
-+++ driver/passwd-pam.c	Thu Feb  5 18:09:45 2004
-@@ -183,6 +183,7 @@
-   char *user = 0;
-   sigset_t set;
-   struct timespec timeout;
-+  struct timeval tv;
- 
-   struct passwd *p = getpwuid (getuid ());
-   if (!p) return False;
-@@ -249,8 +250,9 @@
-   timeout.tv_sec = 0;
-   timeout.tv_nsec = 1;
-   set = block_sigchld();
-+  TIMESPEC_TO_TIMEVAL (&tv, &timeout);
-   status = pam_authenticate (pamh, 0);
--  sigtimedwait (&set, NULL, &timeout);
-+  select (0, NULL, NULL, NULL, &tv);
-   unblock_sigchld();
- 
-   if (verbose_p)
-@@ -289,7 +291,7 @@
- 
-   set = block_sigchld();
-   status = pam_authenticate (pamh, 0);
--  sigtimedwait(&set, NULL, &timeout);
-+  select (0, NULL, NULL, NULL, &tv);
-   unblock_sigchld();
- 
-   if (verbose_p)
diff --git a/x11/xscreensaver-gnome/files/patch-driver_xscreensaver-getimage-file b/x11/xscreensaver-gnome/files/patch-driver_xscreensaver-getimage-file
deleted file mode 100644
index 8e29544a2ff8..000000000000
--- a/x11/xscreensaver-gnome/files/patch-driver_xscreensaver-getimage-file
+++ /dev/null
@@ -1,11 +0,0 @@
---- driver/xscreensaver-getimage-file.orig	Tue May  4 20:40:38 2004
-+++ driver/xscreensaver-getimage-file	Wed May 19 21:39:59 2004
-@@ -133,7 +133,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")) {
- 
-       if ($file =~ m/[~%\#]$/ ||               # backup file, or
-           ! ($file =~ m/$good_file_re/io)) {   # no image extension
diff --git a/x11/xscreensaver-gnome/files/patch-driver_xscreensaver.h b/x11/xscreensaver-gnome/files/patch-driver_xscreensaver.h
deleted file mode 100644
index 23eb032dedb2..000000000000
--- a/x11/xscreensaver-gnome/files/patch-driver_xscreensaver.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- driver/xscreensaver.h.orig	Tue Jul 22 00:14:02 2003
-+++ driver/xscreensaver.h	Tue Jul 22 00:14:10 2003
-@@ -19,6 +19,7 @@
- 
- #include <string.h>
- #include <stdio.h>
-+#include <signal.h>
- 
- #include "prefs.h"
- 
diff --git a/x11/xscreensaver-gnome/files/patch-fix_with_glib-2.16 b/x11/xscreensaver-gnome/files/patch-fix_with_glib-2.16
deleted file mode 100644
index e63d28b1e6cd..000000000000
--- a/x11/xscreensaver-gnome/files/patch-fix_with_glib-2.16
+++ /dev/null
@@ -1,11 +0,0 @@
---- driver/demo-Gtk.c.orig	2008-03-26 16:35:44.000000000 -0500
-+++ driver/demo-Gtk.c	2008-03-26 16:36:14.000000000 -0500
-@@ -1085,7 +1085,7 @@
-   if (!was) gtk_widget_set_sensitive (parent, True);
- #ifdef HAVE_GTK2
-   model = gtk_tree_view_get_model (GTK_TREE_VIEW (list));
--  STFU g_assert (model);
-+  g_assert (model != NULL);
-   if (gtk_tree_model_iter_nth_child (model, &iter, NULL, list_elt))
-     {
-       selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (list));
diff --git a/x11/xscreensaver-gnome/files/patch-hacks_apple2-main.c b/x11/xscreensaver-gnome/files/patch-hacks_apple2-main.c
deleted file mode 100644
index 8af7fa07239f..000000000000
--- a/x11/xscreensaver-gnome/files/patch-hacks_apple2-main.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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 @@
- # ifdef HAVE_UTIL_H
- #  include <util.h>
- # endif
-+#include <sys/types.h>
-+#include <sys/ioctl.h>
-+#include <termios.h>
-+#include <libutil.h>
- #endif /* HAVE_FORKPTY */
- 
- #undef countof
diff --git a/x11/xscreensaver-gnome/files/patch-hacks_phosphor.c b/x11/xscreensaver-gnome/files/patch-hacks_phosphor.c
deleted file mode 100644
index e01033342531..000000000000
--- a/x11/xscreensaver-gnome/files/patch-hacks_phosphor.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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 @@
- # ifdef HAVE_UTIL_H
- #  include <util.h>
- # endif
-+#include <sys/types.h>
-+#include <sys/ioctl.h>
-+#include <termios.h>
-+#include <libutil.h>
- #endif /* HAVE_FORKPTY */
- 
- extern XtAppContext app;
diff --git a/x11/xscreensaver-gnome/files/xscreensaver.pam b/x11/xscreensaver-gnome/files/xscreensaver.pam
new file mode 100644
index 000000000000..1cd383e68d50
--- /dev/null
+++ b/x11/xscreensaver-gnome/files/xscreensaver.pam
@@ -0,0 +1,2 @@
+auth		include		system
+account		include		system