Upgrade to 3.26.

2 files changed, 15 insertions, 39 deletions

diff --git a/x11/xscreensaver/files/patch-ab b/x11/xscreensaver/files/patch-ab
index e1135f87ebe8..cee2fbac9544 100644
--- a/x11/xscreensaver/files/patch-ab
+++ b/x11/xscreensaver/files/patch-ab
@@ -1,5 +1,5 @@
---- configure.orig	Mon Apr  3 05:03:52 2000
-+++ configure	Mon May  8 17:46:15 2000
+--- configure.orig	Sat Nov 11 10:43:52 2000
++++ configure	Sun Nov 12 11:14:09 2000
 @@ -3174,7 +3174,7 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
@@ -9,7 +9,7 @@
  else
    echo "$ac_t""no" 1>&6
  fi
-@@ -5267,7 +5267,7 @@
+@@ -5336,7 +5336,7 @@
      PASSWD_LIBS="$PASSWD_LIBS -lkrb4 -ldes425 -lkrb5 -lk5crypto -lcrypt -lcom_err"
    elif test "$have_kerberos" = yes ; then
      # from Tim Showalter <tjs+@andrew.cmu.edu>
@@ -18,30 +18,3 @@
    fi
  
    if test "$have_kerberos" = yes ; then
-@@ -6151,7 +6151,7 @@
-     gtk_path="$gtk_dir:$gtk_dir:$gtk_path"
-   fi
- 
--  for ac_prog in glib-config
-+  for ac_prog in `basename ${GLIB_CONFIG}`
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
-@@ -6191,7 +6191,7 @@
- test -n "$glib_config" && break
- done
- 
--  for ac_prog in gtk-config
-+  for ac_prog in `basename ${GTK_CONFIG}`
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
-@@ -6485,7 +6485,7 @@
- if eval "test \"`echo '$''{'ac_cv_gtk_version_string'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
--  ac_cv_gtk_version_string=`$glib_config --version`
-+  ac_cv_gtk_version_string=`${GTK_CONFIG} --version`
- fi
- 
- echo "$ac_t""$ac_cv_gtk_version_string" 1>&6
diff --git a/x11/xscreensaver/files/patch-ae b/x11/xscreensaver/files/patch-ae
index 8b7d396753c9..4f6a10d8154d 100644
--- a/x11/xscreensaver/files/patch-ae
+++ b/x11/xscreensaver/files/patch-ae
@@ -1,6 +1,6 @@
---- driver/Makefile.in.orig	Mon Apr  3 05:04:08 2000
-+++ driver/Makefile.in	Mon May  8 19:09:10 2000
-@@ -147,17 +147,17 @@
+--- driver/Makefile.in.orig	Sat Nov 11 10:44:07 2000
++++ driver/Makefile.in	Sun Nov 12 11:17:08 2000
+@@ -148,18 +148,16 @@
  CMD_LIBS	= $(LIBS) $(X_LIBS) \
  		  $(X_PRE_LIBS) -lX11 -lXext $(X_EXTRA_LIBS)
  
@@ -13,19 +13,22 @@
 -MEN		= xscreensaver.man xscreensaver-demo.man \
 +MEN		= xscreensaver.man \
  		  xscreensaver-command.man
- ALL_MEN		= xscreensaver.man \
+-ALL_MEN		= xscreensaver.man \
 -		  xscreensaver-demo.man xscreensaver-command.man
-+		  xscreensaver-command.man
++ALL_MEN		= xscreensaver.man xscreensaver-command.man
  EXTRAS		= README Makefile.in XScreenSaver.ad.in xscreensaver.pam \
 -		  xscreensaver.kss xscreensaver-demo.glade \
-+		  xscreensaver.kss \
- 		  screensaver-properties.desktop.in .gdbinit
+-		  screensaver-properties.desktop.in .gdbinit
++		  xscreensaver.kss 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 \
-@@ -211,8 +211,6 @@
- 	$$inst xscreensaver $(install_prefix)$(bindir)/xscreensaver
+ 		  vms_axp.opt vms_axp_12.opt vms_decc.opt vms_decc_12.opt
+@@ -214,10 +212,6 @@
+ 	  $(install_prefix)$(bindir)/xscreensaver-command ; \
  	$(INSTALL_PROGRAM) xscreensaver-command \
  	  $(install_prefix)$(bindir)/xscreensaver-command
+-	@echo $(INSTALL_PROGRAM) xscreensaver-demo \
+-	  $(install_prefix)$(bindir)/xscreensaver-demo ; \
 -	$(INSTALL_PROGRAM) xscreensaver-demo \
 -	  $(install_prefix)$(bindir)/xscreensaver-demo