rpms/xscreensaver/devel xscreensaver-4.22-make-hackdir-absolute-path-new.patch, NONE, 1.1 xscreensaver-4.22-mandir-fix-against10.patch, NONE, 1.1 xscreensaver-4.22-show-uname.patch, NONE, 1.1 xscreensaver-4.23-allow-zero-dpms-timeout-MOREFIX.patch, NONE, 1.1 xscreensaver-4.23-default-text.patch, NONE, 1.1 xscreensaver-4.23-fix-free-demoGtk.patch, NONE, 1.1 xscreensaver-4.23-fix-inconsistency.patch, NONE, 1.1 xscreensaver-4.23-manfile-entry-fix.patch, NONE, 1.1 xscreensaver-4.23-modularX-addoption.patch, NONE, 1.1 xscreensaver-4.23-realpath-heap-allocate.patch, NONE, 1.1 xscreensaver-4.23-remove-gccwarn-pointer.patch, NONE, 1.1

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Mon Jan 23 03:26:51 UTC 2006


Author: rstrode

Update of /cvs/dist/rpms/xscreensaver/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28889

Added Files:
	xscreensaver-4.22-make-hackdir-absolute-path-new.patch 
	xscreensaver-4.22-mandir-fix-against10.patch 
	xscreensaver-4.22-show-uname.patch 
	xscreensaver-4.23-allow-zero-dpms-timeout-MOREFIX.patch 
	xscreensaver-4.23-default-text.patch 
	xscreensaver-4.23-fix-free-demoGtk.patch 
	xscreensaver-4.23-fix-inconsistency.patch 
	xscreensaver-4.23-manfile-entry-fix.patch 
	xscreensaver-4.23-modularX-addoption.patch 
	xscreensaver-4.23-realpath-heap-allocate.patch 
	xscreensaver-4.23-remove-gccwarn-pointer.patch 
Log Message:
add files i thought I already added


xscreensaver-4.22-make-hackdir-absolute-path-new.patch:
 driver/Makefile.in    |   24 ++++++++++++++++++++----
 hacks/Makefile.in     |   17 +++++++++++++++++
 hacks/glx/Makefile.in |   15 +++++++++++++++
 3 files changed, 52 insertions(+), 4 deletions(-)

--- NEW FILE xscreensaver-4.22-make-hackdir-absolute-path-new.patch ---
--- xscreensaver-4.22/hacks/glx/Makefile.in.make-hack-paths-absolute	2005-10-06 18:01:00.000000000 +0900
+++ xscreensaver-4.22/hacks/glx/Makefile.in	2005-10-06 18:04:56.000000000 +0900
@@ -61,6 +61,10 @@
 UTILS_SRC	= $(HACK_SRC)/../utils
 UTILS_BIN	= $(HACK_BIN)/../utils
 
+DRIVER_DIR	= ../../driver
+ADFILE		= XScreenSaver.ad
+HACKDIR_FULL	= @HACKDIR_FULL@
+
 INCLUDES	= -I. -I$(srcdir) -I$(UTILS_SRC) -I$(HACK_SRC) -I../.. @INCLUDES@
 
 UTIL_SRCS	= $(UTILS_SRC)/colors.c $(UTILS_SRC)/hsv.c \
@@ -191,6 +195,17 @@
 default: all
 all: $(EXES)
 
+$(ADFILE).gl-extras : ../$(ADFILE).extras $(EXES)
+	@echo "Creating $(ADFILE).gl-extras"; 				\
+	cp -p ../$(ADFILE).extras $(ADFILE).tmp ; 		\
+	for f in $(EXES) ; do \
+		mv  $(ADFILE).tmp $(ADFILE).tmp2 ; 			\
+		eval sed -e \
+			\'s\|\\\(\[ \\t\]\\\)$$f\\\(\[ \\t\]\\\)\|\\1$(HACKDIR_FULL)/$$f\\2\|g\' \
+			$(ADFILE).tmp2 > $(ADFILE).tmp ;		\
+	done ; 								\
+	cp -p $(ADFILE).tmp $(ADFILE).gl-extras
+
 install:   install-program    install-xml   install-man
 uninstall: uninstall-program  uninstall-xml uninstall-man
 
--- xscreensaver-4.22/hacks/Makefile.in.make-hack-paths-absolute	2005-10-06 18:01:00.000000000 +0900
+++ xscreensaver-4.22/hacks/Makefile.in	2005-10-06 18:04:39.000000000 +0900
@@ -63,6 +63,12 @@
 UTILS_SRC	= $(srcdir)/../utils
 UTILS_BIN	= ../utils
 
+DRIVER_DIR	= ../driver
+ADFILE		= XScreenSaver.ad
+ADFILEIN	= $(ADFILE).in
+
+HACKDIR_FULL	= @HACKDIR_FULL@
+
 INCLUDES	= -I. -I$(srcdir) -I$(UTILS_SRC) -I.. @INCLUDES@
 
 UTIL_SRCS	= $(UTILS_SRC)/alpha.c $(UTILS_SRC)/colors.c \
@@ -231,6 +237,17 @@
 default: all
 all: $(EXES)
 
+$(ADFILE).extras : $(DRIVER_DIR)/$(ADFILEIN) $(EXES)
+	@echo "Creating $(ADFILE).extras"; 				\
+	cp -p $(DRIVER_DIR)/$(ADFILEIN) $(ADFILE).tmp ; 		\
+	for f in $(EXES) $(SCRIPTS) ; do \
+		mv  $(ADFILE).tmp $(ADFILE).tmp2 ; 		\
+		eval sed -e \
+			\'s\|\\\(\[ \\t\]\\\)$$f\\\(\[ \\t\]\\\)\|\\1$(HACKDIR_FULL)/$$f\\2\|g\' \
+			$(ADFILE).tmp2 > $(ADFILE).tmp ;	\
+	done ; 								\
+	cp -p $(ADFILE).tmp $(ADFILE).extras
+
 install:   install-program   install-scripts install-xml install-man
 uninstall: uninstall-program uninstall-xml uninstall-man
 
--- xscreensaver-4.22/driver/Makefile.in.make-hack-paths-absolute	2005-10-06 18:01:00.000000000 +0900
+++ xscreensaver-4.22/driver/Makefile.in	2005-10-06 18:01:01.000000000 +0900
@@ -142,6 +142,9 @@
 GL_OBJS		= @SAVER_GL_OBJS@
 GL_LIBS		= @SAVER_GL_LIBS@
 
+ADFILE		= XScreenSaver.ad
+ADFILEIN	= $(ADFILE).in
+
 ICON_SRC        = $(UTILS_SRC)/images
 LOGO		= $(ICON_SRC)/logo-50.xpm
 GTK_ICONS	= $(ICON_SRC)/screensaver-*.png
@@ -249,8 +252,21 @@
 		  $(TEST_SRCS)
 
 
-default: $(EXES)
-all: $(EXES) $(EXES2)
+default: $(EXES) $(ADFILEIN) $(ADFILE).new
+all: $(EXES) $(EXES2) $(ADFILEIN) $(ADFILE)
+
+$(ADFILEIN): $(ADFILE)
+	@if [ -e $(ADFILE) -a ! -e $(ADFILEIN) ] ; then \
+	   mv -f $(ADFILE) $(ADFILEIN) ; \
+	fi
+
+$(ADFILE).new:  ../hacks/Makefile ../hacks/glx/Makefile $(ADFILEIN)
+	@(cd ../hacks; make $(ADFILE).extras) ; \
+	(cd ../hacks/glx; make $(ADFILE).gl-extras) ; \
+	echo "Creating $(ADFILE)" ; 					\
+	cp -p ../hacks/glx/$(ADFILE).gl-extras $(ADFILE) ; \
+	cp -p $(ADFILE) $(ADFILE).new
+
 tests: $(TEST_EXES)
 
 install:   install-program   install-ad    install-scripts \
@@ -781,8 +797,8 @@
 
 # How we build the default app-defaults file into the program.
 #
-XScreenSaver_ad.h: XScreenSaver.ad
-	$(SHELL) $(UTILS_SRC)/ad2c XScreenSaver.ad > XScreenSaver_ad.h
+XScreenSaver_ad.h: $(ADFILEIN)
+	$(SHELL) $(UTILS_SRC)/ad2c $(ADFILEIN) > XScreenSaver_ad.h
 
 XScreenSaver_Xm_ad.h: XScreenSaver-Xm.ad
 	$(SHELL) $(UTILS_SRC)/ad2c XScreenSaver-Xm.ad > XScreenSaver_Xm_ad.h

xscreensaver-4.22-mandir-fix-against10.patch:
 Makefile.in        |    4 +++-
 XScreenSaver.ad.in |    6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

--- NEW FILE xscreensaver-4.22-mandir-fix-against10.patch ---
--- xscreensaver-4.22/driver/Makefile.in.patch10	2005-10-07 00:37:53.000000000 +0900
+++ xscreensaver-4.22/driver/Makefile.in	2005-10-07 00:44:18.000000000 +0900
@@ -264,7 +264,9 @@
 	@(cd ../hacks; make $(ADFILE).extras) ; \
 	(cd ../hacks/glx; make $(ADFILE).gl-extras) ; \
 	echo "Creating $(ADFILE)" ; 					\
-	cp -p ../hacks/glx/$(ADFILE).gl-extras $(ADFILE) ; \
+	cp -p ../hacks/glx/$(ADFILE).gl-extras $(ADFILE).tmp ; \
+	sed -e 's|$$(mansuffix)|$(mansuffix)|g' $(ADFILE).tmp > \
+	      $(ADFILE) ; \
 	cp -p $(ADFILE) $(ADFILE).new
 
 tests: $(TEST_EXES)
--- xscreensaver-4.22/driver/XScreenSaver.ad.in.patch10	2005-10-07 00:37:52.000000000 +0900
+++ xscreensaver-4.22/driver/XScreenSaver.ad.in	2005-10-07 00:41:55.000000000 +0900
@@ -95,12 +95,12 @@
 !   Gnome 2.4, 2.6: (yelp can't display man pages, as of 2.6.3)
 !
 @GNOME24@*manualCommand: gnome-terminal --title '%s manual' \
- at GNOME24@		--command '/bin/sh -c "man 6 `basename %s`; read foo"'
+ at GNOME24@		--command '/bin/sh -c "man $(mansuffix) `basename %s`; read foo"'
 !
 !   Gnome 2.2:
 !
 @GNOME22@*manualCommand: gnome-terminal --title '%s manual' \
- at GNOME22@		--command '/bin/sh -c "man 6 `basename %s`; read foo"'
+ at GNOME22@		--command '/bin/sh -c "man $(mansuffix) `basename %s`; read foo"'
 !
 !   Gnome 1.4:
 !
@@ -110,7 +110,7 @@
 !   non-Gnome systems:
 !
 @NOGNOME@*manualCommand: xterm -sb -fg black -bg gray75 -T '%s manual' \
- at NOGNOME@		    -e /bin/sh -c 'man 6 `basename %s`; read foo'
+ at NOGNOME@		    -e /bin/sh -c 'man $(mansuffix) `basename %s`; read foo'
 
 loadURL: htmlview '%s'
 

xscreensaver-4.22-show-uname.patch:
 XScreenSaver.ad.in |    2 +
 lock.c             |   69 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 70 insertions(+), 1 deletion(-)

--- NEW FILE xscreensaver-4.22-show-uname.patch ---
--- xscreensaver-4.22/driver/XScreenSaver.ad.in.showuname	2005-10-07 00:46:53.000000000 +0900
+++ xscreensaver-4.22/driver/XScreenSaver.ad.in	2005-10-07 00:48:25.000000000 +0900
@@ -441,6 +441,7 @@
 *Dialog.headingFont:		*-helvetica-bold-r-*-*-*-180-*-*-*-iso8859-1
 *Dialog.bodyFont:		*-helvetica-bold-r-*-*-*-140-*-*-*-iso8859-1
 *Dialog.labelFont:		*-helvetica-bold-r-*-*-*-140-*-*-*-iso8859-1
+*Dialog.unameFont:		*-helvetica-bold-r-*-*-*-120-*-*-*-iso8859-1
 *Dialog.buttonFont:		*-helvetica-bold-r-*-*-*-140-*-*-*-iso8859-1
 *Dialog.dateFont:		*-helvetica-medium-r-*-*-*-80-*-*-*-iso8859-1
 ! Helvetica asterisks look terrible.
@@ -472,6 +473,7 @@
 *passwd.passwd.label:		Password:
 *passwd.thermometer.width:	8
 *passwd.asterisks:              True
+*passwd.uname:                  True
 
 *splash.heading.label:		XScreenSaver %s
 *splash.body.label:		Copyright © 1991-2005 by
--- xscreensaver-4.22/driver/lock.c.showuname	2005-10-07 00:46:53.000000000 +0900
+++ xscreensaver-4.22/driver/lock.c	2005-10-07 00:46:53.000000000 +0900
@@ -58,6 +58,11 @@
 ERROR!  You must not include vroot.h in this file.
 #endif
 
+#ifdef HAVE_UNAME
+# include <sys/utsname.h> /* for hostname info */
+#endif /* HAVE_UNAME */
+#include <ctype.h>
+
 #ifndef VMS
 # include <pwd.h>
 #else /* VMS */
@@ -108,6 +113,9 @@
   char *user_string;
   char *passwd_string;
   char *login_label;
+  char *uname_label;
+
+  Bool show_uname_p;
 
   XFontStruct *heading_font;
   XFontStruct *body_font;
@@ -115,6 +123,7 @@
   XFontStruct *passwd_font;
   XFontStruct *date_font;
   XFontStruct *button_font;
+  XFontStruct *uname_font;
 
   Pixel foreground;
   Pixel background;
@@ -226,6 +235,30 @@
     pw->heading_label = s;
   }
 
+  /* Get hostname info */
+  pw->uname_label = strdup(""); /* Initialy, write nothing */
+
+# ifdef HAVE_UNAME
+  {
+    struct utsname uts;
+
+    if (uname (&uts) == 0)
+      {
+#if 0 /* Get the full hostname */
+	{
+	  char *s;
+	  if ((s = strchr(uts.nodename, '.')))
+	    *s = 0;
+	}
+#endif
+	char *s = (char *) malloc(strlen(uts.nodename) + 13);
+	sprintf(s, "On %s", uts.nodename);
+	free (pw->uname_label);
+	pw->uname_label = s;
+      }
+  }
+# endif
+
   pw->user_string = strdup (p && p->pw_name ? p->pw_name : "???");
   pw->passwd_string = strdup("");
 
@@ -259,6 +292,13 @@
   if (!pw->date_font) pw->date_font = XLoadQueryFont (si->dpy, "fixed");
   if (f) free (f);
 
+  f = get_string_resource("passwd.unameFont", "Dialog.Font");
+  pw->uname_font = XLoadQueryFont (si->dpy, (f ? f : "fixed"));
+  if (!pw->uname_font) pw->uname_font = XLoadQueryFont (si->dpy, "fixed");
+  if (f) free (f);
+
+  pw->show_uname_p = get_boolean_resource("passwd.uname", "Boolean");
+
   pw->foreground = get_pixel_resource ("passwd.foreground",
 				       "Dialog.Foreground",
 				       si->dpy, cmap);
@@ -329,6 +369,16 @@
     if (overall.width > pw->width) pw->width = overall.width;
     pw->height += ascent + descent;
 
+    /* Measure the uname_label. */
+    if ((strlen(pw->uname_label)) && pw->show_uname_p)
+      {
+	XTextExtents (pw->uname_font,
+		      pw->uname_label, strlen(pw->uname_label),
+		      &direction, &ascent, &descent, &overall);
+	if (overall.width > pw->width) pw->width = overall.width;
+	pw->height += ascent + descent;
+      }
+
     /* Measure the body_label. */
     XTextExtents (pw->body_font,
 		  pw->body_label, strlen(pw->body_label),
@@ -552,6 +602,9 @@
                        (pw->shadow_width * 4)))) +
             pw->date_font->ascent + pw->date_font->descent);
 
+  if ((strlen(pw->uname_label)) && pw->show_uname_p)
+    height += (pw->uname_font->ascent + pw->uname_font->descent); /* for uname */
+
   if (pw->login_button_p)
     height += ((pw->button_font->ascent + pw->button_font->descent) * 2 +
                2 * pw->shadow_width);
@@ -579,7 +632,19 @@
   XDrawString (si->dpy, si->passwd_dialog, gc1, x2, y1,
 	       pw->heading_label, strlen(pw->heading_label));
 
-  /* text below top heading
+  /* uname below top heading
+   */
+  if ((strlen(pw->uname_label)) && pw->show_uname_p)
+    {
+      XSetFont (si->dpy, gc1, pw->uname_font->fid);
+      y1 += spacing + pw->uname_font->ascent + pw->uname_font->descent;
+      sw = string_width (pw->uname_font, pw->uname_label);
+      x2 = (x1 + ((x3 - x1 - sw) / 2));
+      XDrawString (si->dpy, si->passwd_dialog, gc1, x2, y1,
+		   pw->uname_label, strlen(pw->uname_label));
+    }
+
+  /* text below uname
    */
   XSetFont (si->dpy, gc1, pw->body_font->fid);
   y1 += spacing + pw->body_font->ascent + pw->body_font->descent;
@@ -994,6 +1059,7 @@
   if (pw->login_label)   free (pw->login_label);
   if (pw->user_string)   free (pw->user_string);
   if (pw->passwd_string) free (pw->passwd_string);
+  if (pw->uname_label)   free (pw->uname_label);
 
   if (pw->heading_font) XFreeFont (si->dpy, pw->heading_font);
   if (pw->body_font)    XFreeFont (si->dpy, pw->body_font);
@@ -1001,6 +1067,7 @@
   if (pw->passwd_font)  XFreeFont (si->dpy, pw->passwd_font);
   if (pw->date_font)    XFreeFont (si->dpy, pw->date_font);
   if (pw->button_font)  XFreeFont (si->dpy, pw->button_font);
+  if (pw->uname_font)   XFreeFont (si->dpy, pw->uname_font);
 
   if (pw->foreground != black && pw->foreground != white)
     XFreeColors (si->dpy, cmap, &pw->foreground, 1, 0L);

xscreensaver-4.23-allow-zero-dpms-timeout-MOREFIX.patch:
 prefs.c |    7 +++++++
 1 files changed, 7 insertions(+)

--- NEW FILE xscreensaver-4.23-allow-zero-dpms-timeout-MOREFIX.patch ---
--- xscreensaver-4.23/driver/prefs.c.dpms	2005-08-25 11:08:04.000000000 +0900
+++ xscreensaver-4.23/driver/prefs.c	2005-10-24 01:29:00.000000000 +0900
@@ -1593,6 +1593,13 @@
       p->dpms_standby > p->dpms_suspend)
     p->dpms_standby = p->dpms_suspend;
 
+  /* These fixes above ignores the case
+     suspend = 0 and standby > off ...
+   */
+  if (p->dpms_off != 0 &&
+      p->dpms_standby > p->dpms_off)
+    p->dpms_standby = p->dpms_off;
+
 
   if (p->dpms_standby == 0 &&	   /* if *all* are 0, then DPMS is disabled */
       p->dpms_suspend == 0 &&

xscreensaver-4.23-default-text.patch:
 configure.in |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE xscreensaver-4.23-default-text.patch ---
--- xscreensaver-4.23/configure.in.default-text	2005-12-02 16:04:54.000000000 +0900
+++ xscreensaver-4.23/configure.in	2005-12-02 16:18:22.000000000 +0900
@@ -3336,8 +3336,8 @@
 case "$with_textfile" in
   /*)
     # absolute path
-    AC_MSG_CHECKING([for image directory $with_textfile])
-    if test -d "$with_textfile" ; then
+    AC_MSG_CHECKING([for default text file $with_textfile])
+    if test -f "$with_textfile" ; then
       AC_MSG_RESULT(yes)
     else
       AC_MSG_RESULT(no)
@@ -3370,7 +3370,7 @@
   ;;
 
   *)
-    echo "error: must be an absolute path: --with-image-directory=$with_textfile_req"
+    echo "error: must be an absolute path: --with-text-file=$with_textfile_req"
     exit 1
   ;;
 esac

xscreensaver-4.23-fix-free-demoGtk.patch:
 demo-Gtk.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE xscreensaver-4.23-fix-free-demoGtk.patch ---
--- xscreensaver-4.23/driver/demo-Gtk.c.free-document	2005-12-21 01:44:46.000000000 +0900
+++ xscreensaver-4.23/driver/demo-Gtk.c	2005-12-21 03:10:56.000000000 +0900
@@ -1038,6 +1038,7 @@
   int list_elt = selected_list_element (s);
   int hack_number;
   char *name, *name2, *cmd, *str;
+  char *oname;
   if (list_elt < 0) return;
   hack_number = s->list_elt_to_hack_number[list_elt];
 
@@ -1046,6 +1047,7 @@
 
   name = strdup (p->screenhacks[hack_number]->command);
   name2 = name;
+  oname = name;
   while (isspace (*name2)) name2++;
   str = name2;
   while (*str && !isspace (*str)) str++;
@@ -1073,7 +1075,7 @@
                       False, 100);
     }
 
-  free (name);
+  free (oname);
 }
 
 

xscreensaver-4.23-fix-inconsistency.patch:
 attraction.man            |    2 +-
 bubbles.man               |    8 ++++++--
 celtic.man                |    2 +-
 cloudlife.man             |    6 +-----
 config/anemotaxis.xml     |    2 +-
 config/atlantis.xml       |    5 ++---
 config/blinkbox.xml       |    2 +-
 config/boing.xml          |    4 ++--
 config/bouncingcow.xml    |    2 +-
 config/cloudlife.xml      |    2 +-
 config/coral.xml          |    2 +-
 config/crystal.xml        |    2 +-
 config/flyingtoasters.xml |    2 +-
 config/glforestfire.xml   |    2 +-
 config/glhanoi.xml        |    2 +-
 config/glsnake.xml        |    2 +-
 config/jigglypuff.xml     |    4 ++--
 config/juggle.xml         |    2 +-
 config/juggler3d.xml      |    2 +-
 config/lightning.xml      |    2 +-
 config/lissie.xml         |    4 ++--
 config/lmorph.xml         |    2 +-
 config/mirrorblob.xml     |    3 +--
 config/mountain.xml       |    2 +-
 config/pinion.xml         |    2 +-
 config/pong.xml           |    2 +-
 config/rd-bomb.xml        |    2 +-
 config/rotzoomer.xml      |    2 +-
 config/sierpinski3d.xml   |    2 +-
 config/spheremonics.xml   |    2 +-
 config/substrate.xml      |    2 +-
 config/tangram.xml        |    2 +-
 config/timetunnel.xml     |    2 +-
 config/whirlwindwarp.xml  |    2 +-
 config/wormhole.xml       |    6 +++---
 config/zoom.xml           |    4 ++--
 coral.man                 |    2 +-
 crystal.man               |    2 +-
 deco.man                  |    1 -
 forest.man                |    2 +-
 glx/antmaze.man           |    5 +----
 glx/atlantis.man          |    4 ++--
 glx/blinkbox.man          |    2 +-
 glx/cubenetic.man         |    2 +-
 glx/glhanoi.man           |    8 +-------
 glx/glknots.man           |    2 +-
 glx/glplanet.man          |   10 +++++++---
 glx/glsnake.man           |   12 ++++++------
 glx/hypertorus.man        |    4 ++--
 glx/jigglypuff.man        |    2 +-
 glx/juggler3d.man         |    2 +-
 glx/mirrorblob.man        |   15 ++++++---------
 glx/pipes.man             |    2 +-
 glx/polytopes.man         |    4 ++--
 glx/pulsar.man            |    4 ++--
 glx/sballs.man            |   10 ----------
 glx/sierpinski3d.man      |    2 +-
 glx/spheremonics.man      |    2 +-
 glx/tangram.man           |    3 ++-
 glx/timetunnel.man        |    4 ++--
 goop.man                  |    6 +++---
 grav.man                  |    4 ++--
 helix.man                 |    8 --------
 hyperball.man             |    8 ++++----
 hypercube.man             |    6 +++---
 ifs.man                   |    3 ---
 interaggregate.man        |   22 +++++++++-------------
 jigsaw.man                |    2 +-
 juggle.man                |    2 +-
 lissie.man                |    4 ++--
 metaballs.man             |    2 +-
 mountain.man              |    2 +-
 munch.man                 |    6 +++---
 penrose.man               |    6 +-----
 pyro.man                  |    4 ++--
 qix.man                   |    2 +-
 rd-bomb.man               |   14 ++++++--------
 rorschach.man             |    6 +-----
 rotzoomer.man             |    6 +++---
 shadebobs.man             |    2 +-
 slidescreen.man           |    2 +-
 slip.man                  |    2 +-
 strange.man               |    2 +-
 substrate.man             |    2 +-
 t3d.man                   |    2 +-
 truchet.man               |    8 ++++----
 vines.man                 |    2 +-
 whirlygig.man             |    4 ++--
 worm.man                  |    2 +-
 wormhole.man              |    4 ++--
 xanalogtv.man             |    6 ------
 xlyap.man                 |   22 ++++++----------------
 92 files changed, 158 insertions(+), 219 deletions(-)

--- NEW FILE xscreensaver-4.23-fix-inconsistency.patch ---
--- xscreensaver-4.23/hacks/config/anemotaxis.xml.tmp	2004-07-13 19:21:19.000000000 +0900
+++ xscreensaver-4.23/hacks/config/anemotaxis.xml	2005-11-07 01:39:53.000000000 +0900
@@ -11,7 +11,7 @@
 
   <number id="distance" type="slider" arg="-distance %"
            _label="Distance" _low-label="Near" _high-label="Far"
-          low="0" high="400" default="40"/>
+          low="10" high="250" default="40"/>
 
   <number id="sources" type="slider" arg="-sources %"
            _label="Sources" _low-label="Few" _high-label="Many"
--- xscreensaver-4.23/hacks/config/atlantis.xml.tmp	2002-07-27 14:34:22.000000000 +0900
+++ xscreensaver-4.23/hacks/config/atlantis.xml	2005-11-07 01:39:53.000000000 +0900
@@ -8,10 +8,9 @@
            _label="Whale Speed" _low-label="Slow" _high-label="Fast"
           low="0" high="1000" default="250"/>
 
-  <number id="sharkspeed" type="slider" arg="-delay %"
+  <number id="sharkspeed" type="slider" arg="-cycles %"
           _label="Shark Speed" _low-label="Slow" _high-label="Fast"
-          low="0" high="500000" default="25000"
-          convert="invert"/>
+          low="0" high="1000" default="100"/>
 
   <number id="sharkproximity" type="slider" arg="-size %"
           _label="Shark Proximity" _low-label="Shy" _high-label="Agressive"
--- xscreensaver-4.23/hacks/config/blinkbox.xml.tmp	2005-03-31 18:06:22.000000000 +0900
+++ xscreensaver-4.23/hacks/config/blinkbox.xml	2005-11-07 01:39:53.000000000 +0900
@@ -9,7 +9,7 @@
           low="0" high="50000" default="30000"/>
 
   <number id="boxsize" type="spinbutton" arg="-boxsize %"
-          _label="Box Size" low="1" high="8" default="1"/>
+          _label="Box Size" low="1" high="8" default="2"/>
 
   <hgroup>
    <boolean id="fade"      _label="Fade"        arg-unset="-no-fade"/>
--- xscreensaver-4.23/hacks/config/boing.xml.tmp	2005-02-20 06:34:21.000000000 +0900
+++ xscreensaver-4.23/hacks/config/boing.xml	2005-11-07 01:39:53.000000000 +0900
@@ -15,9 +15,9 @@
   <vgroup>
    <hgroup>
     <number id="meridians" type="spinbutton" arg="-meridians %"
-            _label="Meridians" low="1" high="90" default="8"/>
+            _label="Meridians" low="1" high="90" default="16"/>
     <number id="parallels" type="spinbutton" arg="-parallels %"
-            _label="Parallels" low="1" high="90" default="16"/>
+            _label="Parallels" low="1" high="90" default="8"/>
    </hgroup>
    <hgroup>
     <boolean id="smoothing" _label="Smoothing" arg-set="-smooth"/>
--- xscreensaver-4.23/hacks/config/bouncingcow.xml.tmp	2004-07-10 13:27:18.000000000 +0900
+++ xscreensaver-4.23/hacks/config/bouncingcow.xml	2005-11-07 01:39:53.000000000 +0900
@@ -10,7 +10,7 @@
 
   <number id="delay" type="slider" arg="-delay %"
           _label="Animation Speed" _low-label="Slow" _high-label="Fast"
-          low="0" high="50000" default="10000"
+          low="0" high="50000" default="30000"
           convert="invert"/>
 
   <number id="count" type="slider" arg="-count %"
--- xscreensaver-4.23/hacks/config/cloudlife.xml.tmp	2005-04-01 11:28:20.000000000 +0900
+++ xscreensaver-4.23/hacks/config/cloudlife.xml	2005-11-07 01:39:53.000000000 +0900
@@ -15,7 +15,7 @@
 
   <number id="density" type="slider" arg="-initial-density %"
           _label="Initial Density" _low-label="Low" _high-label="High"
-          low="1" high="300" default="160"/>
+          low="1" high="99" default="30"/>
 
   <number id="cellsize" type="slider" arg="-cell-size %"
           _label="Cell Size" _low-label="Small" _high-label="Large"
--- xscreensaver-4.23/hacks/config/coral.xml.tmp	2004-04-26 15:46:40.000000000 +0900
+++ xscreensaver-4.23/hacks/config/coral.xml	2005-11-07 01:39:53.000000000 +0900
@@ -20,7 +20,7 @@
 
   <number id="seeds" type="slider" arg="-seeds %"
           _label="Seeds" _low-label="Few" _high-label="Many"
-          low="1" high="100" default="25"/>
+          low="1" high="100" default="20"/>
 
   <_description>
 Simulates coral growth, albeit somewhat slowly.  Written by Frederick Roeber.
--- xscreensaver-4.23/hacks/config/crystal.xml.tmp	2004-04-26 15:46:40.000000000 +0900
+++ xscreensaver-4.23/hacks/config/crystal.xml	2005-11-07 01:39:53.000000000 +0900
@@ -17,7 +17,7 @@
           _label="Horizontal Symmetries" low="-10" high="10" default="-3"/>
 
   <number id="ny" type="spinbutton" arg="-ny %"
-          _label="Vertical Symmetries" low="-10" high="10" default="-2"/>
+          _label="Vertical Symmetries" low="-10" high="10" default="-3"/>
 
   <number id="count" type="spinbutton" arg="-count %"
           _label="Count" low="-5000" high="5000" default="-500"/>
--- xscreensaver-4.23/hacks/config/flyingtoasters.xml.tmp	2003-06-18 16:14:44.000000000 +0900
+++ xscreensaver-4.23/hacks/config/flyingtoasters.xml	2005-11-07 01:39:53.000000000 +0900
@@ -10,7 +10,7 @@
 
   <number id="delay" type="slider" arg="-delay %"
           _label="Animation Speed" _low-label="Slow" _high-label="Fast"
-          low="0" high="50000" default="10000"
+          low="0" high="50000" default="30000"
           convert="invert"/>
 
   <number id="ntoasters" type="slider" arg="-ntoasters %"
--- xscreensaver-4.23/hacks/config/glforestfire.xml.tmp	2004-07-11 05:31:27.000000000 +0900
+++ xscreensaver-4.23/hacks/config/glforestfire.xml	2005-11-07 01:39:53.000000000 +0900
@@ -15,7 +15,7 @@
 
   <number id="trees" type="slider" arg="-trees %"
           _label="Number of trees" _low-label="Desert" _high-label="Forest"
-          low="0" high="15" default="5"/>
+          low="0" high="20" default="5"/>
 
   <select id="render">
     <option id="normal" _label="Normal"/>
--- xscreensaver-4.23/hacks/config/glhanoi.xml.tmp	2005-08-09 16:14:16.000000000 +0900
+++ xscreensaver-4.23/hacks/config/glhanoi.xml	2005-11-11 16:22:50.000000000 +0900
@@ -17,7 +17,7 @@
 
 	<number id="delay" type="slider" arg="-delay %"
 	  _label="Frame Delay (us)" _low-label="Slow" _high-label="Fast"
-          low="0" high="80000" default="40000" convert="invert"/>
+          low="0" high="80000" default="15000" convert="invert"/>
 	
 	<_description>
 Solves the Towers of Hanoi puzzle. Move N disks from one pole to another, one disk at a time, with no disk ever resting on a disk smaller than itself.
--- xscreensaver-4.23/hacks/config/glsnake.xml.tmp	2003-12-15 20:15:51.000000000 +0900
+++ xscreensaver-4.23/hacks/config/glsnake.xml	2005-11-07 01:39:53.000000000 +0900
@@ -18,7 +18,7 @@
 
   <number id="zangvel" type="slider" arg="-zangvel %"
           _label="Z Angular Velocity" _low-label="Slow" _high-label="Fast"
-          low="0.0" high="1.0" default="0.10"/>
+          low="0.0" high="1.0" default="0.14"/>
 
   <number id="packing" type="slider" arg="-explode %"
           _label="Packing" _low-label="Tight" _high-label="Loose"
--- xscreensaver-4.23/hacks/config/jigglypuff.xml.tmp	2005-10-17 06:48:29.000000000 +0900
+++ xscreensaver-4.23/hacks/config/jigglypuff.xml	2005-11-07 01:39:53.000000000 +0900
@@ -19,11 +19,11 @@
 
   <number id="speed" type="slider" arg="-speed %"
           _label="Rotation speed" _low-label="Slow" _high-label="Fast"
-	  low="50" high="1000" default="250"/>
+	  low="50" high="1000" default="500"/>
 
   <number id="spherism" type="slider" arg="-spherism %"
            _label="Sphere strength" _low-label="none" _high-label="strong"
-	   low="0" high="1000" default="200"/>
+	   low="0" high="1000" default="75"/>
 
   <number id="hold" type="slider" arg="-hold %"
            _label="Vertex-vertex force" _low-label="none" _high-label="strong"
--- xscreensaver-4.23/hacks/config/juggle.xml.tmp	2004-12-17 08:49:22.000000000 +0900
+++ xscreensaver-4.23/hacks/config/juggle.xml	2005-11-07 01:39:53.000000000 +0900
@@ -15,7 +15,7 @@
 
   <number id="tail" type="slider" arg="-tail %"
           _label="Trail Length" _low-label="None" _high-label="Long"
-          low="0" high="100" default="0"/>
+          low="0" high="100" default="1"/>
 
   <boolean id="describe" _label="turn on/off pattern descriptions." arg-unset="-no-describe"/>
 
--- xscreensaver-4.23/hacks/config/juggler3d.xml.tmp	2005-10-17 09:00:58.000000000 +0900
+++ xscreensaver-4.23/hacks/config/juggler3d.xml	2005-11-11 16:54:03.000000000 +0900
@@ -13,7 +13,7 @@
 		_low-label="Slow" _high-label="Fast" low="3.0" high="50.0" default="20.0"/>
 
 	<number id="minobjs" type="spinbutton" arg="-minobjs %" _label="Min Objects"
-          low="3" high="35" default="8"/>
+          low="3" high="35" default="3"/>
 
 	<number id="maxobjs" type="spinbutton" arg="-maxobjs %" _label="Max Objects"
           low="3" high="35" default="8"/>		  
--- xscreensaver-4.23/hacks/config/lightning.xml.tmp	2004-04-26 15:46:41.000000000 +0900
+++ xscreensaver-4.23/hacks/config/lightning.xml	2005-11-07 01:39:53.000000000 +0900
@@ -11,7 +11,7 @@
 
   <number id="ncolors" type="slider" arg="-ncolors %"
             _label="Number of Colors" _low-label="Two" _high-label="Many"
-            low="1" high="255" default="200"/>
+            low="1" high="255" default="64"/>
 
   <_description>
 This one draws crackling fractal lightning bolts.  It's simple,
--- xscreensaver-4.23/hacks/config/lissie.xml.tmp	2004-04-26 15:46:41.000000000 +0900
+++ xscreensaver-4.23/hacks/config/lissie.xml	2005-11-07 01:39:53.000000000 +0900
@@ -9,7 +9,7 @@
 
   <number id="cycles" type="slider" arg="-cycles %"
            _label="Timeout" _low-label="Small" _high-label="Large"
-          low="0" high="800000" default="2000"/>
+          low="0" high="80000" default="20000"/>
 
   <number id="delay" type="slider" arg="-delay %"
           _label="Speed" _low-label="Slow" _high-label="Fast"
@@ -18,7 +18,7 @@
 
   <number id="ncolors" type="slider" arg="-ncolors %"
             _label="Number of Colors" _low-label="Two" _high-label="Many"
-            low="1" high="255" default="64"/>
+            low="1" high="255" default="200"/>
 
   <number id="size" type="spinbutton" arg="-size %"
            _label="Size" low="-500" high="500" default="-200"/>
--- xscreensaver-4.23/hacks/config/lmorph.xml.tmp	2005-04-01 11:40:02.000000000 +0900
+++ xscreensaver-4.23/hacks/config/lmorph.xml	2005-11-07 01:39:53.000000000 +0900
@@ -17,7 +17,7 @@
           _label="Interpolation Steps" _low-label="Less" _high-label="More"
           low="100" high="500" default="150"/>
 
-  <number id="thickness" type="slider" arg="-thickness %"
+  <number id="thickness" type="slider" arg="-linewidth %"
           _label="Lines" _low-label="Thin" _high-label="Thick"
           low="1" high="50" default="5"/>
 
--- xscreensaver-4.23/hacks/config/mirrorblob.xml.tmp	2004-04-26 15:46:41.000000000 +0900
+++ xscreensaver-4.23/hacks/config/mirrorblob.xml	2005-11-07 01:39:53.000000000 +0900
@@ -14,7 +14,7 @@
           _low-label="10 Seconds" _high-label="5 Minutes"
           low="10" high="300" default="30"/>
 
-  <number id="fade_speed" type="slider" arg="-fade_speed %"
+  <number id="fade_speed" type="slider" arg="-fade_time %"
           _label="Crossfade Duration:"
           _low-label="None" _high-label="30 Seconds"
           low="0" high="30" default="5"/>
@@ -47,7 +47,6 @@
   <boolean id="walls" _label="Enable Walls"/>
   <boolean id="colour" _label="Enable Colouring" arg-set="-colour"/>
   <boolean id="texture" _label="Enable Reflected Image" arg-unset="-no-texture"/>
-  <boolean id="background" _label="Enable Background Image" arg-unset="-no-bgimage"/>
   <boolean id="offset_texture" _label="Offset Texture Coordinates" arg-set="-offset_texture"/>
   <boolean id="showfps" _label="Show Frames-per-Second" arg-set="-fps"/>
 
--- xscreensaver-4.23/hacks/config/mountain.xml.tmp	2004-04-26 15:46:41.000000000 +0900
+++ xscreensaver-4.23/hacks/config/mountain.xml	2005-11-07 01:39:53.000000000 +0900
@@ -9,7 +9,7 @@
 
   <number id="delay" type="slider" arg="-delay %"
           _label="Speed" _low-label="Slow" _high-label="Fast"
-          low="0" high="20000" default="0"
+          low="0" high="20000" default="1000"
           convert="invert"/>
 
   <number id="ncolors" type="slider" arg="-ncolors %"
--- xscreensaver-4.23/hacks/config/pinion.xml.tmp	2004-12-16 21:26:02.000000000 +0900
+++ xscreensaver-4.23/hacks/config/pinion.xml	2005-11-07 01:39:53.000000000 +0900
@@ -18,7 +18,7 @@
 
   <number id="delay" type="slider" arg="-delay %"
           _label="Animation Speed" _low-label="Slow" _high-label="Fast"
-          low="0" high="50000" default="30000"
+          low="0" high="50000" default="15000"
           convert="invert"/>
 
   <number id="max-rpm" type="slider" arg="-max-rpm %"
--- xscreensaver-4.23/hacks/config/pong.xml.tmp	2003-10-29 08:14:39.000000000 +0900
+++ xscreensaver-4.23/hacks/config/pong.xml	2005-11-07 01:39:53.000000000 +0900
@@ -6,7 +6,7 @@
 
   <number id="speed" type="slider" arg="-speed %"
           _label="Speed" _low-label="Slow" _high-label="Fast"
-          low="1" high="20" default="7"/>
+          low="1" high="20" default="6"/>
 
   <number id="percent" type="slider" arg="-percent %"
           _label="Size" _low-label="Thin" _high-label="Thick"
--- xscreensaver-4.23/hacks/config/rd-bomb.xml.tmp	2004-04-26 15:46:41.000000000 +0900
+++ xscreensaver-4.23/hacks/config/rd-bomb.xml	2005-11-07 01:39:53.000000000 +0900
@@ -33,7 +33,7 @@
 
   <!-- #### default is wrong -->
   <number id="radius" type="spinbutton" arg="-radius %"
-          _label="Seed Radius" low="1" high="1000" default="500"/>
+          _label="Seed Radius" low="1" high="60" default="15"/>
 
   <number id="epoch" type="slider" arg="-epoch %"
            _label="Epoch" _low-label="Small" _high-label="Large"
--- xscreensaver-4.23/hacks/config/rotzoomer.xml.tmp	2004-04-26 15:46:41.000000000 +0900
+++ xscreensaver-4.23/hacks/config/rotzoomer.xml	2005-11-07 01:39:53.000000000 +0900
@@ -5,7 +5,7 @@
   <command arg="-root"/>
 
   <number id="delay" type="slider" arg="-delay %"
-          _label="Duration" _low-label="0 Seconds" _high-label="1 Minute"
+          _label="Duration" _low-label="0" _high-label="60"
           low="0" high="60" default="10"/>
 
   <number id="n" type="spinbutton" arg="-n %"
--- xscreensaver-4.23/hacks/config/sierpinski3d.xml.tmp	2004-04-26 15:46:41.000000000 +0900
+++ xscreensaver-4.23/hacks/config/sierpinski3d.xml	2005-11-07 01:39:53.000000000 +0900
@@ -15,7 +15,7 @@
           convert="invert"/>
 
   <number id="depth" type="spinbutton" arg="-depth %"
-          _label="Max Depth" low="1" high="6" default="3"/>
+          _label="Max Depth" low="1" high="6" default="5"/>
 
   <select id="render">
     <option id="wire"  _label="Wireframe" arg-set="-wireframe"/>
--- xscreensaver-4.23/hacks/config/spheremonics.xml.tmp	2004-04-26 15:46:41.000000000 +0900
+++ xscreensaver-4.23/hacks/config/spheremonics.xml	2005-11-07 01:39:53.000000000 +0900
@@ -11,7 +11,7 @@
 
   <number id="duration" type="slider" arg="-duration %"
           _label="Duration" _low-label="Short" _high-label="Long"
-          low="5" high="1000" default="500"/>
+          low="5" high="1000" default="100"/>
 
   <number id="resolution" type="slider" arg="-resolution %"
           _label="Resolution" _low-label="Low" _high-label="High"
--- xscreensaver-4.23/hacks/config/substrate.xml.tmp	2005-01-19 12:57:42.000000000 +0900
+++ xscreensaver-4.23/hacks/config/substrate.xml	2005-11-07 01:39:53.000000000 +0900
@@ -13,7 +13,7 @@
 
   <number id="maxcyc" type="slider" arg="-max-cycles %"
           _label="Duration"  _low-label="Short" _high-label="Long"
-          low="2000" high="25000" default="12000" />
+          low="2000" high="25000" default="10000" />
   
   <number id="sandg" type="slider" arg="-sand-grains %"
           _label="Sandgrains" _low-label="Few" _high-label="Lots"
--- xscreensaver-4.23/hacks/config/tangram.xml.tmp	2005-08-12 12:03:43.000000000 +0900
+++ xscreensaver-4.23/hacks/config/tangram.xml	2005-11-07 01:39:53.000000000 +0900
@@ -6,7 +6,7 @@
 
   <number id="delay" type="slider" arg="-delay %"
           _label="Speed" _low-label="Fast" _high-label="Slow"
-          low="0" high="50000" default="30000"/>
+          low="0" high="50000" default="10000"/>
 
   <number id="viewing_time" type="spinbutton" arg="-viewing_time %"
           _label="Viewing Time" low="0" high="30" default="5" />
--- xscreensaver-4.23/hacks/config/timetunnel.xml.tmp	2005-08-16 04:02:15.000000000 +0900
+++ xscreensaver-4.23/hacks/config/timetunnel.xml	2005-11-07 01:39:53.000000000 +0900
@@ -8,7 +8,7 @@
           _label="Start sequence time" _low-label="0 sec" _high-label="30 sec"
           low="0.00" high="30.00" default="0.00"/>
 
-  <number id="changetime" type="slider" arg="-changetime %"
+  <number id="changetime" type="slider" arg="-end %"
           _label="Color Change Time" _low-label="Short" _high-label="Long"
           low="0.00" high="30.00" default="30.00"/>
 
--- xscreensaver-4.23/hacks/config/whirlwindwarp.xml.tmp	2005-10-17 06:48:48.000000000 +0900
+++ xscreensaver-4.23/hacks/config/whirlwindwarp.xml	2005-11-07 01:39:53.000000000 +0900
@@ -10,7 +10,7 @@
 
   <number id="tails" type="slider" arg="-tails %"
           _label="Trail Size" _low-label="Short" _high-label="Long"
-          low="1" high="200" default="10"/>
+          low="1" high="200" default="8"/>
 
   <_description>
 Floating stars are acted upon by a mixture of simple 2D
--- xscreensaver-4.23/hacks/config/wormhole.xml.tmp	2004-04-26 15:46:41.000000000 +0900
+++ xscreensaver-4.23/hacks/config/wormhole.xml	2005-11-07 01:39:53.000000000 +0900
@@ -6,16 +6,16 @@
 
   <number id="delay" type="slider" arg="-delay %"
           _label="Animation Speed" _low-label="Slow" _high-label="Fast"
-          low="0" high="50000" default="100"
+          low="0" high="50000" default="10000"
           convert="invert"/>
 
   <number id="zspeed" type="slider" arg="-zspeed %"
           _label="Star speed" _low-label="Slow" _high-label="Fast"
-          low="1" high="30" default="15"/>
+          low="1" high="30" default="10"/>
 
   <number id="stars" type="slider" arg="-stars %"
           _label="Stars Created" _low-label="Few" _high-label="Lots"
-          low="1" high="100" default="30"/>
+          low="1" high="100" default="20"/>
 
   <_description>
   Wormhole simulates flying through a colored wormhole in space. 
--- xscreensaver-4.23/hacks/config/zoom.xml.tmp	2004-04-26 15:46:41.000000000 +0900
+++ xscreensaver-4.23/hacks/config/zoom.xml	2005-11-07 01:39:53.000000000 +0900
@@ -27,9 +27,9 @@
 
   <hgroup>
    <number id="lensoffsetx" type="spinbutton" arg="-lensoffsetx %"
-           _label="Lens Offset" low="1" high="100" default="1"/>
+           _label="Lens Offset" low="1" high="100" default="5"/>
    <number id="lensoffsety" type="spinbutton" arg="-lensoffsety %"
-           _label="x" low="1" high="100" default="1"/>
+           _label="x" low="1" high="100" default="5"/>
   </hgroup>
 
   <_description>
--- xscreensaver-4.23/hacks/attraction.man.tmp	2005-06-22 08:39:32.000000000 +0900
+++ xscreensaver-4.23/hacks/attraction.man	2005-11-07 01:39:53.000000000 +0900
@@ -88,7 +88,7 @@
 .TP 8
 .B \-segments integer
 If in \fIlines\fP or \fIpolygons\fP mode, how many sets of line segments
-or polygons should be drawn. Default 100.  This has no effect in \fIballs\fP
+or polygons should be drawn. Default 500.  This has no effect in \fIballs\fP
 mode.  If \fIsegments\fP is 0, then no segments will ever be erased (this
 is only useful in color.)
 .TP 8
--- xscreensaver-4.23/hacks/bubbles.man.tmp	2003-07-23 09:17:37.000000000 +0900
+++ xscreensaver-4.23/hacks/bubbles.man	2005-11-07 01:39:53.000000000 +0900
@@ -16,7 +16,7 @@
 bubbles - frying pan / soft drink simulation
 .SH SYNOPSIS
 .B bubbles
-[\-display \fIhost:display.screen\fP] [\-foreground \fIcolor\fP] [\-background \fIcolor\fP] [\-window] [\-root] [\-mono] [\-install] [\-visual \fIvisual\fP] [\-simple] [\-broken] [\-3D]
+[\-display \fIhost:display.screen\fP] [\-foreground \fIcolor\fP] [\-background \fIcolor\fP] [\-window] [\-root] [\-mono] [\-install] [\-visual \fIvisual\fP] [\-simple] [\-broken] [\-3D] [\-rise|\-drop] [-trails]
 .SH DESCRIPTION
 \fIBubbles\fP sprays lots of little random bubbles all over the window which
 then grow until they reach their maximum size and go pop.  The inspiration
@@ -53,7 +53,7 @@
 .TP 8
 .B \-delay microseconds
 How much of a delay should be introduced between steps of the animation.
-Default 1, or about 1 microsecond.  Actually, this is the delay between each
+Default 800, or about 800 microsecond.  Actually, this is the delay between each
 group of 15 new bubbles since such a delay between each step results in a
 very slow animation rate.
 .TP 8
@@ -81,6 +81,10 @@
 .B \-quiet
 Don't print messages explaining why one or several command line options
 were ignored.  This is disabled by default.
+.TP 8
+.B \-rise | \-drop 
+.TP 8
+.B \-trails
 .SH NOTES
 If you find the pace of things too slow, remember that there is a delay
 even though you specify no \fI\-delay\fP option.  Try using \fI\-nodelay\fP
--- xscreensaver-4.23/hacks/celtic.man.tmp	2005-10-22 12:51:49.000000000 +0900
+++ xscreensaver-4.23/hacks/celtic.man	2005-11-11 16:10:41.000000000 +0900
@@ -2,7 +2,7 @@
 .SH NAME
 celtic - draws celtic cross-stich patterns
 .SH SYNOPSIS
-.B ifs
+.B celtic
 [\-display \fIhost:display.screen\fP]
 [\-visual \fIvisual\fP]
 [\-window]
--- xscreensaver-4.23/hacks/cloudlife.man.tmp	2003-06-01 10:38:28.000000000 +0900
+++ xscreensaver-4.23/hacks/cloudlife.man	2005-11-07 01:39:53.000000000 +0900
@@ -37,12 +37,8 @@
 How many ticks should elapse between cycling colors.  0 to disable
 color cycling.  Default 2.
 .TP 8
-.B \-cycle-colors \fIinteger\fP
-How many ticks should elapse between cycling colors.  0 to use
-just one color. Default 1.
-.TP 8
 .B \-ncolors \fIinteger\fP
-How many colors should be used (if possible).  Default 32.
+How many colors should be used (if possible).  Default 64.
 The colors are chosen randomly.
 .TP 8
 .B \-cell-size \fIinteger\fP
--- xscreensaver-4.23/hacks/coral.man.tmp	2002-05-31 12:22:04.000000000 +0900
+++ xscreensaver-4.23/hacks/coral.man	2005-11-07 01:39:53.000000000 +0900
@@ -35,7 +35,7 @@
 Density.  1 - 90.  Default: 25.
 .TP 8
 .B \-seeds \fInumber\fP
-Seeds.	1 - 100.  Default: 25.
+Seeds.	1 - 100.  Default: 20.
 .SH ENVIRONMENT
 .PP
 .TP 8
--- xscreensaver-4.23/hacks/crystal.man.tmp	2002-05-31 12:22:04.000000000 +0900
+++ xscreensaver-4.23/hacks/crystal.man	2005-11-07 01:39:53.000000000 +0900
@@ -43,7 +43,7 @@
 Horizontal Symmetries.	-10 - 10.  Default: -3.
 .TP 8
 .B \-ny \fInumber\fP
-Vertical Symmetries.  -10 - 10.  Default: -2.
+Vertical Symmetries.  -10 - 10.  Default: -3.
 .TP 8
 .B \-count \fInumber\fP
 Count.	-5000 - 5000.  Default: -500.
--- xscreensaver-4.23/hacks/deco.man.tmp	1998-08-05 03:02:10.000000000 +0900
+++ xscreensaver-4.23/hacks/deco.man	2005-11-07 01:39:53.000000000 +0900
@@ -33,7 +33,6 @@
 .TP 8
 .B \-max\-depth \fIinteger\fP
 How deep to subdivide.  Default 12.
-Default 8.
 .TP 8
 .B \-min-width \fIinteger\fP
 .B \-min-height \fIinteger\fP
--- xscreensaver-4.23/hacks/forest.man.tmp	2001-10-26 07:16:32.000000000 +0900
+++ xscreensaver-4.23/hacks/forest.man	2005-11-07 01:39:53.000000000 +0900
@@ -28,7 +28,7 @@
 or the id number (decimal or hex) of a specific visual.
 .TP 8
 .B \-ncolors \fIinteger\fP
-How many colors should be used (if possible).  Default 100.
+How many colors should be used (if possible).  Default 20.
 
 .SH ENVIRONMENT
 .PP
--- xscreensaver-4.23/hacks/goop.man.tmp	1999-06-01 07:20:34.000000000 +0900
+++ xscreensaver-4.23/hacks/goop.man	2005-11-07 01:39:53.000000000 +0900
@@ -30,12 +30,12 @@
 .B \-count \fIinteger\fP
 How many bubbles to draw per layer.  Default: random.
 .TP 8
-.B \-layers \fIinteger\fP
-How many layers to draw.  Default: random, based on screen depth.
+.B \-planes \fIinteger\fP
+How many planes to draw.  Default: random, based on screen depth.
 .TP 8
 .B \-delay \fImicroseconds\fP
 How much of a delay should be introduced between steps of the animation.
-Default 100000, or about 1/10th second.
+Default 12000, or about 0.012 seconds.
 .TP 8
 .B \-transparent
 If \fI\-layers\fP is greater than 1, then each layer will be drawn in one
--- xscreensaver-4.23/hacks/grav.man.tmp	2001-02-02 17:59:35.000000000 +0900
+++ xscreensaver-4.23/hacks/grav.man	2005-11-07 01:39:53.000000000 +0900
@@ -28,7 +28,7 @@
 or the id number (decimal or hex) of a specific visual.
 .TP 8
 .B \-ncolors \fIinteger\fP
-How many colors should be used (if possible).  Default 200.
+How many colors should be used (if possible).  Default 64.
 The colors are chosen randomly.
 .TP 8
 .B \-count \fIinteger\fP
@@ -36,7 +36,7 @@
 .TP 8
 .B \-decay
 .TP 8
-.B \-no-\decay
+.B \-no\-decay
 Whether orbits should decay.
 
 .TP 8
--- xscreensaver-4.23/hacks/helix.man.tmp	2002-04-30 20:25:17.000000000 +0900
+++ xscreensaver-4.23/hacks/helix.man	2005-11-07 01:39:53.000000000 +0900
@@ -20,14 +20,6 @@
 .B \-mono 
 If on a color display, pretend we're on a monochrome display.
 .TP 8
-.B \-erase\-speed \fIusecs\fP
-This controls the speed at which the screen will be erased. Lower numbers 
-erase faster.
-.TP 8
-.B \-erase\-mode \fIinteger\fP
-This sets the erase mode. Mode \-1 chooses a random mode each time. There
-are currently 6 modes defined (0\-5).
-.TP 8
 .B \-delay \fIseconds\fP
 This sets the number of seconds that the helix will be on the screen.
 .TP 8
--- xscreensaver-4.23/hacks/hyperball.man.tmp	2005-04-01 11:37:01.000000000 +0900
+++ xscreensaver-4.23/hacks/hyperball.man	2005-11-07 01:39:53.000000000 +0900
@@ -43,7 +43,7 @@
 .TP 8
 .B \-delay \fImicroseconds\fP
 How much of a delay should be introduced between steps of the animation.
-Default 100000, or about 1/10th second.
+Default 20000, or about 0.02 seconds.
 .TP 8
 .B \-xw \fIfloat\fP
 .TP 8
@@ -57,9 +57,9 @@
 .TP 8
 .B \-zw \fIfloat\fP
 The amount that the ball should be rotated around the specified axis at
-each frame of the animation, expressed in radians.  These should be small
-floating-point values (less than 0.05 works best.)  Default: xy=0.01,
-xz=0.005, yw=0.01.
+each frame of the animation, expressed in 0.001 radians.  These should be small
+floating-point values (less than 50 works best.)  Default: xy=3,
+xz=5, yw=10.
 .SH ENVIRONMENT
 .PP
 .TP 8
--- xscreensaver-4.23/hacks/hypercube.man.tmp	1998-08-05 03:02:13.000000000 +0900
+++ xscreensaver-4.23/hacks/hypercube.man	2005-11-07 01:39:53.000000000 +0900
@@ -66,9 +66,9 @@
 .TP 8
 .B \-zw \fIfloat\fP
 The amount that the cube should be rotated around the specified axis at
-each frame of the animation, expressed in radians.  These should be small
-floating-point values (less than 0.05 works best.)  Default: xy=0.01,
-xz=0.005, yw=0.01.
+each frame of the animation, expressed in 0.001 radians.  These should be small
+floating-point values (less than 50 works best.)  Default: xy=3,
+xz=5, yw=10.
 .SH ENVIRONMENT
 .PP
 .TP 8
--- xscreensaver-4.23/hacks/ifs.man.tmp	2005-11-07 01:39:53.000000000 +0900
+++ xscreensaver-4.23/hacks/ifs.man	2005-11-07 01:39:53.000000000 +0900
@@ -40,9 +40,6 @@
 .TP 8
 .B \-functions \fInumber\fP
 Number of functions to be iterated. Default: 3
-.TP 8
-.B \-ncolors \fInumber\fP
-Number of colors.  Default: 20.
 .SH ENVIRONMENT
 .PP
 .TP 8
--- xscreensaver-4.23/hacks/interaggregate.man.tmp	2005-06-22 11:15:29.000000000 +0900
+++ xscreensaver-4.23/hacks/interaggregate.man	2005-11-07 01:39:53.000000000 +0900
@@ -7,10 +7,13 @@
 [\-display \fIhost:display.screen\fP]
 [\-foreground \fIcolor\fP]
 [\-background \fIcolor\fP]
-[\-num\-discs \fIdisc count\fP]
-[\-draw\-delay \fIdelayms\fP]
-[\-max\-riders \fImaxr\fP]
-[\-max\-radius \fImaxradius\fP]
+[\-num\-circles \fIdisc count\fP]
+[\-growth\-delay \fIdelayms\fP]
+[\-max\-cycles \fImaxr\fP]
+[\-percent\-orbits \fIpercent\fP]
+[\-base\-orbits \fIpercent\fP]
+[\-base\-on\-center]
+[\-draw\-centers]
 .SH DESCRIPTION
 The Intersection Aggregate is a fun visualization defining the relationships 
 between objects with Casey Reas, William Ngan, and Robert Hodgin. Commissioned 
@@ -28,21 +31,14 @@
 .I interaggregate
 accepts the following options:
 .TP 8
-.B \-num\-discs \fIdisc count\fP (Default: \fI85\fP)
+.B \-num\-circles \fIdisc count\fP (Default: \fI100\fP)
 Number of slowly moving and growing discs to use.  The more discs, 
 the more CPU power.
 .TP 8
-.B \-draw\-delay \fIdelayms\fP (Default: \fI30000\fP)
+.B \-growth\-delay \fIdelayms\fP (Default: \fI18000\fP)
 Delay in ms between drawing cycles.  More delay, slower (but smoother 
 and less CPU intensive.)
 art.
-.TP 8
-.B \-max\-riders \fImaxrider\fP (Default: \fI40\fP)
-Maximum number of 'riders', single dots moving around the edge of the discs.
-.TP 8
-.B \-max\-radius \fImaxradius\fP (Default: \fI100\fP)
-Maximum possible radius of a disc.
-.TP 8
 .SH ENVIRONMENT
 .PP
 .TP 8
--- xscreensaver-4.23/hacks/jigsaw.man.tmp	2001-04-15 09:24:19.000000000 +0900
+++ xscreensaver-4.23/hacks/jigsaw.man	2005-11-07 01:39:53.000000000 +0900
@@ -35,7 +35,7 @@
 or the id number (decimal or hex) of a specific visual.
 .TP 8
 .B \-delay \fImicroseconds\fP
-How long to wait between shuffling pieces; default 700000, or 0.7 seconds.
+How long to wait between shuffling pieces; default 70000, or 0.07 seconds.
 .SH ENVIRONMENT
 .PP
 .TP 8
--- xscreensaver-4.23/hacks/juggle.man.tmp	2004-12-17 08:49:22.000000000 +0900
+++ xscreensaver-4.23/hacks/juggle.man	2005-11-07 01:39:53.000000000 +0900
@@ -111,7 +111,7 @@
 list in the source code.
 .TP
 .BI \-tail\  number
-Minimum Trail Length.  0 \- 100.  Default: 0.  Objects may override
+Minimum Trail Length.  0 \- 100.  Default: 1.  Objects may override
 this, for example flaming torches always leave a trail.
 .TP
 .BR \-real\  |\  \-no\-real
--- xscreensaver-4.23/hacks/lissie.man.tmp	2002-05-31 12:22:05.000000000 +0900
+++ xscreensaver-4.23/hacks/lissie.man	2005-11-07 01:39:53.000000000 +0900
@@ -31,13 +31,13 @@
 Count.	0 - 20.  Default: 1.
 .TP 8
 .B \-cycles \fInumber\fP
-Timeout.  0 - 800000.  Default: 2000.
+Timeout. Default: 20000.
 .TP 8
 .B \-delay \fInumber\fP
 Per-frame delay, in microseconds.  Default: 10000 (0.01 seconds.).
 .TP 8
 .B \-ncolors \fInumber\fP
-Number of Colors.  Default: 64.
+Number of Colors.  Default: 200.
 .TP 8
 .B \-size \fInumber\fP
 Size.  -500 to +500.  Default: -200.
--- xscreensaver-4.23/hacks/metaballs.man.tmp	2003-02-02 20:45:54.000000000 +0900
+++ xscreensaver-4.23/hacks/metaballs.man	2005-11-07 01:39:53.000000000 +0900
@@ -35,7 +35,7 @@
 Number of MetaBalls.	2 - 255.  Default: 10.
 .TP 8
 .B \-delay \fInumber\fP
-Per-frame delay, in microseconds.  Default: 5000 (0.01 seconds.).
+Per-frame delay, in microseconds.  Default: 5000 (0.005 seconds.).
 .TP 8
 .B \-cycles \fInumber\fP
 Duration.  100 - 3000.  Default: 1000.
--- xscreensaver-4.23/hacks/mountain.man.tmp	2002-05-31 12:22:05.000000000 +0900
+++ xscreensaver-4.23/hacks/mountain.man	2005-11-07 01:39:53.000000000 +0900
@@ -28,7 +28,7 @@
 Count.	0 - 100.  Default: 30.
 .TP 8
 .B \-delay \fInumber\fP
-Per-frame delay, in microseconds.  Default: 0 (0.00 seconds.).
+Per-frame delay, in microseconds.  Default: 1000 (0.001 seconds.).
 .TP 8
 .B \-ncolors \fInumber\fP
 Number of colors.  Default: 64.
--- xscreensaver-4.23/hacks/munch.man.tmp	2005-06-22 08:39:32.000000000 +0900
+++ xscreensaver-4.23/hacks/munch.man	2005-11-07 01:39:53.000000000 +0900
@@ -18,7 +18,7 @@
 .B munch
 [\-display \fIhost:display.screen\fP] [\-foreground \fIcolor\fP]
 [\-background \fIcolor\fP] [\-window] [\-root] [\-mono] [\-install]
-[\-visual \fIvisual\fP] [\-delay \fIseconds\fP] [\-xor] [\-noxor] [\-shift]
+[\-visual \fIvisual\fP] [\-delay \fImicroseconds\fP] [\-xor] [\-noxor] [\-shift]
 [\-noshift] [\-logminwidth \fIminimum width\fP]
 .SH DESCRIPTION
 The
@@ -51,8 +51,8 @@
 Specify which visual to use.  Legal values are the name of a visual class,
 or the id number (decimal or hex) of a specific visual.
 .TP 8
-.B \-delay \fIseconds\fP
-How long to wait before starting over.  Default 5 seconds.
+.B \-delay \fImicroseconds\fP
+How long to wait before starting over.  Default 5000.
 .TP 8
 .B \-xor
 Use the XOR drawing function.  (Default.)
--- xscreensaver-4.23/hacks/penrose.man.tmp	2002-07-27 14:34:22.000000000 +0900
+++ xscreensaver-4.23/hacks/penrose.man	2005-11-07 01:39:53.000000000 +0900
@@ -3,7 +3,7 @@
 penrose - draws quasiperiodic tilings
 .SH SYNOPSIS
 .B penrose
-[\-display \fIhost:display.screen\fP] [\-foreground \fIcolor\fP] [\-background \fIcolor\fP] [\-window] [\-root] [\-mono] [\-install] [\-visual \fIvisual\fP] [\-ncolors \fIinteger\fP] [\-delay \fImicroseconds\fP] [\-redoDelay \fIseconds\fP] [\-size \fIinteger\fP] [\-ammann] [\-no\-ammann]
+[\-display \fIhost:display.screen\fP] [\-foreground \fIcolor\fP] [\-background \fIcolor\fP] [\-window] [\-root] [\-mono] [\-install] [\-visual \fIvisual\fP] [\-ncolors \fIinteger\fP] [\-delay \fImicroseconds\fP] [\-size \fIinteger\fP] [\-ammann] [\-no\-ammann]
 
 .SH DESCRIPTION
 The \fIpenrose\fP program draws quasiperiodic tilings.
@@ -69,10 +69,6 @@
 tile.  Default 10,000 or .01 seconds.
 
 .TP 8
-.B \-redoDelay \fIseconds\fP
-How long to wait between starting a completely new tiling.  Default 3 seconds.
-
-.TP 8
 .B \-ammann
 .TP 8
 .B \-no\-ammann
--- xscreensaver-4.23/hacks/pyro.man.tmp	1998-08-05 03:02:17.000000000 +0900
+++ xscreensaver-4.23/hacks/pyro.man	2005-11-07 01:39:53.000000000 +0900
@@ -28,13 +28,13 @@
 or the id number (decimal or hex) of a specific visual.
 .TP 8
 .B \-count \fIinteger\fP
-How many particles should be allowed on the screen at once.  Default 100.
+How many particles should be allowed on the screen at once.  Default 600.
 .TP 8
 .B \-frequency \fIinteger\fP
 How often new missiles should launch.  Default 30.
 .TP 8
 .B \-scatter \fIinteger\fP
-How many particles should appear when a missile explodes.  Default 20.
+How many particles should appear when a missile explodes.  Default 100.
 The actual number used is between \fIN\fP and \fIN+(N/2)\fP.
 .SH ENVIRONMENT
 .PP
--- xscreensaver-4.23/hacks/qix.man.tmp	2005-06-22 08:39:32.000000000 +0900
+++ xscreensaver-4.23/hacks/qix.man	2005-11-07 01:39:53.000000000 +0900
@@ -49,7 +49,7 @@
 .TP 8
 .B \-delay \fImicroseconds\fP
 How much of a delay should be introduced between steps of the animation.
-Default 25000, or about 0.025 seconds.
+Default 10000, or about 0.01 seconds.
 .TP 8
 .B \-random
 The \fIqix\fP will wander around the screen semi-randomly.  This is the
--- xscreensaver-4.23/hacks/rd-bomb.man.tmp	1997-10-08 07:07:49.000000000 +0900
+++ xscreensaver-4.23/hacks/rd-bomb.man	2005-11-07 01:39:53.000000000 +0900
@@ -7,7 +7,7 @@
 [\-background \fIcolor\fP] [\-window] [\-root] [\-install]
 [\-visual \fIvisual\fP] [\-width \fIn\fP] [\-height \fIn\fP]
 [\-reaction \fIn\fP] [\-diffusion \fIn\fP]
-[\-size \fIf\fP] [\-speed \fIf\fP] [\-delay \fIusecs\fP]
+[\-size \fIf\fP] [\-speed \fIf\fP] [\-delay \fImillisecs\fP]
 .SH DESCRIPTION
 
 The \fIrd-bomb\fP program draws reaction/diffusion textures.  The code
@@ -54,24 +54,22 @@
 .TP 8
 .B \-diffusion \fIn\fP
 These are constants in the equations that effect its visual nature.
-Each may be one of 0, 1, or 2.  
+Each may be one of 0, 1, or 2. Default is -1: these constants are
+chosen randomly.
 .TP 8
 .B \-radius \fIn\fP
 Size of the seed.
 .TP 8
-.B \-palette \fIn\fP
-Selects a palette.  Must be between 0 and 80, inclusive.
-.TP 8
 .B \-size \fIf\fP
 What fraction of the window is actively drawn, a floating point number
-between 0 (exclusive) and 1 (inclusive).  Default is 0.66.
+between 0 (exclusive) and 1 (inclusive).  Default is 1.0.
 .TP 8
 .B \-speed \fIf\fP
 When a fraction of the screen is active, the active area moves at this
 rate (a floating point number).  Default is zero.  Suggested value: 1.0.
 .TP 8
-.B \-delay \fIusecs\fP
-How many microseconds to delay between frames; default 1000, or 
+.B \-delay \fImillisecs\fP
+How many milliseconds to delay between frames; default 1, or 
 about 1/1000th of a second.
 .SH ENVIRONMENT
 .PP
--- xscreensaver-4.23/hacks/rorschach.man.tmp	1998-08-05 03:02:18.000000000 +0900
+++ xscreensaver-4.23/hacks/rorschach.man	2005-11-07 01:39:53.000000000 +0900
@@ -3,7 +3,7 @@
 rorschach - simulate ink-blot patterns
 .SH SYNOPSIS
 .B rorschach
-[\-display \fIhost:display.screen\fP] [\-foreground \fIcolor\fP] [\-background \fIcolor\fP] [\-window] [\-root] [\-mono] [\-install] [\-visual \fIvisual\fP] [\-iterations \fIinteger\fP] [\-offset \fIinteger\fP] [\-xsymmetry] [\-ysymmetry] [\-erase\-mode \fIinteger\fP] [\-erase\-speed \fIusecs\fP] [\-delay \fIsecs\fP]
+[\-display \fIhost:display.screen\fP] [\-foreground \fIcolor\fP] [\-background \fIcolor\fP] [\-window] [\-root] [\-mono] [\-install] [\-visual \fIvisual\fP] [\-iterations \fIinteger\fP] [\-offset \fIinteger\fP] [\-xsymmetry] [\-ysymmetry] [\-erase\-speed \fIusecs\fP] [\-delay \fIsecs\fP]
 .SH DESCRIPTION
 The \fIrorschach\fP program draws random patterns reminiscent of the
 psychological test of same name.
@@ -39,10 +39,6 @@
 .B \-ysymmetry
 Whether the images should be vertically symmetrical.  Default false.
 .TP 8
-.B \-erase\-mode \fIinteger\fP
-This sets the erase mode. Mode \-1 chooses a random mode each time. There
-are currently 6 modes defined (0\-5).
-.TP 8
 .B \-erase\-speed \fIusecs\fP
 This controls the speed at which the screen will be erased. (Delay between
 erasing of individual lines.)
--- xscreensaver-4.23/hacks/rotzoomer.man.tmp	2005-06-22 08:39:32.000000000 +0900
+++ xscreensaver-4.23/hacks/rotzoomer.man	2005-11-07 01:39:53.000000000 +0900
@@ -5,7 +5,7 @@
 .B rotzoomer
 [\-display \fIhost:display.screen\fP]
 [\-move | \-no\-move]
-[\-delay \fIusecs\fP]
+[\-delay \fImillisecs\fP]
 [\-n \fIcount\fP]
 [\-shm | \-no\-shm]
 [\-window] [\-root] [\-install] [\-visual \fIvisual\fP]
@@ -39,9 +39,9 @@
 Specify which visual to use.  Legal values are the name of a visual class,
 or the id number (decimal or hex) of a specific visual.
 .TP 8
-.B \-delay \fImicroseconds\fP
+.B \-delay \fImilliseconds\fP
 How much of a delay should be introduced between steps of the animation.
-Default 10000, or about 1/100th second.
+Default 10, or about 1/100th second.
 .TP 8
 .B \-move
 Make the rectangles should wander around the screen.
--- xscreensaver-4.23/hacks/shadebobs.man.tmp	2003-06-29 08:01:43.000000000 +0900
+++ xscreensaver-4.23/hacks/shadebobs.man	2005-11-07 01:39:53.000000000 +0900
@@ -33,7 +33,7 @@
 Count.	0 - 20.  Default: 4.
 .TP 8
 .B \-delay \fInumber\fP
-Per-frame delay, in microseconds.  Default: 5000 (0.01 seconds.).
+Per-frame delay, in microseconds.  Default: 5000 (0.005 seconds.).
 .TP 8
 .B \-cycles \fInumber\fP
 Duration.  0 - 100.  Default: 10.
--- xscreensaver-4.23/hacks/slidescreen.man.tmp	2005-04-01 11:56:23.000000000 +0900
+++ xscreensaver-4.23/hacks/slidescreen.man	2005-11-07 01:39:53.000000000 +0900
@@ -48,7 +48,7 @@
 The size of the grid cells.  Default 70 pixels.
 .TP 8
 .B \-ibw \fIpixels\fP
-The size of the "gutter" between grid cells.  Default 1 pixel.
+The size of the "gutter" between grid cells.  Default 4 pixel.
 .TP 8
 .B \-increment \fIpixels\fP
 How many pixels by which a piece should be moved when sliding to a new 
--- xscreensaver-4.23/hacks/slip.man.tmp	2001-04-15 09:24:19.000000000 +0900
+++ xscreensaver-4.23/hacks/slip.man	2005-11-07 01:39:53.000000000 +0900
@@ -40,7 +40,7 @@
 or the id number (decimal or hex) of a specific visual.
 .TP 8
 .B \-ncolors \fIinteger\fP
-How many colors should be used (if possible).  Default 128.
+How many colors should be used (if possible).  Default 200.
 The colors used cycle through the hue, making N stops around 
 the color wheel.
 .TP 8
--- xscreensaver-4.23/hacks/strange.man.tmp	1998-08-05 03:02:20.000000000 +0900
+++ xscreensaver-4.23/hacks/strange.man	2005-11-07 01:39:53.000000000 +0900
@@ -28,7 +28,7 @@
 or the id number (decimal or hex) of a specific visual.
 .TP 8
 .B \-ncolors \fIinteger\fP
-How many colors should be used (if possible).  Default 64.
+How many colors should be used (if possible).  Default 100.
 The colors are chosen randomly.
 .SH ENVIRONMENT
 .PP
--- xscreensaver-4.23/hacks/substrate.man.tmp	2005-01-19 12:57:42.000000000 +0900
+++ xscreensaver-4.23/hacks/substrate.man	2005-11-07 01:39:53.000000000 +0900
@@ -44,7 +44,7 @@
 Number of sand grains dropped during coloring.  More grains cause 
 a denser colour but use more cpu power.
 .TP 8
-.B \-circle-percent \fIcirclepercent\fP (Default: \fI33\fP)
+.B \-circle-percent \fIcirclepercent\fP (Default: \fI0\fP)
 The percentage of the cracks will be circular.
 .SH ENVIRONMENT
 .PP
--- xscreensaver-4.23/hacks/t3d.man.tmp	2005-06-22 08:39:32.000000000 +0900
+++ xscreensaver-4.23/hacks/t3d.man	2005-11-07 01:39:53.000000000 +0900
@@ -55,7 +55,7 @@
 .I period
 seconds. By default, this value is 10 seconds.
 .TP
-.BI "-wait " "microsec"
+.BI "-delay " "microsec"
 Inserts a wait after drawing one view of the clock. By default, t3d waits
 40 ms after each drawing. This helps you to keep the performance loss
 small.
--- xscreensaver-4.23/hacks/truchet.man.tmp	2005-06-22 08:39:32.000000000 +0900
+++ xscreensaver-4.23/hacks/truchet.man	2005-11-07 01:39:53.000000000 +0900
@@ -4,7 +4,7 @@
 .SH SYNOPSIS
 .B truchet
 [\-display \fIhost:display.screen\fP]  [\-foreground \fIcolor\fP] [\-background \fIcolor\fP]
-[\-window] [\-root] [\-mono] [\-install] [\-visual \fIvisual\fP] [\-delay \fImicroseconds\fP]
+[\-window] [\-root] [\-mono] [\-install] [\-visual \fIvisual\fP] [\-delay \fImilliseconds\fP]
 [\-min\-width \fIinteger\fP] [\-min-height \fIinteger\fP] [\-max-width \fIinteger\fP] 
 [\-max-height \fIinteger\fP] [\-max\-linewidth \fIinteger\fP] [\-min-linewidth \fIinteger\fP] 
 [\-erase] [\-no\-erase] [\-erase\-count \fIinteger\fP] [\-square] [\-not\-square] [\-curves]
@@ -34,8 +34,8 @@
 or the id number (decimal or hex) of a specific visual.
 
 .TP 8
-.B \-delay \fImicroseconds\fP
-How long to wait between drawing each screenful. Default is 3 seconds.
+.B \-delay \fImilliseconds\fP
+How long to wait between drawing each screenful. Default is 1 seconds.
 
 .TP 8 
 .B \-min-width \fIinteger\fP
@@ -77,7 +77,7 @@
 
 .TP 8
 .B \-not-square
-Whether to force the tiles to be square. Default is False (not-square).
+Whether to force the tiles to be square. Default is True (square).
 
 .TP 8
 .B \-curves
--- xscreensaver-4.23/hacks/vines.man.tmp	1998-08-05 03:02:21.000000000 +0900
+++ xscreensaver-4.23/hacks/vines.man	2005-11-07 01:39:53.000000000 +0900
@@ -30,7 +30,7 @@
 or the id number (decimal or hex) of a specific visual.
 .TP 8
 .B \-ncolors \fIinteger\fP
-How many colors should be used (if possible).  Default 200.
+How many colors should be used (if possible).  Default 64.
 The colors are chosen randomly.
 .SH ENVIRONMENT
 .PP
--- xscreensaver-4.23/hacks/whirlygig.man.tmp	2005-10-17 07:33:09.000000000 +0900
+++ xscreensaver-4.23/hacks/whirlygig.man	2005-11-07 01:39:53.000000000 +0900
@@ -29,11 +29,11 @@
 .TP 8
 .B \-xspeed \fIspeed\fP
 Specify how fast the dots should cycle horizontally.
-Try out values from .01 to 4000. Random by default.
+Try out values from .01 to 4000. Defaults to 1.0.
 .TP 8
 .B \-yspeed \fIspeed\fP
 Specify how fast the dots should cycle vertically.
-Try out values from .01 to 4000. Random by default.
+Try out values from .01 to 4000. Defaults to 1.0.
 .TP 8
 .B \-xamplitude \fIfactor\fP
 Specify the horizontal amplitude.
--- xscreensaver-4.23/hacks/worm.man.tmp	2002-05-31 12:22:05.000000000 +0900
+++ xscreensaver-4.23/hacks/worm.man	2005-11-07 01:39:53.000000000 +0900
@@ -29,7 +29,7 @@
 Count.	-100 - 100.  Default: -20.
 .TP 8
 .B \-delay \fInumber\fP
-Per-frame delay, in microseconds.  Default: 17000 (0.02 seconds.).
+Per-frame delay, in microseconds.  Default: 17000 (0.017 seconds.).
 .TP 8
 .B \-ncolors \fInumber\fP
 Number of Colors.  Default: 150.
--- xscreensaver-4.23/hacks/wormhole.man.tmp	2004-02-12 10:21:20.000000000 +0900
+++ xscreensaver-4.23/hacks/wormhole.man	2005-11-07 01:39:53.000000000 +0900
@@ -39,8 +39,8 @@
 Speed light streaks fly by.
 .TP 8
 .B \-delay \fImicroseconds\fP
-Number of microseconds to delay between each frame.  Default 50000, meaning
-about 1/20th second.  Compare and contrast with \fI\-speed\fP, above.
+Number of microseconds to delay between each frame.  Default 10000, meaning
+about 1/100th second.  Compare and contrast with \fI\-zspeed\fP, above.
 .SH ENVIRONMENT
 .PP
 .TP 8
--- xscreensaver-4.23/hacks/xanalogtv.man.tmp	2005-11-07 01:39:53.000000000 +0900
+++ xscreensaver-4.23/hacks/xanalogtv.man	2005-11-07 01:39:53.000000000 +0900
@@ -40,12 +40,6 @@
 .B \-visual \fIvisual\fP
 Specify which visual to use.  Legal values are the name of a visual class,
 or the id number (decimal or hex) of a specific visual.
-.TP 8
-.B \-cycle
-Cycle through all the available modes.  This is the default.
-.TP 8
-.B \-no-cycle
-Don't cycle modes.
 .SH ENVIRONMENT
 .PP
 .TP 8
--- xscreensaver-4.23/hacks/xlyap.man.tmp	2005-06-22 08:39:32.000000000 +0900
+++ xscreensaver-4.23/hacks/xlyap.man	2005-11-07 01:39:53.000000000 +0900
@@ -50,10 +50,7 @@
 .TP
 -D \fIn\fP
 Specifies the "dwell" or number of iterations over which to average in order
-to calculate the Lyapunov exponent. Default is 400.
-.TP
--B 
-Causes the stop, go, spin and quit buttons to be displayed.
+to calculate the Lyapunov exponent. Default is 50.
 .TP
 -H \fIn\fP
 Specifies the height of the window. Default is 256.
@@ -74,18 +71,15 @@
 .TP
 -S \fIn\fP
 Specifies the "settle" or number of iterations prior to the beginning of
-the calculation of the Lyapunov exponent. Default is 200.
-.TP
--W \fIn\fP
-Specifies the width of the window. Default is 256.
+the calculation of the Lyapunov exponent. Default is 50.
 .TP
 -a \fIr\fP
 Specifies the real value to use as the minimum parameter value of the 
-horizontal axis. Default is 3.0 for the logistic map.
+horizontal axis. Default is 2.0 for the logistic map.
 .TP
 -b \fIn\fP
 Specifies the real value to use as the minimum parameter value of the 
-vertical axis. Default is 3.0 for the logistic map.
+vertical axis. Default is 2.0 for the logistic map.
 .TP
 -c \fIn\fP
 Selects one of six different color wheels to use. The default color
@@ -106,7 +100,7 @@
 parameter values vary. The default is 1.0.
 .TP
 -i \fIr\fP
-Specifies the real value of the initial condition to use. Default is 0.05.
+Specifies the real value of the initial condition to use. Default is 0.65.
 .TP
 -m \fIn\fP
 Selects between available non-linear maps of the unit interval. A value of
@@ -130,26 +124,17 @@
 during runtime by pressing the 'p' key.
 .TP
 -r \fIn\fP
-Specifies the maximum rgb value to be used. Default is 35000.
+Specifies the maximum rgb value to be used. Default is 65000.
 .TP
 -s \fIn\fP
 Specifies the length of the color wheel spin.
 .TP
--u
-Produces a usage message.
-.TP
 -v 
 Prints out the various values to be used and exits.
 .TP
 -w \fIr\fP
 Specifies the real value to be used as the range over which the horizontal
 parameter values vary. The default is 1.0.
-.TP
--x \fIn\fP
-Specifies the x screen coordinate of the window (default is 256).
-.TP
--y \fIn\fP
-Specifies the y screen coordinate of the window (default is 256).
 .sp 2
 .SH NOTES
 .sp
--- xscreensaver-4.23/hacks/glx/antmaze.man.tmp	2005-05-09 20:14:02.000000000 +0900
+++ xscreensaver-4.23/hacks/glx/antmaze.man	2005-11-07 01:39:53.000000000 +0900
@@ -2,7 +2,7 @@
 .SH NAME
 antmaze \- ant maze walker
 .SH SYNOPSIS
-.B antinspect
+.B antmaze
 [\-display \fIhost:display.screen\fP] [\-window] [\-root] [\-install]
 [\-visual \fIvisual\fP] [\-delay \fImicroseconds\fP] [\-fps]
 .SH DESCRIPTION
@@ -20,9 +20,6 @@
 .B \-install
 Install a private colormap for the window.
 .TP 8
-.B \-shadows
-Draw shadows on ground
-.TP 8
 .B \-visual \fIvisual\fP\fP
 Specify which visual to use.  Legal values are the name of a visual class,
 or the id number (decimal or hex) of a specific visual.
--- xscreensaver-4.23/hacks/glx/atlantis.man.tmp	2002-05-31 11:33:14.000000000 +0900
+++ xscreensaver-4.23/hacks/glx/atlantis.man	2005-11-07 01:39:53.000000000 +0900
@@ -33,8 +33,8 @@
 .B \-whalespeed \fInumber\fP
 Whale Speed.  0 - 1000.  Default: 250.
 .TP 8
-.B \-delay \fInumber\fP
-Shark Speed.  0 - 500.	Default: 100.
+.B \-cycles \fInumber\fP
+Shark Speed.  Default: 100.
 .TP 8
 .B \-size \fInumber\fP
 Shark Proximity.  100 - 10000.	Default: 6000.
--- xscreensaver-4.23/hacks/glx/blinkbox.man.tmp	2005-03-31 18:06:22.000000000 +0900
+++ xscreensaver-4.23/hacks/glx/blinkbox.man	2005-11-07 01:39:53.000000000 +0900
@@ -35,7 +35,7 @@
 Render in wireframe instead of solid.
 .TP 8
 .B \-boxsize 
-Sets the size of the colored boxes. Should be between 1 and 4. Default: 1 
+Sets the size of the colored boxes. Should be between 1 and 8. Default: 2 
 .TP 8
 .B \-dissolve | \-no-dissolve
 Boxes shrink instead of just vanishing.
--- xscreensaver-4.23/hacks/glx/cubenetic.man.tmp	2002-05-31 11:33:14.000000000 +0900
+++ xscreensaver-4.23/hacks/glx/cubenetic.man	2005-11-07 01:39:53.000000000 +0900
@@ -34,7 +34,7 @@
 Draw on the root window.
 .TP 8
 .B \-delay \fInumber\fP
-Per-frame delay, in microseconds.  Default: 30000 (0.03 seconds.).
+Per-frame delay, in microseconds.  Default: 20000 (0.02 seconds.).
 .TP 8
 .B \-count \fInumber\fP
 How many boxes make up the object.  Default: 5.
--- xscreensaver-4.23/hacks/glx/glhanoi.man.tmp	2005-08-25 12:54:11.000000000 +0900
+++ xscreensaver-4.23/hacks/glx/glhanoi.man	2005-11-11 16:21:50.000000000 +0900
@@ -31,13 +31,7 @@
 Draw on the root window.
 .TP 8
 .B \-delay \fInumber\fP
-Per-frame delay, in microseconds.  Default: 30000 (0.03 seconds.).
-.TP 8
-.B \-speed \fInumber\fP
-Speed of disk animation. Default: 12.0 er, units per second. Let's call them metres.
-.TP 8
-.B \-rotspeed \fInumber\fP
-Speed of disk animation. Default: 0.1 rads per second.
+Per-frame delay, in microseconds.  Default: 15000 (0.015 seconds.).
 .TP 8
 .B \-count \fInumber\fP
 Number of disks.  Default: 7.
--- xscreensaver-4.23/hacks/glx/glknots.man.tmp	2003-06-20 17:08:13.000000000 +0900
+++ xscreensaver-4.23/hacks/glx/glknots.man	2005-11-07 01:39:53.000000000 +0900
@@ -44,7 +44,7 @@
 How thick the tubes should be.  Default 0.3.
 .TP 8
 .B \-duration \fIseconds\fP
-How long to leave each knot up.  Default 5 seconds.
+How long to leave each knot up.  Default 8 seconds.
 .TP 8
 .B \-wander | \-no-wander
 Whether the cubes should wander around the screen.
--- xscreensaver-4.23/hacks/glx/glplanet.man.tmp	2002-05-31 11:33:14.000000000 +0900
+++ xscreensaver-4.23/hacks/glx/glplanet.man	2005-11-07 01:39:53.000000000 +0900
@@ -9,7 +9,8 @@
 [\-root]
 [\-no-light]
 [\-delay \fInumber\fP]
-[\-bitmap \fIfile\fP]
+[\-image \fIfile\fP]
+[\-resolution \fInumber\fP]
 [\-wireframe]
 [\-fps]
 .SH DESCRIPTION
@@ -32,11 +33,14 @@
 Use Flat Coloring.
 .TP 8
 .B \-delay \fInumber\fP
-Per-frame delay, in microseconds.  Default: 15000 (0.01 seconds.).
+Per-frame delay, in microseconds.  Default: 20000 (0.02 seconds.).
 .TP 8
-.B \-bitmap \fIfile\fP
+.B \-images \fIfile\fP
 The texture map to wrap around the planet's surface.
 .TP 8
+.B \-resolution
+The resolution of the planet. Default: 128.
+.TP 8
 .B \-wireframe
 Render in wireframe instead of solid.
 .TP 8
--- xscreensaver-4.23/hacks/glx/glsnake.man.tmp	2005-11-07 01:39:52.000000000 +0900
+++ xscreensaver-4.23/hacks/glx/glsnake.man	2005-11-07 01:39:53.000000000 +0900
@@ -7,11 +7,11 @@
 [\-display \fIhost:display.screen\fP] [\-window] [\-root]
 [\-visual \fIvisual\fP] [\-delay \fImicroseconds\fP] [\-fps]
 [\-wireframe] [\-altcolour]
-[\-velocity \fIangular\fP]
+[\-angvel \fIangular\fP]
 [\-explode \fIdistance\fP]
 [\-statictime \fImilliseconds\fP]
-[\-yspin \fIangle\fP]
-[\-zspin \fIangle\fP]
+[\-yangvel \fIangle\fP]
+[\-zangvel \fIangle\fP]
 .SH DESCRIPTION
 .PP
 .B glsnake
@@ -45,7 +45,7 @@
 Use the alternate colour scheme for the snake.  Shape identification using
 colour will be disabled.
 .TP 8
-.B -velocity \fIangular\fP
+.B -angvel \fIangular\fP
 Change the speed at which the snake morphs to a new shape.
 .TP 8
 .B -explode \fIdistance\fP
@@ -54,10 +54,10 @@
 .B \-statictime \fImilliseconds\fP
 Change the time between morphs.
 .TP 8
-.B \-yspin \fIangle\fP
+.B \-yangvel \fIangle\fP
 Change the angle of rotation around the Y axis per frame.
 .TP 8
-.B \-zspin \fIangle\fP
+.B \-zangvel \fIangle\fP
 Change the angle of rotation around the Z axis per frame.
 .SH ENVIRONMENT
 .PP
--- xscreensaver-4.23/hacks/glx/hypertorus.man.tmp	2005-10-17 08:40:41.000000000 +0900
+++ xscreensaver-4.23/hacks/glx/hypertorus.man	2005-11-07 01:39:53.000000000 +0900
@@ -135,10 +135,10 @@
 in degrees per frame.  The speeds should be set to relatively small
 values, e.g., less than 4 in magnitude.
 .TP 8
-.B \-speed-xw \fIfloat\fP
+.B \-speed-wx \fIfloat\fP
 Rotation speed around the wx plane (default: 1.1).
 .TP 8
-.B \-speed-xy \fIfloat\fP
+.B \-speed-wy \fIfloat\fP
 Rotation speed around the wy plane (default: 1.3).
 .TP 8
 .B \-speed-wz \fIfloat\fP
--- xscreensaver-4.23/hacks/glx/jigglypuff.man.tmp	2003-05-17 13:56:38.000000000 +0900
+++ xscreensaver-4.23/hacks/glx/jigglypuff.man	2005-11-07 01:39:53.000000000 +0900
@@ -90,7 +90,7 @@
 would end up with a stable tetrahedron. The 'damping' option can help to
 keep the blob from collapsing or flying apart. The option specifies the
 speed at which damping starts, hence lower values mean more damping.
-Defaults: spherism: 200; hold: 800; distance: 100; damping: 500.
+Defaults: spherism: 75; hold: 800; distance: 100; damping: 500.
 .TP 8
 .B -random
 Probably the only parameter you'l ever need. Overrides almost all of the
--- xscreensaver-4.23/hacks/glx/juggler3d.man.tmp	2005-10-17 09:00:58.000000000 +0900
+++ xscreensaver-4.23/hacks/glx/juggler3d.man	2005-11-11 16:55:01.000000000 +0900
@@ -57,7 +57,7 @@
 Used to determine maximum throw weight in random siteswap.  Options refer to
 minimum height increment and maximum height increment.  Maximum weight chosen
 will lie between \fBmaxobj\fP + \fBminhinc\fP and \fBmaxobj\fP + \fBmaxhinc\fP.
-Defaults: \fBminhinc\fP=1 and \fBmaxhinc\fP=6.
+Defaults: \fBminhinc\fP=2 and \fBmaxhinc\fP=6.
 .TP 8
 .B \-wireframe | \-no-wireframe
 Render in wireframe instead of solid.
--- xscreensaver-4.23/hacks/glx/mirrorblob.man.tmp	2003-10-23 07:04:31.000000000 +0900
+++ xscreensaver-4.23/hacks/glx/mirrorblob.man	2005-11-07 01:39:53.000000000 +0900
@@ -13,14 +13,14 @@
 [\-walls]
 [\-colour]
 [\-texture]
-[\-bgimage]
 [\-offset_texture]
 [\-blend]
 [\-antialias]
 [\-x_res \fInumber\fP]
 [\-y_res \fInumber\fP]
 [\-field_points \fInumber\fP]
-[\-hold_frames \fInumber\fP]
+[\-fade_time \fInumber\fP]
+[\-hold_time \fInumber\fP]
 [\-fps]
 .SH DESCRIPTION
 Draws a wobbling blob, making use of alpha blending, fog,
@@ -55,9 +55,6 @@
 .B \-texture | \-no-texture
 Whether to wrap a texture image on the blob.
 .TP 8
-.B \-bgimage | \-no-bgimage
-Whether to also draw the texture on the background.
-.TP 8
 .B \-offset_texture | \-no-offset_texture
 Whether to ofset the texture calculations to only use a region of the image
  under the blob.  This works well when blend is enabled.
@@ -79,11 +76,11 @@
 .B \-field_points \fInumber\fP
 Number of points used to distort the blob.
 .TP 8
-.B \-hold_frames \fInumber\fP
-Number of frames between changing images.
+.B \-hold_time \fInumber\fP
+Time until loading a new image.
 .TP 8
-.B \-fade_speed \fInumber\fP
-Speed at which fading occurs when changing images.
+.B \-fade_time \fInumber\fP
+Crossfade duration time.
 .TP 8
 .B \-fps | \-no-fps
 Whether to show a frames-per-second display at the bottom of the screen.
--- xscreensaver-4.23/hacks/glx/pipes.man.tmp	2002-05-31 11:33:14.000000000 +0900
+++ xscreensaver-4.23/hacks/glx/pipes.man	2005-11-07 01:39:53.000000000 +0900
@@ -48,7 +48,7 @@
 How much gadgetry to create; Useful range is 0-10.  Default: 2.
 .TP 8
 .B \-delay \fInumber\fP
-How long (in microseconds) to sleep between frames.  Default: 100.
+How long (in microseconds) to sleep between frames.  Default: 10000.
 .TP 8
 .B \-fisheye | \-no-fisheye
 Whether to use a fisheye lens.
--- xscreensaver-4.23/hacks/glx/polytopes.man.tmp	2005-10-17 08:40:41.000000000 +0900
+++ xscreensaver-4.23/hacks/glx/polytopes.man	2005-11-07 01:39:53.000000000 +0900
@@ -154,10 +154,10 @@
 in degrees per frame.  The speeds should be set to relatively small
 values, e.g., less than 4 in magnitude.
 .TP 8
-.B \-speed-xw \fIfloat\fP
+.B \-speed-wx \fIfloat\fP
 Rotation speed around the wx plane (default: 1.1).
 .TP 8
-.B \-speed-xy \fIfloat\fP
+.B \-speed-wy \fIfloat\fP
 Rotation speed around the wy plane (default: 1.3).
 .TP 8
 .B \-speed-wz \fIfloat\fP
--- xscreensaver-4.23/hacks/glx/pulsar.man.tmp	2002-05-31 11:33:14.000000000 +0900
+++ xscreensaver-4.23/hacks/glx/pulsar.man	2005-11-07 01:39:53.000000000 +0900
@@ -11,7 +11,7 @@
 [\-wire]
 [\-delay \fInumber\fP]
 [\-quads \fInumber\fP]
-[\-bitmap \fIfile\fP]
+[\-image \fIfile\fP]
 [\-light]
 [\-fog]
 [\-texture]
@@ -46,7 +46,7 @@
 .B \-delay \fInumber\fP
 Per-frame delay, in microseconds.  Default: 10000 (0.01 seconds.).
 .TP 8
-.B \-bitmap \fIfile\fP
+.B \-image \fIfile\fP
 The texture map to use.
 .TP 8
 .B \-quads \fInumber\fP
--- xscreensaver-4.23/hacks/glx/sballs.man.tmp	2004-07-11 05:31:27.000000000 +0900
+++ xscreensaver-4.23/hacks/glx/sballs.man	2005-11-07 01:39:53.000000000 +0900
@@ -19,7 +19,6 @@
 [\-display \fIhost:display.screen\fP] [\-window] [\-root]
 [\-visual \fIvisual\fP] [\-delay \fImicroseconds\fP]
 [\-object \fIobject_number\fP] 
-[\-count \fInumber_of_spheres\fP] 
 [\-cycles \fIsphere_speed\fP] 
 [\-size \fIviewport_size\fP] 
 [\-texture] [\-no-texture]
@@ -78,18 +77,9 @@
 .B 8 
 star
 .TP 8
-.B \-count \fInumber_of_spheres\fP\fP
-Specify how much spheres are drawn in the selected object. 
-.TP 8
 .B \-size \fIviewport_size\fP\fP
 Viewport of GL scene is specified size if greater than 32 and less than screensize. Default value is 0, meaning full screensize.
 .TP 8
-.B \-count \fInumber_of_particles\fP\fP
-Specify how much fire particles are drawn. A very special case is 0
-wich means that you get
-.B rain
-!
-.TP 8
 .B \-texture
 Show a textured background and spheres. This is the default.
 .TP 8
--- xscreensaver-4.23/hacks/glx/sierpinski3d.man.tmp	2002-05-31 11:33:14.000000000 +0900
+++ xscreensaver-4.23/hacks/glx/sierpinski3d.man	2005-11-07 01:39:53.000000000 +0900
@@ -34,7 +34,7 @@
 Number of frames before changing shape.  Default: 150.
 .TP 8
 .B \-depth \fInumber\fP
-Max depth to descend.  Default: 3.  You probably don't have enough
+Max depth to descend.  Default: 5.  You probably don't have enough
 memory for 6.
 .TP 8
 .B \-wireframe
--- xscreensaver-4.23/hacks/glx/spheremonics.man.tmp	2002-05-31 11:33:14.000000000 +0900
+++ xscreensaver-4.23/hacks/glx/spheremonics.man	2005-11-07 01:39:53.000000000 +0900
@@ -39,7 +39,7 @@
 Per-frame delay, in microseconds.  Default: 30000 (0.03 seconds.).
 .TP 8
 .B \-duration \fInumber\fP
-Duration.  5 - 1000.  Default: 500.
+Duration.  5 - 1000.  Default: 100.
 .TP 8
 .B \-resolution \fInumber\fP
 Resolution.  5 - 100.  Default: 64.
--- xscreensaver-4.23/hacks/glx/tangram.man.tmp	2005-07-14 10:49:52.000000000 +0900
+++ xscreensaver-4.23/hacks/glx/tangram.man	2005-11-07 01:39:53.000000000 +0900
@@ -28,13 +28,14 @@
 Draw on the root window.
 .TP 8
 .B \-delay \fInumber\fP
-Per-frame delay, in microseconds.  Default: 30000 (0.03 seconds.).
+Per-frame delay, in microseconds.  Default: 10000 (0.01 seconds.).
 .TP 8
 .B \-wireframe | \-no-wireframe
 Render in wireframe instead of solid.
 .TP 8
 .B \-viewing_time \fInumber\fP 
 Specify the length of time, in seconds, that the finished puzzle
+should be displayed. Default: 5
 .TP 8
 .B \-rotate | \-no-rotate
 Rotate the camera around the puzzle.
--- xscreensaver-4.23/hacks/glx/timetunnel.man.tmp	2005-08-16 04:02:55.000000000 +0900
+++ xscreensaver-4.23/hacks/glx/timetunnel.man	2005-11-07 01:39:53.000000000 +0900
@@ -9,7 +9,7 @@
 [\-root]
 [\-start \fInumber\fP]
 [\-end \fInumber\fP]
-[\-dialate \fInumber\fP]
+[\-dilate \fInumber\fP]
 [\-tunonly]
 [\-reverse]
 [\-fog]
@@ -37,7 +37,7 @@
 .B \-end \fInumber\fP
 End time of loop, 0.0 - 30.00. Default 27.79.  May be identical to start time.
 .TP 8
-.B \-dialate \fInumber\fP
+.B \-dilate \fInumber\fP
 Scale time to speed or slow simulation.  Numbers less than one slow it down.
 .TP 8
 .B \-tunonly

xscreensaver-4.23-manfile-entry-fix.patch:
 driver/Makefile.in           |    1 +
 driver/xscreensaver-text.man |   10 +++++-----
 hacks/Makefile.in            |    1 +
 hacks/apple2.man             |   10 +++++-----
 hacks/drift.man              |    2 +-
 hacks/fontglide.man          |   10 +++++-----
 hacks/glx/Makefile.in        |    1 +
 hacks/glx/boing.man          |    4 ++--
 hacks/glx/carousel.man       |    2 +-
 hacks/glx/fliptext.man       |   10 +++++-----
 hacks/glx/glmatrix.man       |    4 ++--
 hacks/glx/glslideshow.man    |    2 +-
 hacks/glx/glsnake.man        |    2 +-
 hacks/glx/pinion.man         |    2 +-
 hacks/glx/starwars.man       |   10 +++++-----
 hacks/ifs.man                |    2 +-
 hacks/kaleidescope.man       |    2 +-
 hacks/ljlatest.man           |   10 +++++-----
 hacks/mismunch.man           |    2 +-
 hacks/phosphor.man           |   10 +++++-----
 hacks/pong.man               |    4 ++--
 hacks/webcollage.man         |    2 +-
 hacks/xanalogtv.man          |    6 +++---
 hacks/xmatrix.man            |    4 ++--
 hacks/xteevee.man            |    8 ++++----
 25 files changed, 62 insertions(+), 59 deletions(-)

--- NEW FILE xscreensaver-4.23-manfile-entry-fix.patch ---
--- xscreensaver-4.23/hacks/xmatrix.man.mansuffix-fix	2003-06-13 10:44:34.000000000 +0900
+++ xscreensaver-4.23/hacks/xmatrix.man	2005-10-31 00:49:04.000000000 +0900
@@ -17,7 +17,7 @@
 "The Matrix".  
 
 Also see
-.BR glmatrix (1)
+.BR glmatrix (mansuffix)
 for a 3D rendering of the similar effect that appeared in the title
 sequence of the movie.
 .SH OPTIONS
@@ -96,7 +96,7 @@
 to get the name of a resource file that overrides the global resources
 stored in the RESOURCE_MANAGER property.
 .SH SEE ALSO
-.BR glmatrix (1),
+.BR glmatrix (mansuffix),
 .BR X (1),
 .BR xscreensaver (1)
 .SH COPYRIGHT
--- xscreensaver-4.23/hacks/drift.man.mansuffix-fix	2005-06-22 08:39:32.000000000 +0900
+++ xscreensaver-4.23/hacks/drift.man	2005-10-31 00:49:07.000000000 +0900
@@ -56,7 +56,7 @@
 to get the name of a resource file that overrides the global resources
 stored in the RESOURCE_MANAGER property.
 .SH SEE ALSO
-.BR flame (1),
+.BR flame (mansuffix),
 .BR X (1),
 .BR xscreensaver (1),
 .BR xlock (1)
--- xscreensaver-4.23/hacks/phosphor.man.mansuffix-fix	2005-03-21 08:20:32.000000000 +0900
+++ xscreensaver-4.23/hacks/phosphor.man	2005-10-31 00:49:06.000000000 +0900
@@ -146,12 +146,12 @@
 .BR xscreensaver (1),
 .BR xscreensaver-text (1),
 .BR fortune (1),
-.BR apple2 (1),
-.BR starwars (1),
-.BR fontglide (1),
-.BR ljlatest (1),
+.BR apple2 (mansuffix),
+.BR starwars (mansuffix),
+.BR fontglide (mansuffix),
+.BR ljlatest (mansuffix),
 .BR dadadodo (1),
-.BR webcollage (1),
+.BR webcollage (mansuffix),
 .BR driftnet (1)
 .BR EtherPEG ,
 .BR EtherPeek ,
--- xscreensaver-4.23/hacks/mismunch.man.mansuffix-fix	2004-02-12 10:21:20.000000000 +0900
+++ xscreensaver-4.23/hacks/mismunch.man	2005-10-31 00:49:04.000000000 +0900
@@ -58,7 +58,7 @@
 .SH SEE ALSO
 .BR X (1),
 .BR xscreensaver (1),
-.BR munch (1)
+.BR munch (mansuffix)
 .SH COPYRIGHT
 Copyright \(co 2004 Steven Hazel.  Permission to use, copy, modify,
 distribute, and sell this software and its documentation for any
--- xscreensaver-4.23/hacks/webcollage.man.mansuffix-fix	2005-06-22 08:39:32.000000000 +0900
+++ xscreensaver-4.23/hacks/webcollage.man	2005-10-31 00:49:04.000000000 +0900
@@ -221,7 +221,7 @@
 .BR cjpeg (1),
 .BR xdpyinfo (1),
 .BR perl (1),
-.BR vidwhacker (1),
+.BR vidwhacker (mansuffix),
 .BR dadadodo (1),
 .BR driftnet (1)
 .BR EtherPEG ,
--- xscreensaver-4.23/hacks/Makefile.in.mansuffix-fix	2005-10-31 00:48:48.000000000 +0900
+++ xscreensaver-4.23/hacks/Makefile.in	2005-10-31 00:48:48.000000000 +0900
@@ -346,6 +346,7 @@
 	  TH=".TH $$manbase $(mansuffix) \"$$V\" \"X Version 11\" \"XScreenSaver manual\"" ;	\
           sed -e "s/^\.TH.*/$$TH/"                                      \
               -e 's/^\(\.BR xscr.*(\)[^()]\(.*\)/\1$(mansuffix)\2/'     \
+	      -e 's@(mansuffix)@($(mansuffix))@g' \
             < $(srcdir)/$$man > $$T ;                                   \
 	  echo $(INSTALL_DATA) $(srcdir)/$$man				\
 	   $(install_prefix)$(manNdir)/$$instname ;			\
--- xscreensaver-4.23/hacks/glx/carousel.man.mansuffix-fix	2005-02-23 17:43:19.000000000 +0900
+++ xscreensaver-4.23/hacks/glx/carousel.man	2005-10-31 00:49:06.000000000 +0900
@@ -93,7 +93,7 @@
 .BR xscreensaver-demo (1)
 .BR xscreensaver-getimage (1)
 .BR xscreensaver (1)
-.BR glslideshow (1)
+.BR glslideshow (mansuffix)
 .SH COPYRIGHT
 Copyright \(co 2005 by Jamie Zawinski.
 
--- xscreensaver-4.23/hacks/glx/Makefile.in.mansuffix-fix	2005-10-31 00:48:48.000000000 +0900
+++ xscreensaver-4.23/hacks/glx/Makefile.in	2005-10-31 00:48:48.000000000 +0900
@@ -269,6 +269,7 @@
 	  TH=".TH $$manbase $(mansuffix) \"$$V\" \"X Version 11\" \"XScreenSaver manual\"" ;	\
           sed -e "s/^\.TH.*/$$TH/"                                      \
               -e 's/^\(\.BR xscr.*(\)[^()]\(.*\)/\1$(mansuffix)\2/'     \
+	      -e 's@(mansuffix)@($(mansuffix))@g' \
             < $(srcdir)/$$man > $$T ;                                   \
 	  echo $(INSTALL_DATA) $(srcdir)/$$man				\
 	   $(install_prefix)$(manNdir)/$$instname ;			\
--- xscreensaver-4.23/hacks/glx/pinion.man.mansuffix-fix	2005-04-01 13:00:33.000000000 +0900
+++ xscreensaver-4.23/hacks/glx/pinion.man	2005-10-31 00:49:05.000000000 +0900
@@ -69,7 +69,7 @@
 to get the name of a resource file that overrides the global resources
 stored in the RESOURCE_MANAGER property.
 .SH SEE ALSO
-.BR gears (1),
+.BR gears (mansuffix),
 .BR xscreensaver (1),
 .BR X (1)
 .SH COPYRIGHT
--- xscreensaver-4.23/hacks/glx/glmatrix.man.mansuffix-fix	2005-04-01 13:00:33.000000000 +0900
+++ xscreensaver-4.23/hacks/glx/glmatrix.man	2005-10-31 00:49:05.000000000 +0900
@@ -19,7 +19,7 @@
 "The Matrix".
 
 Also see
-.BR xmatrix (1)
+.BR xmatrix (mansuffix)
 for a 2D rendering of the similar effect that appeared on the
 computer monitors actually \fIin\fP the movie.
 .SH OPTIONS
@@ -85,7 +85,7 @@
 to get the name of a resource file that overrides the global resources
 stored in the RESOURCE_MANAGER property.
 .SH SEE ALSO
-.BR xmatrix (1),
+.BR xmatrix (mansuffix),
 .BR X (1),
 .BR xscreensaver (1)
 .SH COPYRIGHT
--- xscreensaver-4.23/hacks/glx/glsnake.man.mansuffix-fix	2005-03-23 05:25:39.000000000 +0900
+++ xscreensaver-4.23/hacks/glx/glsnake.man	2005-10-31 00:49:05.000000000 +0900
@@ -75,7 +75,7 @@
 .SH SEE ALSO
 .BR X (1),
 .BR xscreensaver (1),
-.BR glsnake (6)
+.BR glsnake (mansuffix)
 .PP
 .EX
 http://spacepants.org/src/glsnake/
--- xscreensaver-4.23/hacks/glx/starwars.man.mansuffix-fix	2005-03-21 13:27:08.000000000 +0900
+++ xscreensaver-4.23/hacks/glx/starwars.man	2005-10-31 00:49:06.000000000 +0900
@@ -161,12 +161,12 @@
 .BR xscreensaver (1),
 .BR xscreensaver-text (1),
 .BR fortune (1),
-.BR phosphor (1),
-.BR apple2 (1),
-.BR fontglide (1),
-.BR ljlatest (1),
+.BR phosphor (mansuffix),
+.BR apple2 (mansuffix),
+.BR fontglide (mansuffix),
+.BR ljlatest (mansuffix),
 .BR dadadodo (1),
-.BR webcollage (1),
+.BR webcollage (mansuffix),
 .BR driftnet (1)
 .BR EtherPEG ,
 .BR EtherPeek
--- xscreensaver-4.23/hacks/glx/boing.man.mansuffix-fix	2005-02-20 06:34:21.000000000 +0900
+++ xscreensaver-4.23/hacks/glx/boing.man	2005-10-31 00:49:05.000000000 +0900
@@ -91,8 +91,8 @@
 to get the name of a resource file that overrides the global resources
 stored in the RESOURCE_MANAGER property.
 .SH SEE ALSO
-.BR bsod (1),
-.BR pong (1),
+.BR bsod (mansuffix),
+.BR pong (mansuffix),
 .BR xscreensaver (1),
 .BR X (1)
 .SH COPYRIGHT
--- xscreensaver-4.23/hacks/glx/glslideshow.man.mansuffix-fix	2005-02-23 14:43:22.000000000 +0900
+++ xscreensaver-4.23/hacks/glx/glslideshow.man	2005-10-31 00:49:05.000000000 +0900
@@ -113,7 +113,7 @@
 .BR xscreensaver-demo (1),
 .BR xscreensaver-getimage (1),
 .BR xscreensaver (1),
-.BR carousel (1)
+.BR carousel (mansuffix)
 .SH COPYRIGHT
 Copyright \(co 2003-2005 by Jamie Zawinski, based on an earlier version
 that was
--- xscreensaver-4.23/hacks/glx/fliptext.man.mansuffix-fix	2005-03-21 13:27:08.000000000 +0900
+++ xscreensaver-4.23/hacks/glx/fliptext.man	2005-10-31 00:49:05.000000000 +0900
@@ -94,12 +94,12 @@
 .BR xscreensaver (1),
 .BR xscreensaver-text (1),
 .BR fortune (1),
-.BR phosphor (1),
-.BR apple2 (1),
-.BR fontglide (1),
-.BR ljlatest (1),
+.BR phosphor (mansuffix),
+.BR apple2 (mansuffix),
+.BR fontglide (mansuffix),
+.BR ljlatest (mansuffix),
 .BR dadadodo (1),
-.BR webcollage (1),
+.BR webcollage (mansuffix),
 .BR driftnet (1)
 .BR EtherPEG ,
 .BR EtherPeek
--- xscreensaver-4.23/hacks/ifs.man.mansuffix-fix	2005-03-18 14:06:44.000000000 +0900
+++ xscreensaver-4.23/hacks/ifs.man	2005-10-31 00:49:05.000000000 +0900
@@ -55,7 +55,7 @@
 .SH SEE ALSO
 .BR X (1),
 .BR xscreensaver (1),
-.BR ifs (1)
+.BR ifs (mansuffix)
 .SH COPYRIGHT
 Copyright \(co Chris Le Sueur (thefishface at gmail.com) February 2005
 
--- xscreensaver-4.23/hacks/xteevee.man.mansuffix-fix	2005-06-22 08:39:32.000000000 +0900
+++ xscreensaver-4.23/hacks/xteevee.man	2005-10-31 00:49:04.000000000 +0900
@@ -30,7 +30,7 @@
 for more details.
 .PP
 See also
-.BR xanalogtv (1)
+.BR xanalogtv (mansuffix)
 for a more sophisticated (but more graphics-intensive) implementation
 of this concept.
 .SH OPTIONS
@@ -111,9 +111,9 @@
 should simulate more TV problems.
 .SH SEE ALSO
 .BR X (1),
-.BR xanalogtv (1),
-.BR apple2 (1),
-.BR bsod (1),
+.BR xanalogtv (mansuffix),
+.BR apple2 (mansuffix),
+.BR bsod (mansuffix),
 .BR xscreensaver (1),
 .BR xscreensaver\-demo (1),
 .BR xscreensaver\-getimage (1)
--- xscreensaver-4.23/hacks/fontglide.man.mansuffix-fix	2005-03-21 08:20:32.000000000 +0900
+++ xscreensaver-4.23/hacks/fontglide.man	2005-10-31 00:49:04.000000000 +0900
@@ -99,12 +99,12 @@
 .BR xscreensaver (1),
 .BR xscreensaver-text (1),
 .BR fortune (1),
-.BR phosphor (1),
-.BR apple2 (1),
-.BR starwars (1),
-.BR ljlatest (1),
+.BR phosphor (mansuffix),
+.BR apple2 (mansuffix),
+.BR starwars (mansuffix),
+.BR ljlatest (mansuffix),
 .BR dadadodo (1),
-.BR webcollage (1),
+.BR webcollage (mansuffix),
 .BR driftnet (1)
 .BR EtherPEG ,
 .BR EtherPeek
--- xscreensaver-4.23/hacks/apple2.man.mansuffix-fix	2005-03-21 08:20:32.000000000 +0900
+++ xscreensaver-4.23/hacks/apple2.man	2005-10-31 00:49:07.000000000 +0900
@@ -175,14 +175,14 @@
 
 .SH SEE ALSO
 .BR xscreensaver (1),
-.BR bsod (1),
+.BR bsod (mansuffix),
 .BR xscreensaver-text (1),
 .BR fortune (1),
-.BR phosphor (1),
-.BR starwars (1),
-.BR ljlatest (1),
+.BR phosphor (mansuffix),
+.BR starwars (mansuffix),
+.BR ljlatest (mansuffix),
 .BR dadadodo (1),
-.BR webcollage (1),
+.BR webcollage (mansuffix),
 .BR driftnet (1)
 .BR EtherPEG ,
 .BR EtherPeek ,
--- xscreensaver-4.23/hacks/kaleidescope.man.mansuffix-fix	1997-04-29 05:33:28.000000000 +0900
+++ xscreensaver-4.23/hacks/kaleidescope.man	2005-10-31 00:49:04.000000000 +0900
@@ -71,7 +71,7 @@
 stored in the RESOURCE_MANAGER property.
 .SH SEE ALSO
 .BR X (1),
-.BR kaleidescope (1)
+.BR kaleidescope (mansuffix)
 .SH COPYRIGHT
 Copyright \(co 1997 by Ron Tapia.  Permission to use, copy, modify, 
 distribute, and sell this software and its documentation for any purpose is 
--- xscreensaver-4.23/hacks/ljlatest.man.mansuffix-fix	2005-03-21 08:20:32.000000000 +0900
+++ xscreensaver-4.23/hacks/ljlatest.man	2005-10-31 00:49:07.000000000 +0900
@@ -40,12 +40,12 @@
 .BR xscreensaver (1),
 .BR xscreensaver-text (1),
 .BR fortune (1),
-.BR phosphor (1),
-.BR apple2 (1),
-.BR starwars (1),
-.BR fontglide (1),
+.BR phosphor (mansuffix),
+.BR apple2 (mansuffix),
+.BR starwars (mansuffix),
+.BR fontglide (mansuffix),
 .BR dadadodo (1),
-.BR webcollage (1),
+.BR webcollage (mansuffix),
 .BR driftnet (1)
 .BR EtherPEG ,
 .BR EtherPeek
--- xscreensaver-4.23/hacks/pong.man.mansuffix-fix	2004-05-06 13:28:48.000000000 +0900
+++ xscreensaver-4.23/hacks/pong.man	2005-10-31 00:49:07.000000000 +0900
@@ -56,8 +56,8 @@
 .SH SEE ALSO
 .BR X (1),
 .BR xscreensaver (1),
-.BR xanalogtv (1),
-.BR apple2 (1)
+.BR xanalogtv (mansuffix),
+.BR apple2 (mansuffix)
 .SH COPYRIGHT
 2003 by Jeremy English.  Permission to use, copy, modify, 
 distribute, and sell this software and its documentation for any purpose is 
--- xscreensaver-4.23/hacks/xanalogtv.man.mansuffix-fix	2003-10-25 15:26:43.000000000 +0900
+++ xscreensaver-4.23/hacks/xanalogtv.man	2005-10-31 00:49:07.000000000 +0900
@@ -68,9 +68,9 @@
 
 .SH SEE ALSO
 .BR X (1),
-.BR xteevee (1),
-.BR apple2 (1),
-.BR bsod (1),
+.BR xteevee (mansuffix),
+.BR apple2 (mansuffix),
+.BR bsod (mansuffix),
 .BR xscreensaver (1),
 .BR xscreensaver\-demo (1),
 .BR xscreensaver\-getimage (1)
--- xscreensaver-4.23/driver/xscreensaver-text.man.mansuffix-fix	2005-03-21 08:51:22.000000000 +0900
+++ xscreensaver-4.23/driver/xscreensaver-text.man	2005-10-31 00:49:07.000000000 +0900
@@ -60,12 +60,12 @@
 .BR xscreensaver-demo (1),
 .BR xscreensaver (1),
 .BR fortune (1),
-.BR phosphor (1),
-.BR apple2 (1),
-.BR starwars (1),
-.BR fontglide (1),
+.BR phosphor (mansuffix),
+.BR apple2 (mansuffix),
+.BR starwars (mansuffix),
+.BR fontglide (mansuffix),
 .BR dadadodo (1),
-.BR webcollage (1),
+.BR webcollage (mansuffix),
 .I http://www.livejournal.com/stats/latest-rss.bml,
 .BR driftnet (1),
 .BR EtherPEG ,
--- xscreensaver-4.23/driver/Makefile.in.mansuffix-fix	2005-10-31 00:48:48.000000000 +0900
+++ xscreensaver-4.23/driver/Makefile.in	2005-10-31 00:48:48.000000000 +0900
@@ -403,6 +403,7 @@
 	  TH=".TH $$manbase $(mansuffix) \"$$V\" \"X Version 11\" \"XScreenSaver manual\"" ;	\
 	  sed -e "s/^\.TH.*/$$TH/"					\
 	      -e 's/^\(\.BR xscr.*(\)[^()]\(.*\)/\1$(mansuffix)\2/'	\
+	      -e 's@(mansuffix)@($(mansuffix))@g' \
 	    < $(srcdir)/$$man > $$T ;					\
 	  echo $(INSTALL_DATA) $(srcdir)/$$man				\
 	   $(install_prefix)$(manNdir)/$$instname ;			\

xscreensaver-4.23-modularX-addoption.patch:
 configure.in |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletion(-)

--- NEW FILE xscreensaver-4.23-modularX-addoption.patch ---
--- xscreensaver-4.23/configure.in.modularX	2005-12-15 01:23:51.000000000 +0900
+++ xscreensaver-4.23/configure.in	2005-12-15 01:28:27.000000000 +0900
@@ -711,6 +711,17 @@
     rm -fr conftestdir
   fi])
 
+###############################################################################
+#
+#       Handle the --with-x-app-defaults option HERE
+#
+###############################################################################
+
+AC_ARG_WITH(x-app-defaults,[],
+	[ac_cv_x_app_defaults="$withval"],
+	[eval ac_x_app_defaults="$withval"])
+
+
 AC_DEFUN(AC_PATH_X_APP_DEFAULTS_DIRECT,[
   # Look for the directory under a standard set of common directories.
   # Check X11 before X11Rn because it's often a symlink to the current release.
@@ -1286,6 +1297,7 @@
 ###############################################################################
 #
 #       Handle the --with-configdir option
+#       Help for --with-x-app-defaults option added..
 #
 ###############################################################################
 
@@ -1295,6 +1307,8 @@
 [  --with-configdir=DIR    Where to install the data files that describe each
                           of the display modes to the GUI.
                           Default: `PREFIX/share/xscreensaver/config/'
+  --with-x-app-defaults=DIR
+			   Where to install xscreensaver configuration file.
 ],
   [with_configdir="$withval"; with_configdir_req="$withval"],
   [with_configdir=yes])
@@ -4143,6 +4157,7 @@
   fi
   echo "User programs will be installed in ${bindir}/"
   echo "Screen savers will be installed in ${HACKDIR}/"
-  echo "Configuration will be installed in ${HACK_CONF_DIR}/"
+  echo "Hack configurations will be installed in ${HACK_CONF_DIR}/"
+  echo "Saver configuration will be installed in ${APPDEFAULTS}/"
   echo ''
 fi

xscreensaver-4.23-realpath-heap-allocate.patch:
 prefs.c |    7 +++++++
 1 files changed, 7 insertions(+)

--- NEW FILE xscreensaver-4.23-realpath-heap-allocate.patch ---
--- xscreensaver-4.23/driver/prefs.c.tmp	2005-10-24 02:36:10.000000000 +0900
+++ xscreensaver-4.23/driver/prefs.c	2005-10-24 02:39:34.000000000 +0900
@@ -94,8 +94,15 @@
 #  endif
 # endif
       char buf[PATH_MAX];
+      /*
+	Umm.. this does not work well...
       if (realpath (file, buf))
         return strdup (buf);
+      */
+      char *real_path;
+      real_path = realpath (file, NULL);
+      if (real_path)
+	return real_path;
 
       sprintf (buf, "%.100s: realpath %.200s", blurb(), file);
       perror(buf);

xscreensaver-4.23-remove-gccwarn-pointer.patch:
 demo-Gtk-conf.c |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

--- NEW FILE xscreensaver-4.23-remove-gccwarn-pointer.patch ---
--- xscreensaver-4.23/driver/demo-Gtk-conf.c.gccwarn	2005-12-19 22:42:11.000000000 +0900
+++ xscreensaver-4.23/driver/demo-Gtk-conf.c	2005-12-20 03:14:55.000000000 +0900
@@ -1813,18 +1813,21 @@
   char *s;
   FILE *f;
   conf_data *data;
+  char *n_program;
+  const char *b_program;
 
   if (L == 0) return 0;
 
-  program = (const char *) basename (program);
+  n_program = strdup (program);
+  b_program = basename (n_program);
 
-  file = (char *) malloc (L + strlen (program) + 10);
+  file = (char *) malloc (L + strlen (b_program) + 10);
   data = (conf_data *) calloc (1, sizeof(*data));
 
   strcpy (file, dir);
   if (file[L-1] != '/')
     file[L++] = '/';
-  strcpy (file+L, program);
+  strcpy (file+L, b_program);
 
   for (s = file+L; *s; s++)
     if (*s == '/' || *s == ' ')
@@ -1902,6 +1905,7 @@
 
  DONE:
   free (file);
+  free (n_program); /* Don't forget!!*/
   return data;
 }
 




More information about the fedora-cvs-commits mailing list