From: vlad <vlad@vlanout.(none)>
Date: Mon, 9 Aug 2010 18:27:46 +0000 (+0300)
Subject: moved all files to package xscreensaver
X-Git-Url: http://vcs.maemo.org/git/?p=xscreensaver;a=commitdiff_plain;h=da8bb44662d215bcc9c08c3b4ec3221abe2e2c94

moved all files to package xscreensaver
---

diff --git a/xscreensaver/config.guess b/xscreensaver/config.guess
old mode 100755
new mode 100644
index 45bee13..951383e
--- a/xscreensaver/config.guess
+++ b/xscreensaver/config.guess
@@ -1,9 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+#   Inc.
 
-timestamp='2005-04-22'
+timestamp='2007-05-17'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -17,13 +18,15 @@ timestamp='2005-04-22'
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
+
 # Originally written by Per Bothner <per@bothner.com>.
 # Please send patches to <config-patches@gnu.org>.  Submit a context
 # diff and a properly formatted ChangeLog entry.
@@ -66,11 +69,11 @@ Try \`$me --help' for more information."
 while test $# -gt 0 ; do
   case $1 in
     --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
+       echo "$timestamp" ; exit ;;
     --version | -v )
-       echo "$version" ; exit 0 ;;
+       echo "$version" ; exit ;;
     --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
+       echo "$usage"; exit ;;
     -- )     # Stop option processing
        shift; break ;;
     - )	# Use stdin as input.
@@ -104,7 +107,7 @@ set_cc_for_build='
 trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
 trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
 : ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
  { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
  { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
  { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
@@ -123,7 +126,7 @@ case $CC_FOR_BUILD,$HOST_CC,$CC in
 	;;
  ,,*)   CC_FOR_BUILD=$CC ;;
  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ;'
+esac ; set_cc_for_build= ;'
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (ghazi@noc.rutgers.edu 1994-08-24)
@@ -158,6 +161,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	    arm*) machine=arm-unknown ;;
 	    sh3el) machine=shl-unknown ;;
 	    sh3eb) machine=sh-unknown ;;
+	    sh5el) machine=sh5le-unknown ;;
 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
 	esac
 	# The Operating System including object format, if it has switched
@@ -196,55 +200,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# contains redundant information, the shorter form:
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
-	exit 0 ;;
-    amd64:OpenBSD:*:*)
-	echo x86_64-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    amiga:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    cats:OpenBSD:*:*)
-	echo arm-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    hp300:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    luna88k:OpenBSD:*:*)
-    	echo m88k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mac68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    macppc:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme88k:OpenBSD:*:*)
-	echo m88k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvmeppc:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sgi:OpenBSD:*:*)
-	echo mips64-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sun3:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:OpenBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
+	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+	exit ;;
     *:ekkoBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
+    *:SolidBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+	exit ;;
     macppc:MirBSD:*:*)
-	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
-	exit 0 ;;
+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
+	exit ;;
     *:MirBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     alpha:OSF1:*:*)
 	case $UNAME_RELEASE in
 	*4.0)
@@ -297,40 +269,43 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit 0 ;;
+	exit ;;
     Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# Should we change UNAME_MACHINE based on the output of uname instead
 	# of the specific Alpha model?
 	echo alpha-pc-interix
-	exit 0 ;;
+	exit ;;
     21064:Windows_NT:50:3)
 	echo alpha-dec-winnt3.5
-	exit 0 ;;
+	exit ;;
     Amiga*:UNIX_System_V:4.0:*)
 	echo m68k-unknown-sysv4
-	exit 0;;
+	exit ;;
     *:[Aa]miga[Oo][Ss]:*:*)
 	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit 0 ;;
+	exit ;;
     *:[Mm]orph[Oo][Ss]:*:*)
 	echo ${UNAME_MACHINE}-unknown-morphos
-	exit 0 ;;
+	exit ;;
     *:OS/390:*:*)
 	echo i370-ibm-openedition
-	exit 0 ;;
+	exit ;;
     *:z/VM:*:*)
 	echo s390-ibm-zvmoe
-	exit 0 ;;
+	exit ;;
     *:OS400:*:*)
         echo powerpc-ibm-os400
-	exit 0 ;;
+	exit ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit 0;;
+	exit ;;
+    arm:riscos:*:*|arm:RISCOS:*:*)
+	echo arm-unknown-riscos
+	exit ;;
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
 	echo hppa1.1-hitachi-hiuxmpp
-	exit 0;;
+	exit ;;
     Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
 	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
 	if test "`(/bin/universe) 2>/dev/null`" = att ; then
@@ -338,32 +313,32 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	else
 		echo pyramid-pyramid-bsd
 	fi
-	exit 0 ;;
+	exit ;;
     NILE*:*:*:dcosx)
 	echo pyramid-pyramid-svr4
-	exit 0 ;;
+	exit ;;
     DRS?6000:unix:4.0:6*)
 	echo sparc-icl-nx6
-	exit 0 ;;
+	exit ;;
     DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
 	case `/usr/bin/uname -p` in
-	    sparc) echo sparc-icl-nx7 && exit 0 ;;
+	    sparc) echo sparc-icl-nx7; exit ;;
 	esac ;;
     sun4H:SunOS:5.*:*)
 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    i86pc:SunOS:5.*:*)
+	exit ;;
+    i86pc:SunOS:5.*:* | ix86xen:SunOS:5.*:*)
 	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     sun4*:SunOS:6*:*)
 	# According to config.sub, this is the proper way to canonicalize
 	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
 	# it's likely to be more like Solaris than SunOS4.
 	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     sun4*:SunOS:*:*)
 	case "`/usr/bin/arch -k`" in
 	    Series*|S4*)
@@ -372,10 +347,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	esac
 	# Japanese Language versions have a version number like `4.1.3-JL'.
 	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit 0 ;;
+	exit ;;
     sun3*:SunOS:*:*)
 	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     sun*:*:4.2BSD:*)
 	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
 	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
@@ -387,10 +362,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 		echo sparc-sun-sunos${UNAME_RELEASE}
 		;;
 	esac
-	exit 0 ;;
+	exit ;;
     aushp:SunOS:*:*)
 	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     # The situation for MiNT is a little confusing.  The machine name
     # can be virtually everything (everything which is not
     # "atarist" or "atariste" at least should have a processor
@@ -401,40 +376,40 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     # be no problem.
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
         echo m68k-atari-mint${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
 	echo m68k-atari-mint${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
         echo m68k-atari-mint${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
         echo m68k-milan-mint${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
         echo m68k-hades-mint${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
         echo m68k-unknown-mint${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     m68k:machten:*:*)
 	echo m68k-apple-machten${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     powerpc:machten:*:*)
 	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     RISC*:Mach:*:*)
 	echo mips-dec-mach_bsd4.3
-	exit 0 ;;
+	exit ;;
     RISC*:ULTRIX:*:*)
 	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     VAX*:ULTRIX*:*:*)
 	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     2020:CLIX:*:* | 2430:CLIX:*:*)
 	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     mips:*:*:UMIPS | mips:*:*:RISCos)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
@@ -458,32 +433,33 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	  exit (-1);
 	}
 EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c \
-	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-	  && exit 0
+	$CC_FOR_BUILD -o $dummy $dummy.c &&
+	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+	  SYSTEM_NAME=`$dummy $dummyarg` &&
+	    { echo "$SYSTEM_NAME"; exit; }
 	echo mips-mips-riscos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     Motorola:PowerMAX_OS:*:*)
 	echo powerpc-motorola-powermax
-	exit 0 ;;
+	exit ;;
     Motorola:*:4.3:PL8-*)
 	echo powerpc-harris-powermax
-	exit 0 ;;
+	exit ;;
     Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
 	echo powerpc-harris-powermax
-	exit 0 ;;
+	exit ;;
     Night_Hawk:Power_UNIX:*:*)
 	echo powerpc-harris-powerunix
-	exit 0 ;;
+	exit ;;
     m88k:CX/UX:7*:*)
 	echo m88k-harris-cxux7
-	exit 0 ;;
+	exit ;;
     m88k:*:4*:R4*)
 	echo m88k-motorola-sysv4
-	exit 0 ;;
+	exit ;;
     m88k:*:3*:R3*)
 	echo m88k-motorola-sysv3
-	exit 0 ;;
+	exit ;;
     AViiON:dgux:*:*)
         # DG/UX returns AViiON for all architectures
         UNAME_PROCESSOR=`/usr/bin/uname -p`
@@ -499,29 +475,29 @@ EOF
 	else
 	    echo i586-dg-dgux${UNAME_RELEASE}
 	fi
- 	exit 0 ;;
+ 	exit ;;
     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
 	echo m88k-dolphin-sysv3
-	exit 0 ;;
+	exit ;;
     M88*:*:R3*:*)
 	# Delta 88k system running SVR3
 	echo m88k-motorola-sysv3
-	exit 0 ;;
+	exit ;;
     XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
 	echo m88k-tektronix-sysv3
-	exit 0 ;;
+	exit ;;
     Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
 	echo m68k-tektronix-bsd
-	exit 0 ;;
+	exit ;;
     *:IRIX*:*:*)
 	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit 0 ;;
+	exit ;;
     ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
-	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
+	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
+	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
     i*86:AIX:*:*)
 	echo i386-ibm-aix
-	exit 0 ;;
+	exit ;;
     ia64:AIX:*:*)
 	if [ -x /usr/bin/oslevel ] ; then
 		IBM_REV=`/usr/bin/oslevel`
@@ -529,7 +505,7 @@ EOF
 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 	fi
 	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit 0 ;;
+	exit ;;
     *:AIX:2:3)
 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
 		eval $set_cc_for_build
@@ -544,14 +520,18 @@ EOF
 			exit(0);
 			}
 EOF
-		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
-		echo rs6000-ibm-aix3.2.5
+		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
+		then
+			echo "$SYSTEM_NAME"
+		else
+			echo rs6000-ibm-aix3.2.5
+		fi
 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
 		echo rs6000-ibm-aix3.2.4
 	else
 		echo rs6000-ibm-aix3.2
 	fi
-	exit 0 ;;
+	exit ;;
     *:AIX:*:[45])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
@@ -565,28 +545,28 @@ EOF
 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 	fi
 	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit 0 ;;
+	exit ;;
     *:AIX:*:*)
 	echo rs6000-ibm-aix
-	exit 0 ;;
+	exit ;;
     ibmrt:4.4BSD:*|romp-ibm:BSD:*)
 	echo romp-ibm-bsd4.4
-	exit 0 ;;
+	exit ;;
     ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
 	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit 0 ;;                           # report: romp-ibm BSD 4.3
+	exit ;;                             # report: romp-ibm BSD 4.3
     *:BOSX:*:*)
 	echo rs6000-bull-bosx
-	exit 0 ;;
+	exit ;;
     DPX/2?00:B.O.S.:*:*)
 	echo m68k-bull-sysv3
-	exit 0 ;;
+	exit ;;
     9000/[34]??:4.3bsd:1.*:*)
 	echo m68k-hp-bsd
-	exit 0 ;;
+	exit ;;
     hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
 	echo m68k-hp-bsd4.4
-	exit 0 ;;
+	exit ;;
     9000/[34678]??:HP-UX:*:*)
 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
 	case "${UNAME_MACHINE}" in
@@ -648,9 +628,19 @@ EOF
 	esac
 	if [ ${HP_ARCH} = "hppa2.0w" ]
 	then
-	    # avoid double evaluation of $set_cc_for_build
-	    test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
+	    eval $set_cc_for_build
+
+	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
+	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
+	    # generating 64-bit code.  GNU and HP use different nomenclature:
+	    #
+	    # $ CC_FOR_BUILD=cc ./config.guess
+	    # => hppa2.0w-hp-hpux11.23
+	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
+	    # => hppa64-hp-hpux11.23
+
+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+		grep __LP64__ >/dev/null
 	    then
 		HP_ARCH="hppa2.0w"
 	    else
@@ -658,11 +648,11 @@ EOF
 	    fi
 	fi
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit 0 ;;
+	exit ;;
     ia64:HP-UX:*:*)
 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
 	echo ia64-hp-hpux${HPUX_REV}
-	exit 0 ;;
+	exit ;;
     3050*:HI-UX:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
@@ -690,161 +680,182 @@ EOF
 	  exit (0);
 	}
 EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
+		{ echo "$SYSTEM_NAME"; exit; }
 	echo unknown-hitachi-hiuxwe2
-	exit 0 ;;
+	exit ;;
     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
 	echo hppa1.1-hp-bsd
-	exit 0 ;;
+	exit ;;
     9000/8??:4.3bsd:*:*)
 	echo hppa1.0-hp-bsd
-	exit 0 ;;
+	exit ;;
     *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
 	echo hppa1.0-hp-mpeix
-	exit 0 ;;
+	exit ;;
     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
 	echo hppa1.1-hp-osf
-	exit 0 ;;
+	exit ;;
     hp8??:OSF1:*:*)
 	echo hppa1.0-hp-osf
-	exit 0 ;;
+	exit ;;
     i*86:OSF1:*:*)
 	if [ -x /usr/sbin/sysversion ] ; then
 	    echo ${UNAME_MACHINE}-unknown-osf1mk
 	else
 	    echo ${UNAME_MACHINE}-unknown-osf1
 	fi
-	exit 0 ;;
+	exit ;;
     parisc*:Lites*:*:*)
 	echo hppa1.1-hp-lites
-	exit 0 ;;
+	exit ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 	echo c1-convex-bsd
-        exit 0 ;;
+        exit ;;
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-        exit 0 ;;
+        exit ;;
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
 	echo c34-convex-bsd
-        exit 0 ;;
+        exit ;;
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
 	echo c38-convex-bsd
-        exit 0 ;;
+        exit ;;
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
 	echo c4-convex-bsd
-        exit 0 ;;
+        exit ;;
     CRAY*Y-MP:*:*:*)
 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     CRAY*[A-Z]90:*:*:*)
 	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
 	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
 	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
 	      -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     CRAY*TS:*:*:*)
 	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     CRAY*T3E:*:*:*)
 	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     CRAY*SV1:*:*:*)
 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     *:UNICOS/mp:*:*)
 	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit 0 ;;
+        exit ;;
     5000:UNIX_System_V:4.*:*)
         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
         FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
         echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit 0 ;;
+	exit ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     sparc*:BSD/OS:*:*)
 	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:BSD/OS:*:*)
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:FreeBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit 0 ;;
+	case ${UNAME_MACHINE} in
+	    pc98)
+		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    amd64)
+		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    *)
+		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	esac
+	exit ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
-	exit 0 ;;
-    i*:MINGW*:*)
+	exit ;;
+    *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
-	exit 0 ;;
+	exit ;;
+    i*:windows32*:*)
+    	# uname -m includes "-pc" on this system.
+    	echo ${UNAME_MACHINE}-mingw32
+	exit ;;
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
-	exit 0 ;;
-    x86:Interix*:[34]*)
-	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
-	exit 0 ;;
+	exit ;;
+    *:Interix*:[3456]*)
+    	case ${UNAME_MACHINE} in
+	    x86) 
+		echo i586-pc-interix${UNAME_RELEASE}
+		exit ;;
+	    EM64T | authenticamd)
+		echo x86_64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	esac ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
-	exit 0 ;;
+	exit ;;
     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
 	# UNAME_MACHINE based on the output of uname instead of i386?
 	echo i586-pc-interix
-	exit 0 ;;
+	exit ;;
     i*:UWIN*:*)
 	echo ${UNAME_MACHINE}-pc-uwin
-	exit 0 ;;
-    amd64:CYGWIN*:*:*)
+	exit ;;
+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
 	echo x86_64-unknown-cygwin
-	exit 0 ;;
+	exit ;;
     p*:CYGWIN*:*)
 	echo powerpcle-unknown-cygwin
-	exit 0 ;;
+	exit ;;
     prep*:SunOS:5.*:*)
 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     *:GNU:*:*)
 	# the GNU system
 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit 0 ;;
+	exit ;;
     *:GNU/*:*:*)
 	# other systems with GNU libc and userland
 	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-	exit 0 ;;
+	exit ;;
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
-	exit 0 ;;
+	exit ;;
     arm*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
+    avr32*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
     cris:Linux:*:*)
 	echo cris-axis-linux-gnu
-	exit 0 ;;
+	exit ;;
     crisv32:Linux:*:*)
 	echo crisv32-axis-linux-gnu
-	exit 0 ;;
+	exit ;;
     frv:Linux:*:*)
     	echo frv-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     m32r*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     m68*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     mips:Linux:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
@@ -861,8 +872,12 @@ EOF
 	#endif
 	#endif
 EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^CPU/{
+		s: ::g
+		p
+	    }'`"
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     mips64:Linux:*:*)
 	eval $set_cc_for_build
@@ -880,15 +895,22 @@ EOF
 	#endif
 	#endif
 EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^CPU/{
+		s: ::g
+		p
+	    }'`"
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
+    or32:Linux:*:*)
+	echo or32-unknown-linux-gnu
+	exit ;;
     ppc:Linux:*:*)
 	echo powerpc-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     ppc64:Linux:*:*)
 	echo powerpc64-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
 	  EV5)   UNAME_MACHINE=alphaev5 ;;
@@ -902,7 +924,7 @@ EOF
 	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit 0 ;;
+	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -910,25 +932,31 @@ EOF
 	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
 	  *)    echo hppa-unknown-linux-gnu ;;
 	esac
-	exit 0 ;;
+	exit ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
 	echo hppa64-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
-	exit 0 ;;
+	exit ;;
     sh64*:Linux:*:*)
     	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     sh*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
+    vax:Linux:*:*)
+	echo ${UNAME_MACHINE}-dec-linux-gnu
+	exit ;;
     x86_64:Linux:*:*)
 	echo x86_64-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
+    xtensa:Linux:*:*)
+    	echo xtensa-unknown-linux-gnu
+	exit ;;
     i*86:Linux:*:*)
 	# The BFD linker knows what the default object file format is, so
 	# first see if it will tell us. cd to the root directory to prevent
@@ -946,15 +974,15 @@ EOF
 		;;
 	  a.out-i386-linux)
 		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit 0 ;;
+		exit ;;
 	  coff-i386)
 		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		exit 0 ;;
+		exit ;;
 	  "")
 		# Either a pre-BFD a.out linker (linux-gnuoldld) or
 		# one that does not give us useful --help.
 		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit 0 ;;
+		exit ;;
 	esac
 	# Determine whether the default compiler is a.out or elf
 	eval $set_cc_for_build
@@ -971,7 +999,7 @@ EOF
 	LIBC=gnulibc1
 	# endif
 	#else
-	#ifdef __INTEL_COMPILER
+	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
 	LIBC=gnu
 	#else
 	LIBC=gnuaout
@@ -981,16 +1009,23 @@ EOF
 	LIBC=dietlibc
 	#endif
 EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
-	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^LIBC/{
+		s: ::g
+		p
+	    }'`"
+	test x"${LIBC}" != x && {
+		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+		exit
+	}
+	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
 	;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
 	# earlier versions are messed up and put the nodename in both
 	# sysname and nodename.
 	echo i386-sequent-sysv4
-	exit 0 ;;
+	exit ;;
     i*86:UNIX_SV:4.2MP:2.*)
         # Unixware is an offshoot of SVR4, but it has its own version
         # number series starting with 2...
@@ -998,27 +1033,27 @@ EOF
 	# I just have to hope.  -- rms.
         # Use sysv4.2uw... so that sysv4* matches it.
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	exit 0 ;;
+	exit ;;
     i*86:OS/2:*:*)
 	# If we were able to find `uname', then EMX Unix compatibility
 	# is probably installed.
 	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit 0 ;;
+	exit ;;
     i*86:XTS-300:*:STOP)
 	echo ${UNAME_MACHINE}-unknown-stop
-	exit 0 ;;
+	exit ;;
     i*86:atheos:*:*)
 	echo ${UNAME_MACHINE}-unknown-atheos
-	exit 0 ;;
-	i*86:syllable:*:*)
+	exit ;;
+    i*86:syllable:*:*)
 	echo ${UNAME_MACHINE}-pc-syllable
-	exit 0 ;;
+	exit ;;
     i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
 	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     i*86:*DOS:*:*)
 	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit 0 ;;
+	exit ;;
     i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
 	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
@@ -1026,15 +1061,16 @@ EOF
 	else
 		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
 	fi
-	exit 0 ;;
-    i*86:*:5:[78]*)
+	exit ;;
+    i*86:*:5:[678]*)
+    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
 	case `/bin/uname -X | grep "^Machine"` in
 	    *486*)	     UNAME_MACHINE=i486 ;;
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
 	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
 	esac
 	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-	exit 0 ;;
+	exit ;;
     i*86:*:3.2:*)
 	if test -f /usr/options/cb.name; then
 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
@@ -1052,73 +1088,73 @@ EOF
 	else
 		echo ${UNAME_MACHINE}-pc-sysv32
 	fi
-	exit 0 ;;
+	exit ;;
     pc:*:*:*)
 	# Left here for compatibility:
         # uname -m prints for DJGPP always 'pc', but it prints nothing about
         # the processor, so we play safe by assuming i386.
 	echo i386-pc-msdosdjgpp
-        exit 0 ;;
+        exit ;;
     Intel:Mach:3*:*)
 	echo i386-pc-mach3
-	exit 0 ;;
+	exit ;;
     paragon:*:*:*)
 	echo i860-intel-osf1
-	exit 0 ;;
+	exit ;;
     i860:*:4.*:*) # i860-SVR4
 	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
 	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
 	else # Add other i860-SVR4 vendors below as they are discovered.
 	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
 	fi
-	exit 0 ;;
+	exit ;;
     mini*:CTIX:SYS*5:*)
 	# "miniframe"
 	echo m68010-convergent-sysv
-	exit 0 ;;
+	exit ;;
     mc68k:UNIX:SYSTEM5:3.51m)
 	echo m68k-convergent-sysv
-	exit 0 ;;
+	exit ;;
     M680?0:D-NIX:5.3:*)
 	echo m68k-diab-dnix
-	exit 0 ;;
+	exit ;;
     M68*:*:R3V[5678]*:*)
-	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
+	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
     3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
 	OS_REL=''
 	test -r /etc/.relid \
 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
+	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
+	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && echo i486-ncr-sysv4 && exit 0 ;;
+          && { echo i486-ncr-sysv4; exit; } ;;
     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
 	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     mc68030:UNIX_System_V:4.*:*)
 	echo m68k-atari-sysv4
-	exit 0 ;;
+	exit ;;
     TSUNAMI:LynxOS:2.*:*)
 	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     rs6000:LynxOS:2.*:*)
 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     SM[BE]S:UNIX_SV:*:*)
 	echo mips-dde-sysv${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     RM*:ReliantUNIX-*:*:*)
 	echo mips-sni-sysv4
-	exit 0 ;;
+	exit ;;
     RM*:SINIX-*:*:*)
 	echo mips-sni-sysv4
-	exit 0 ;;
+	exit ;;
     *:SINIX-*:*:*)
 	if uname -p 2>/dev/null >/dev/null ; then
 		UNAME_MACHINE=`(uname -p) 2>/dev/null`
@@ -1126,73 +1162,81 @@ EOF
 	else
 		echo ns32k-sni-sysv
 	fi
-	exit 0 ;;
+	exit ;;
     PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
                       # says <Richard.M.Bartel@ccMail.Census.GOV>
         echo i586-unisys-sysv4
-        exit 0 ;;
+        exit ;;
     *:UNIX_System_V:4*:FTX*)
 	# From Gerald Hewes <hewes@openmarket.com>.
 	# How about differentiating between stratus architectures? -djm
 	echo hppa1.1-stratus-sysv4
-	exit 0 ;;
+	exit ;;
     *:*:*:FTX*)
 	# From seanf@swdc.stratus.com.
 	echo i860-stratus-sysv4
-	exit 0 ;;
+	exit ;;
     i*86:VOS:*:*)
 	# From Paul.Green@stratus.com.
 	echo ${UNAME_MACHINE}-stratus-vos
-	exit 0 ;;
+	exit ;;
     *:VOS:*:*)
 	# From Paul.Green@stratus.com.
 	echo hppa1.1-stratus-vos
-	exit 0 ;;
+	exit ;;
     mc68*:A/UX:*:*)
 	echo m68k-apple-aux${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     news*:NEWS-OS:6*:*)
 	echo mips-sony-newsos6
-	exit 0 ;;
+	exit ;;
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
 	if [ -d /usr/nec ]; then
 	        echo mips-nec-sysv${UNAME_RELEASE}
 	else
 	        echo mips-unknown-sysv${UNAME_RELEASE}
 	fi
-        exit 0 ;;
+        exit ;;
     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
 	echo powerpc-be-beos
-	exit 0 ;;
+	exit ;;
     BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
 	echo powerpc-apple-beos
-	exit 0 ;;
+	exit ;;
     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
 	echo i586-pc-beos
-	exit 0 ;;
+	exit ;;
     SX-4:SUPER-UX:*:*)
 	echo sx4-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     SX-5:SUPER-UX:*:*)
 	echo sx5-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     SX-6:SUPER-UX:*:*)
 	echo sx6-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
+    SX-7:SUPER-UX:*:*)
+	echo sx7-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8:SUPER-UX:*:*)
+	echo sx8-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8R:SUPER-UX:*:*)
+	echo sx8r-nec-superux${UNAME_RELEASE}
+	exit ;;
     Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:Rhapsody:*:*)
 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
 	case $UNAME_PROCESSOR in
-	    *86) UNAME_PROCESSOR=i686 ;;
 	    unknown) UNAME_PROCESSOR=powerpc ;;
 	esac
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
 	UNAME_PROCESSOR=`uname -p`
 	if test "$UNAME_PROCESSOR" = "x86"; then
@@ -1200,25 +1244,25 @@ EOF
 		UNAME_MACHINE=pc
 	fi
 	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:QNX:*:4*)
 	echo i386-pc-qnx
-	exit 0 ;;
+	exit ;;
     NSE-?:NONSTOP_KERNEL:*:*)
 	echo nse-tandem-nsk${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     NSR-?:NONSTOP_KERNEL:*:*)
 	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:NonStop-UX:*:*)
 	echo mips-compaq-nonstopux
-	exit 0 ;;
+	exit ;;
     BS2000:POSIX*:*:*)
 	echo bs2000-siemens-sysv
-	exit 0 ;;
+	exit ;;
     DS/*:UNIX_System_V:*:*)
 	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:Plan9:*:*)
 	# "uname -m" is not consistent, so use $cputype instead. 386
 	# is converted to i386 for consistency with other x86
@@ -1229,41 +1273,47 @@ EOF
 	    UNAME_MACHINE="$cputype"
 	fi
 	echo ${UNAME_MACHINE}-unknown-plan9
-	exit 0 ;;
+	exit ;;
     *:TOPS-10:*:*)
 	echo pdp10-unknown-tops10
-	exit 0 ;;
+	exit ;;
     *:TENEX:*:*)
 	echo pdp10-unknown-tenex
-	exit 0 ;;
+	exit ;;
     KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
 	echo pdp10-dec-tops20
-	exit 0 ;;
+	exit ;;
     XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
 	echo pdp10-xkl-tops20
-	exit 0 ;;
+	exit ;;
     *:TOPS-20:*:*)
 	echo pdp10-unknown-tops20
-	exit 0 ;;
+	exit ;;
     *:ITS:*:*)
 	echo pdp10-unknown-its
-	exit 0 ;;
+	exit ;;
     SEI:*:*:SEIUX)
         echo mips-sei-seiux${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:DragonFly:*:*)
 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit 0 ;;
+	exit ;;
     *:*VMS:*:*)
     	UNAME_MACHINE=`(uname -p) 2>/dev/null`
 	case "${UNAME_MACHINE}" in
-	    A*) echo alpha-dec-vms && exit 0 ;;
-	    I*) echo ia64-dec-vms && exit 0 ;;
-	    V*) echo vax-dec-vms && exit 0 ;;
+	    A*) echo alpha-dec-vms ; exit ;;
+	    I*) echo ia64-dec-vms ; exit ;;
+	    V*) echo vax-dec-vms ; exit ;;
 	esac ;;
     *:XENIX:*:SysV)
 	echo i386-pc-xenix
-	exit 0 ;;
+	exit ;;
+    i*86:skyos:*:*)
+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+	exit ;;
+    i*86:rdos:*:*)
+	echo ${UNAME_MACHINE}-pc-rdos
+	exit ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1295,7 +1345,7 @@ main ()
 #endif
 
 #if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix"); exit (0);
+  printf ("arm-acorn-riscix\n"); exit (0);
 #endif
 
 #if defined (hp300) && !defined (hpux)
@@ -1384,11 +1434,12 @@ main ()
 }
 EOF
 
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
+	{ echo "$SYSTEM_NAME"; exit; }
 
 # Apollos put the system type in the environment.
 
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
 
 # Convex versions that predate uname can use getsysinfo(1)
 
@@ -1397,22 +1448,22 @@ then
     case `getsysinfo -f cpu_type` in
     c1*)
 	echo c1-convex-bsd
-	exit 0 ;;
+	exit ;;
     c2*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-	exit 0 ;;
+	exit ;;
     c34*)
 	echo c34-convex-bsd
-	exit 0 ;;
+	exit ;;
     c38*)
 	echo c38-convex-bsd
-	exit 0 ;;
+	exit ;;
     c4*)
 	echo c4-convex-bsd
-	exit 0 ;;
+	exit ;;
     esac
 fi
 
diff --git a/xscreensaver/debian/control b/xscreensaver/debian/control
index ba8f76e..4179064 100644
--- a/xscreensaver/debian/control
+++ b/xscreensaver/debian/control
@@ -11,7 +11,7 @@ Vcs-browser: http://git.debian.org/git/collab-maint/xscreensaver.git
 
 Package: xscreensaver
 Architecture: any
-Depends: ${shlibs:Depends}, xscreensaver-data
+Depends: ${shlibs:Depends} 
 Conflicts: funny-manpages (<< 1.3-1), suidmanager (<< 0.50), xscreensaver-gnome (<< 4.09-2), xscreensaver-nognome (<< 4.09-2), gnome-control-center (<< 1:2)
 Recommends: xli | xloadimage, libjpeg-progs, perl5, miscfiles | wordlist
 Suggests: xfishtank, xdaliclock, xscreensaver-gl, fortune, www-browser, qcam | streamer
@@ -28,62 +28,3 @@ Description: Automatic screensaver for X
  xscreensaver-data-extra, xscreensaver-gl and xscreensaver-gl-extra 
  packages.
 
-Package: xscreensaver-data
-Architecture: any
-Depends: ${shlibs:Depends}
-Conflicts: xscreensaver (<< 5.04-3), kscreensaver-xsavers (<< 4:3.5.9-1)
-Replaces: xscreensaver (<< 5.04-3), gnome-screensaver (<< 2.15.4-0ubuntu1)
-Description: data files to be shared among screensaver frontends
- XScreenSaver is a modular screen saver and locker for X11,
- containing more than 200 screen savers.
- .
- This package contains a small selection of graphical screen saver
- modules (listed below) from the xscreensaver collection. This package
- is used by both xscreensaver and gnome-screensaver.
- .
- This is the selected set of non-GL screensavers shipped by default:
- deco, distort, fiberlamp, fuzzyflakes, galaxy, metaballs, penrose, 
- ripples, shadebobs, slidescreen, sonar, swirl.
- .
- Mode display modes can be found in xscreensaver-data-extra, xscreensaver-gl
- and xscreensaver-gl-extra packages.
-
-Package: xscreensaver-data-extra
-Architecture: any
-Depends: ${shlibs:Depends}, xscreensaver-data (>= 5.04-3), libjpeg-progs, netpbm
-Conflicts: xscreensaver (<< 5.04-3), kscreensaver-xsavers (<< 4:3.5.9-1)
-Replaces: xscreensaver (<< 5.04-3)
-Description: data files to be shared among screensaver frontends
- XScreenSaver is a modular screen saver and locker for X11,
- containing more than 200 screen savers.
- .
- This package contains the rest of the 2D screen saver modules
- from the xscreensaver collection. This package is used by both
- xscreensaver and gnome-screensaver.
- .
- This is the set of non-GL screensavers not shipped by default:
- ant, anemone, anemotaxis, apollonian, apple2, attraction, barcode, blaster,
- blitspin, bouboule, boxfit, braid, bsod, bubbles, bumps, ccurve, celtic,
- cloudlife, compass, coral, critical, crystal, cynosure, decayscreen,
- deluxe, demon, discrete, drift, epicycle, eruption, euler2d, fadeplot,
- fireworkx, flag, flame, flow, fluidballs, fontglide, forest, goop, 
- grav, greynetic, halftone, halo, helix, hopalong, hyperball,
- hypercube, ifs, imsmap, interaggregate, interference, intermomentary, jigsqw, 
- juggle, julia, memscroller, mismunch, moire, moire2, mountain, munch, 
- nerverot, noseguy, pacman, pedal, penetrate, petry, phosphor, piecewise, 
- polyominoes, pong, pyro, qiz, rd-bomb, rocks, rorschach, rotor, rotzoomer, 
- sierpinski, slip, speedmine, sphere, spiral, spotlight, squiral, starfish, 
- strange, substrate, t3d, thornbird, triangle, truchet, twang, vermiculate, 
- vidwhacker, vines, wander, webcollage, whirlwindwarp, whirlygig, worm, 
- wormhole, xanalogtv, xflame, xjack, xmatrix, xrayswarm, xspirograph, zoom.
- .
- WARNING: This package includes the 'webcollage' screen saver, which
- displays images that are the result of random web searches. The
- Internet being what it is, absolutely anything might show up in the
- collage of search results including -- quite possibly -- pornography, or
- even nudity. Please act accordingly.
- .
- More display modes can be found in the xscreensaver-data, xscreensaver-gl
- and xscreensaver-gl-extra packages.
-
-
diff --git a/xscreensaver/debian/rules b/xscreensaver/debian/rules
index 41f4b96..bb88252 100644
--- a/xscreensaver/debian/rules
+++ b/xscreensaver/debian/rules
@@ -106,8 +106,8 @@ binary-arch:	build
 	dh_installpam -a
 	dh_installmenu -a
 	# install app-defaults to proper places
-	install -m 644 -o root -g root driver/XScreenSaver.ad-nogl \
-		debian/xscreensaver-data/etc/X11/app-defaults/XScreenSaver-nogl
+	#install -m 644 -o root -g root driver/XScreenSaver.ad-nogl \
+	#	debian/xscreensaver-data/etc/X11/app-defaults/XScreenSaver-nogl
 	# Hopefully prevent nVidia brain damage
 	# This is supposed to prevent accidentially linking against the
 	# binary nvidia drivers. Deinstall or divert them before building!
diff --git a/xscreensaver/debian/xscreensaver-data-extra.files b/xscreensaver/debian/xscreensaver-data-extra.files
deleted file mode 100644
index dbcd042..0000000
--- a/xscreensaver/debian/xscreensaver-data-extra.files
+++ /dev/null
@@ -1,481 +0,0 @@
-usr/lib/xscreensaver/anemone
-usr/lib/xscreensaver/anemotaxis
-usr/lib/xscreensaver/apollonian
-usr/lib/xscreensaver/apple2
-usr/lib/xscreensaver/attraction
-usr/lib/xscreensaver/barcode
-usr/lib/xscreensaver/blaster
-usr/lib/xscreensaver/blitspin
-usr/lib/xscreensaver/bouboule
-usr/lib/xscreensaver/boxfit
-usr/lib/xscreensaver/braid
-usr/lib/xscreensaver/bsod
-usr/lib/xscreensaver/bubbles
-usr/lib/xscreensaver/bumps
-usr/lib/xscreensaver/ccurve
-usr/lib/xscreensaver/celtic
-usr/lib/xscreensaver/cloudlife
-usr/lib/xscreensaver/compass
-usr/lib/xscreensaver/coral
-usr/lib/xscreensaver/critical
-usr/lib/xscreensaver/crystal
-usr/lib/xscreensaver/cynosure
-usr/lib/xscreensaver/decayscreen
-usr/lib/xscreensaver/deluxe
-usr/lib/xscreensaver/demon
-usr/lib/xscreensaver/discrete
-usr/lib/xscreensaver/drift
-usr/lib/xscreensaver/epicycle
-usr/lib/xscreensaver/eruption
-usr/lib/xscreensaver/euler2d
-usr/lib/xscreensaver/fadeplot
-usr/lib/xscreensaver/fireworkx
-usr/lib/xscreensaver/flag
-usr/lib/xscreensaver/flame
-usr/lib/xscreensaver/flow
-usr/lib/xscreensaver/fluidballs
-usr/lib/xscreensaver/fontglide
-usr/lib/xscreensaver/forest
-usr/lib/xscreensaver/goop
-usr/lib/xscreensaver/grav
-usr/lib/xscreensaver/greynetic
-usr/lib/xscreensaver/halftone
-usr/lib/xscreensaver/halo
-usr/lib/xscreensaver/helix
-usr/lib/xscreensaver/hopalong
-usr/lib/xscreensaver/hyperball
-usr/lib/xscreensaver/hypercube
-usr/lib/xscreensaver/ifs
-usr/lib/xscreensaver/imsmap
-usr/lib/xscreensaver/interaggregate
-usr/lib/xscreensaver/interference
-usr/lib/xscreensaver/intermomentary
-usr/lib/xscreensaver/jigsaw
-usr/lib/xscreensaver/juggle
-usr/lib/xscreensaver/julia
-usr/lib/xscreensaver/kaleidescope
-usr/lib/xscreensaver/kumppa
-usr/lib/xscreensaver/laser
-usr/lib/xscreensaver/lightning
-usr/lib/xscreensaver/lisa
-usr/lib/xscreensaver/lissie
-usr/lib/xscreensaver/ljlatest
-usr/lib/xscreensaver/lmorph
-usr/lib/xscreensaver/loop
-usr/lib/xscreensaver/maze
-usr/lib/xscreensaver/memscroller
-usr/lib/xscreensaver/mismunch
-usr/lib/xscreensaver/moire
-usr/lib/xscreensaver/moire2
-usr/lib/xscreensaver/mountain
-usr/lib/xscreensaver/munch
-usr/lib/xscreensaver/nerverot
-usr/lib/xscreensaver/noseguy
-usr/lib/xscreensaver/pacman
-usr/lib/xscreensaver/pedal
-usr/lib/xscreensaver/penetrate
-usr/lib/xscreensaver/petri
-usr/lib/xscreensaver/phosphor
-usr/lib/xscreensaver/piecewise
-usr/lib/xscreensaver/polyominoes
-usr/lib/xscreensaver/pong
-usr/lib/xscreensaver/pyro
-usr/lib/xscreensaver/qix
-usr/lib/xscreensaver/rd-bomb
-usr/lib/xscreensaver/rocks
-usr/lib/xscreensaver/rorschach
-usr/lib/xscreensaver/rotor
-usr/lib/xscreensaver/rotzoomer
-usr/lib/xscreensaver/sierpinski
-usr/lib/xscreensaver/slip
-usr/lib/xscreensaver/speedmine
-usr/lib/xscreensaver/sphere
-usr/lib/xscreensaver/spiral
-usr/lib/xscreensaver/spotlight
-usr/lib/xscreensaver/squiral
-usr/lib/xscreensaver/starfish
-usr/lib/xscreensaver/strange
-usr/lib/xscreensaver/substrate
-usr/lib/xscreensaver/t3d
-usr/lib/xscreensaver/thornbird
-usr/lib/xscreensaver/triangle
-usr/lib/xscreensaver/truchet
-usr/lib/xscreensaver/twang
-usr/lib/xscreensaver/vermiculate
-usr/lib/xscreensaver/vidwhacker
-usr/lib/xscreensaver/vines
-usr/lib/xscreensaver/wander
-usr/lib/xscreensaver/webcollage
-usr/lib/xscreensaver/webcollage-helper
-usr/lib/xscreensaver/whirlwindwarp
-usr/lib/xscreensaver/whirlygig
-usr/lib/xscreensaver/worm
-usr/lib/xscreensaver/wormhole
-usr/lib/xscreensaver/xanalogtv
-usr/lib/xscreensaver/xflame
-usr/lib/xscreensaver/xjack
-usr/lib/xscreensaver/xmatrix
-usr/lib/xscreensaver/xrayswarm
-usr/lib/xscreensaver/xspirograph
-usr/lib/xscreensaver/xsublim
-usr/lib/xscreensaver/zoom
-usr/share/man/man6/anemone.6x
-usr/share/man/man6/anemotaxis.6x
-usr/share/man/man6/apollonian.6x
-usr/share/man/man6/apple2.6x
-usr/share/man/man6/attraction.6x
-usr/share/man/man6/barcode.6x
-usr/share/man/man6/blaster.6x
-usr/share/man/man6/blitspin.6x
-usr/share/man/man6/bouboule.6x
-usr/share/man/man6/boxfit.6x
-usr/share/man/man6/braid.6x
-usr/share/man/man6/bsod.6x
-usr/share/man/man6/bubbles.6x
-usr/share/man/man6/bumps.6x
-usr/share/man/man6/celtic.6x
-usr/share/man/man6/ccurve.6x
-usr/share/man/man6/cloudlife.6x
-usr/share/man/man6/compass.6x
-usr/share/man/man6/coral.6x
-usr/share/man/man6/critical.6x
-usr/share/man/man6/crystal.6x
-usr/share/man/man6/cynosure.6x
-usr/share/man/man6/decayscreen.6x
-usr/share/man/man6/deluxe.6x
-usr/share/man/man6/demon.6x
-usr/share/man/man6/discrete.6x
-usr/share/man/man6/drift.6x
-usr/share/man/man6/epicycle.6x
-usr/share/man/man6/eruption.6x
-usr/share/man/man6/euler2d.6x
-usr/share/man/man6/fadeplot.6x
-usr/share/man/man6/fireworkx.6x
-usr/share/man/man6/flag.6x
-usr/share/man/man6/flame.6x
-usr/share/man/man6/flow.6x
-usr/share/man/man6/fluidballs.6x
-usr/share/man/man6/fontglide.6x
-usr/share/man/man6/forest.6x
-usr/share/man/man6/goop.6x
-usr/share/man/man6/grav.6x
-usr/share/man/man6/greynetic.6x
-usr/share/man/man6/halftone.6x
-usr/share/man/man6/halo.6x
-usr/share/man/man6/helix.6x
-usr/share/man/man6/hopalong.6x
-usr/share/man/man6/hyperball.6x
-usr/share/man/man6/hypercube.6x
-usr/share/man/man6/ifs.6x
-usr/share/man/man6/imsmap.6x
-usr/share/man/man6/interaggregate.6x
-usr/share/man/man6/interference.6x
-usr/share/man/man6/intermomentary.6x
-usr/share/man/man6/jigsaw.6x
-usr/share/man/man6/juggle.6x
-usr/share/man/man6/julia.6x
-usr/share/man/man6/kaleidescope.6x
-usr/share/man/man6/kumppa.6x
-usr/share/man/man6/laser.6x
-usr/share/man/man6/lightning.6x
-usr/share/man/man6/lisa.6x
-usr/share/man/man6/lissie.6x
-usr/share/man/man6/ljlatest.6x
-usr/share/man/man6/lmorph.6x
-usr/share/man/man6/loop.6x
-usr/share/man/man6/maze.6x
-usr/share/man/man6/memscroller.6x
-usr/share/man/man6/mismunch.6x
-usr/share/man/man6/moire.6x
-usr/share/man/man6/moire2.6x
-usr/share/man/man6/mountain.6x
-usr/share/man/man6/munch.6x
-usr/share/man/man6/nerverot.6x
-usr/share/man/man6/noseguy.6x
-usr/share/man/man6/pacman.6x
-usr/share/man/man6/pedal.6x
-usr/share/man/man6/penetrate.6x
-usr/share/man/man6/petri.6x
-usr/share/man/man6/phosphor.6x
-usr/share/man/man6/piecewise.6x
-usr/share/man/man6/polyominoes.6x
-usr/share/man/man6/pong.6x
-usr/share/man/man6/pyro.6x
-usr/share/man/man6/qix.6x
-usr/share/man/man6/rd-bomb.6x
-usr/share/man/man6/rocks.6x
-usr/share/man/man6/rorschach.6x
-usr/share/man/man6/rotor.6x
-usr/share/man/man6/rotzoomer.6x
-usr/share/man/man6/sierpinski.6x
-usr/share/man/man6/slip.6x
-usr/share/man/man6/speedmine.6x
-usr/share/man/man6/sphere.6x
-usr/share/man/man6/spiral.6x
-usr/share/man/man6/spotlight.6x
-usr/share/man/man6/squiral.6x
-usr/share/man/man6/starfish.6x
-usr/share/man/man6/strange.6x
-usr/share/man/man6/substrate.6x
-usr/share/man/man6/t3d.6x
-usr/share/man/man6/thornbird.6x
-usr/share/man/man6/triangle.6x
-usr/share/man/man6/truchet.6x
-usr/share/man/man6/twang.6x
-usr/share/man/man6/vermiculate.6x
-usr/share/man/man6/vidwhacker.6x
-usr/share/man/man6/vines.6x
-usr/share/man/man6/wander.6x
-usr/share/man/man6/webcollage.6x
-usr/share/man/man6/whirlwindwarp.6x
-usr/share/man/man6/whirlygig.6x
-usr/share/man/man6/worm.6x
-usr/share/man/man6/wormhole.6x
-usr/share/man/man6/xanalogtv.6x
-usr/share/man/man6/xflame.6x
-usr/share/man/man6/xjack.6x
-usr/share/man/man6/xmatrix.6x
-usr/share/man/man6/xrayswarm.6x
-usr/share/man/man6/xspirograph.6x
-usr/share/man/man6/xsublim.6x
-usr/share/man/man6/zoom.6x
-usr/share/xscreensaver/config/README
-usr/share/xscreensaver/config/anemone.xml
-usr/share/xscreensaver/config/anemotaxis.xml
-usr/share/xscreensaver/config/apollonian.xml
-usr/share/xscreensaver/config/apple2.xml
-usr/share/xscreensaver/config/attraction.xml
-usr/share/xscreensaver/config/barcode.xml
-usr/share/xscreensaver/config/blaster.xml
-usr/share/xscreensaver/config/blitspin.xml
-usr/share/xscreensaver/config/bouboule.xml
-usr/share/xscreensaver/config/boxfit.xml
-usr/share/xscreensaver/config/braid.xml
-usr/share/xscreensaver/config/bsod.xml
-usr/share/xscreensaver/config/bubbles.xml
-usr/share/xscreensaver/config/bumps.xml
-usr/share/xscreensaver/config/ccurve.xml
-usr/share/xscreensaver/config/celtic.xml
-usr/share/xscreensaver/config/cloudlife.xml
-usr/share/xscreensaver/config/compass.xml
-usr/share/xscreensaver/config/coral.xml
-usr/share/xscreensaver/config/critical.xml
-usr/share/xscreensaver/config/crystal.xml
-usr/share/xscreensaver/config/cynosure.xml
-usr/share/xscreensaver/config/decayscreen.xml
-usr/share/xscreensaver/config/deluxe.xml
-usr/share/xscreensaver/config/demon.xml
-usr/share/xscreensaver/config/discrete.xml
-usr/share/xscreensaver/config/drift.xml
-usr/share/xscreensaver/config/epicycle.xml
-usr/share/xscreensaver/config/eruption.xml
-usr/share/xscreensaver/config/euler2d.xml
-usr/share/xscreensaver/config/fadeplot.xml
-usr/share/xscreensaver/config/fireworkx.xml
-usr/share/xscreensaver/config/flag.xml
-usr/share/xscreensaver/config/flame.xml
-usr/share/xscreensaver/config/flow.xml
-usr/share/xscreensaver/config/fluidballs.xml
-usr/share/xscreensaver/config/fontglide.xml
-usr/share/xscreensaver/config/forest.xml
-usr/share/xscreensaver/config/goop.xml
-usr/share/xscreensaver/config/grav.xml
-usr/share/xscreensaver/config/greynetic.xml
-usr/share/xscreensaver/config/halftone.xml
-usr/share/xscreensaver/config/halo.xml
-usr/share/xscreensaver/config/helix.xml
-usr/share/xscreensaver/config/hopalong.xml
-usr/share/xscreensaver/config/hyperball.xml
-usr/share/xscreensaver/config/hypercube.xml
-usr/share/xscreensaver/config/ifs.xml
-usr/share/xscreensaver/config/imsmap.xml
-usr/share/xscreensaver/config/interaggregate.xml
-usr/share/xscreensaver/config/interference.xml
-usr/share/xscreensaver/config/intermomentary.xml
-usr/share/xscreensaver/config/jigsaw.xml
-usr/share/xscreensaver/config/juggle.xml
-usr/share/xscreensaver/config/julia.xml
-usr/share/xscreensaver/config/kaleidescope.xml
-usr/share/xscreensaver/config/kumppa.xml
-usr/share/xscreensaver/config/laser.xml
-usr/share/xscreensaver/config/lightning.xml
-usr/share/xscreensaver/config/lisa.xml
-usr/share/xscreensaver/config/lissie.xml
-usr/share/xscreensaver/config/lmorph.xml
-usr/share/xscreensaver/config/loop.xml
-usr/share/xscreensaver/config/maze.xml
-usr/share/xscreensaver/config/memscroller.xml
-usr/share/xscreensaver/config/mismunch.xml
-usr/share/xscreensaver/config/moire.xml
-usr/share/xscreensaver/config/moire2.xml
-usr/share/xscreensaver/config/mountain.xml
-usr/share/xscreensaver/config/munch.xml
-usr/share/xscreensaver/config/nerverot.xml
-usr/share/xscreensaver/config/noseguy.xml
-usr/share/xscreensaver/config/pacman.xml
-usr/share/xscreensaver/config/pedal.xml
-usr/share/xscreensaver/config/penetrate.xml
-usr/share/xscreensaver/config/petri.xml
-usr/share/xscreensaver/config/phosphor.xml
-usr/share/xscreensaver/config/piecewise.xml
-usr/share/xscreensaver/config/polyominoes.xml
-usr/share/xscreensaver/config/pong.xml
-usr/share/xscreensaver/config/pyro.xml
-usr/share/xscreensaver/config/qix.xml
-usr/share/xscreensaver/config/rd-bomb.xml
-usr/share/xscreensaver/config/rocks.xml
-usr/share/xscreensaver/config/rorschach.xml
-usr/share/xscreensaver/config/rotor.xml
-usr/share/xscreensaver/config/rotzoomer.xml
-usr/share/xscreensaver/config/sierpinski.xml
-usr/share/xscreensaver/config/slip.xml
-usr/share/xscreensaver/config/speedmine.xml
-usr/share/xscreensaver/config/sphere.xml
-usr/share/xscreensaver/config/spiral.xml
-usr/share/xscreensaver/config/spotlight.xml
-usr/share/xscreensaver/config/squiral.xml
-usr/share/xscreensaver/config/starfish.xml
-usr/share/xscreensaver/config/strange.xml
-usr/share/xscreensaver/config/substrate.xml
-usr/share/xscreensaver/config/t3d.xml
-usr/share/xscreensaver/config/thornbird.xml
-usr/share/xscreensaver/config/triangle.xml
-usr/share/xscreensaver/config/truchet.xml
-usr/share/xscreensaver/config/twang.xml
-usr/share/xscreensaver/config/vermiculate.xml
-usr/share/xscreensaver/config/vidwhacker.xml
-usr/share/xscreensaver/config/vines.xml
-usr/share/xscreensaver/config/wander.xml
-usr/share/xscreensaver/config/webcollage.xml
-usr/share/xscreensaver/config/whirlwindwarp.xml
-usr/share/xscreensaver/config/whirlygig.xml
-usr/share/xscreensaver/config/worm.xml
-usr/share/xscreensaver/config/wormhole.xml
-usr/share/xscreensaver/config/xanalogtv.xml
-usr/share/xscreensaver/config/xflame.xml
-usr/share/xscreensaver/config/xjack.xml
-usr/share/xscreensaver/config/xmatrix.xml
-usr/share/xscreensaver/config/xrayswarm.xml
-usr/share/xscreensaver/config/xspirograph.xml
-usr/share/xscreensaver/config/zoom.xml
-usr/share/applications/screensavers/anemone.desktop
-usr/share/applications/screensavers/anemotaxis.desktop
-usr/share/applications/screensavers/apollonian.desktop
-usr/share/applications/screensavers/apple2.desktop
-usr/share/applications/screensavers/attraction.desktop
-usr/share/applications/screensavers/barcode.desktop
-usr/share/applications/screensavers/blaster.desktop
-usr/share/applications/screensavers/blitspin.desktop
-usr/share/applications/screensavers/bouboule.desktop
-usr/share/applications/screensavers/boxfit.desktop
-usr/share/applications/screensavers/braid.desktop
-usr/share/applications/screensavers/bsod.desktop
-usr/share/applications/screensavers/bubbles.desktop
-usr/share/applications/screensavers/bumps.desktop
-usr/share/applications/screensavers/ccurve.desktop
-usr/share/applications/screensavers/celtic.desktop
-usr/share/applications/screensavers/cloudlife.desktop
-usr/share/applications/screensavers/compass.desktop
-usr/share/applications/screensavers/coral.desktop
-usr/share/applications/screensavers/critical.desktop
-usr/share/applications/screensavers/crystal.desktop
-usr/share/applications/screensavers/cynosure.desktop
-usr/share/applications/screensavers/decayscreen.desktop
-usr/share/applications/screensavers/deluxe.desktop
-usr/share/applications/screensavers/demon.desktop
-usr/share/applications/screensavers/discrete.desktop
-usr/share/applications/screensavers/drift.desktop
-usr/share/applications/screensavers/epicycle.desktop
-usr/share/applications/screensavers/eruption.desktop
-usr/share/applications/screensavers/euler2d.desktop
-usr/share/applications/screensavers/fadeplot.desktop
-usr/share/applications/screensavers/fireworkx.desktop
-usr/share/applications/screensavers/flag.desktop
-usr/share/applications/screensavers/flame.desktop
-usr/share/applications/screensavers/flow.desktop
-usr/share/applications/screensavers/fluidballs.desktop
-usr/share/applications/screensavers/fontglide.desktop
-usr/share/applications/screensavers/forest.desktop
-usr/share/applications/screensavers/goop.desktop
-usr/share/applications/screensavers/grav.desktop
-usr/share/applications/screensavers/greynetic.desktop
-usr/share/applications/screensavers/halftone.desktop
-usr/share/applications/screensavers/halo.desktop
-usr/share/applications/screensavers/helix.desktop
-usr/share/applications/screensavers/hopalong.desktop
-usr/share/applications/screensavers/hyperball.desktop
-usr/share/applications/screensavers/hypercube.desktop
-usr/share/applications/screensavers/ifs.desktop
-usr/share/applications/screensavers/imsmap.desktop
-usr/share/applications/screensavers/interaggregate.desktop
-usr/share/applications/screensavers/interference.desktop
-usr/share/applications/screensavers/intermomentary.desktop
-usr/share/applications/screensavers/jigsaw.desktop
-usr/share/applications/screensavers/juggle.desktop
-usr/share/applications/screensavers/julia.desktop
-usr/share/applications/screensavers/kaleidescope.desktop
-usr/share/applications/screensavers/kumppa.desktop
-usr/share/applications/screensavers/laser.desktop
-usr/share/applications/screensavers/lightning.desktop
-usr/share/applications/screensavers/lisa.desktop
-usr/share/applications/screensavers/lissie.desktop
-usr/share/applications/screensavers/lmorph.desktop
-usr/share/applications/screensavers/loop.desktop
-usr/share/applications/screensavers/maze.desktop
-usr/share/applications/screensavers/memscroller.desktop
-usr/share/applications/screensavers/mismunch.desktop
-usr/share/applications/screensavers/moire.desktop
-usr/share/applications/screensavers/moire2.desktop
-usr/share/applications/screensavers/mountain.desktop
-usr/share/applications/screensavers/munch.desktop
-usr/share/applications/screensavers/nerverot.desktop
-usr/share/applications/screensavers/noseguy.desktop
-usr/share/applications/screensavers/pacman.desktop
-usr/share/applications/screensavers/pedal.desktop
-usr/share/applications/screensavers/penetrate.desktop
-usr/share/applications/screensavers/petri.desktop
-usr/share/applications/screensavers/phosphor.desktop
-usr/share/applications/screensavers/piecewise.desktop
-usr/share/applications/screensavers/polyominoes.desktop
-usr/share/applications/screensavers/pong.desktop
-usr/share/applications/screensavers/pyro.desktop
-usr/share/applications/screensavers/qix.desktop
-usr/share/applications/screensavers/rd-bomb.desktop
-usr/share/applications/screensavers/rocks.desktop
-usr/share/applications/screensavers/rorschach.desktop
-usr/share/applications/screensavers/rotor.desktop
-usr/share/applications/screensavers/rotzoomer.desktop
-usr/share/applications/screensavers/sierpinski.desktop
-usr/share/applications/screensavers/slip.desktop
-usr/share/applications/screensavers/speedmine.desktop
-usr/share/applications/screensavers/sphere.desktop
-usr/share/applications/screensavers/spiral.desktop
-usr/share/applications/screensavers/spotlight.desktop
-usr/share/applications/screensavers/squiral.desktop
-usr/share/applications/screensavers/starfish.desktop
-usr/share/applications/screensavers/strange.desktop
-usr/share/applications/screensavers/substrate.desktop
-usr/share/applications/screensavers/t3d.desktop
-usr/share/applications/screensavers/thornbird.desktop
-usr/share/applications/screensavers/triangle.desktop
-usr/share/applications/screensavers/truchet.desktop
-usr/share/applications/screensavers/twang.desktop
-usr/share/applications/screensavers/vermiculate.desktop
-usr/share/applications/screensavers/vidwhacker.desktop
-usr/share/applications/screensavers/vines.desktop
-usr/share/applications/screensavers/wander.desktop
-usr/share/applications/screensavers/webcollage.desktop
-usr/share/applications/screensavers/whirlwindwarp.desktop
-usr/share/applications/screensavers/whirlygig.desktop
-usr/share/applications/screensavers/worm.desktop
-usr/share/applications/screensavers/wormhole.desktop
-usr/share/applications/screensavers/xanalogtv.desktop
-usr/share/applications/screensavers/xflame.desktop
-usr/share/applications/screensavers/xjack.desktop
-usr/share/applications/screensavers/xmatrix.desktop
-usr/share/applications/screensavers/xrayswarm.desktop
-usr/share/applications/screensavers/xspirograph.desktop
-usr/share/applications/screensavers/zoom.desktop
-usr/lib/xscreensaver/lcdscrub
-usr/share/xscreensaver/config/lcdscrub.xml
-usr/share/applications/screensavers/lcdscrub.desktop
diff --git a/xscreensaver/debian/xscreensaver-data.files b/xscreensaver/debian/xscreensaver-data.files
deleted file mode 100644
index b73c22d..0000000
--- a/xscreensaver/debian/xscreensaver-data.files
+++ /dev/null
@@ -1,71 +0,0 @@
-etc/X11/app-defaults/XScreenSaver
-usr/bin/xscreensaver-getimage
-usr/bin/xscreensaver-getimage-file
-usr/bin/xscreensaver-getimage-video
-usr/bin/xscreensaver-text
-usr/share/man/man1/xscreensaver-getimage-file.1
-usr/share/man/man1/xscreensaver-getimage-video.1
-usr/share/man/man1/xscreensaver-getimage.1
-usr/share/man/man1/xscreensaver-text.1
-usr/lib/xscreensaver/cwaves
-usr/lib/xscreensaver/deco
-usr/lib/xscreensaver/distort
-usr/lib/xscreensaver/fiberlamp
-usr/lib/xscreensaver/fuzzyflakes
-usr/lib/xscreensaver/galaxy
-usr/lib/xscreensaver/metaballs
-usr/lib/xscreensaver/penrose
-usr/lib/xscreensaver/popsquares
-usr/lib/xscreensaver/ripples
-usr/lib/xscreensaver/shadebobs
-usr/lib/xscreensaver/slidescreen
-usr/lib/xscreensaver/sonar
-usr/lib/xscreensaver/swirl
-usr/lib/xscreensaver/xlyap
-usr/lib/xscreensaver/abstractile
-usr/lib/xscreensaver/m6502
-usr/share/man/man6/cwaves.6x
-usr/share/man/man6/deco.6x
-usr/share/man/man6/distort.6x
-usr/share/man/man6/fiberlamp.6x
-usr/share/man/man6/fuzzyflakes.6x
-usr/share/man/man6/galaxy.6x
-usr/share/man/man6/metaballs.6x
-usr/share/man/man6/penrose.6x
-usr/share/man/man6/ripples.6x
-usr/share/man/man6/shadebobs.6x
-usr/share/man/man6/slidescreen.6x
-usr/share/man/man6/sonar.6x
-usr/share/man/man6/swirl.6x
-usr/share/man/man6/xlyap.6x
-usr/share/man/man6/abstractile.6x
-usr/share/xscreensaver/config/cwaves.xml
-usr/share/xscreensaver/config/deco.xml
-usr/share/xscreensaver/config/distort.xml
-usr/share/xscreensaver/config/fiberlamp.xml
-usr/share/xscreensaver/config/fuzzyflakes.xml
-usr/share/xscreensaver/config/galaxy.xml
-usr/share/xscreensaver/config/metaballs.xml
-usr/share/xscreensaver/config/penrose.xml
-usr/share/xscreensaver/config/popsquares.xml
-usr/share/xscreensaver/config/ripples.xml
-usr/share/xscreensaver/config/shadebobs.xml
-usr/share/xscreensaver/config/slidescreen.xml
-usr/share/xscreensaver/config/sonar.xml
-usr/share/xscreensaver/config/swirl.xml
-usr/share/xscreensaver/config/xlyap.xml
-usr/share/xscreensaver/config/abstractile.xml
-usr/share/xscreensaver/config/m6502.xml
-usr/share/applications/screensavers/deco.desktop
-usr/share/applications/screensavers/distort.desktop
-usr/share/applications/screensavers/fiberlamp.desktop
-usr/share/applications/screensavers/fuzzyflakes.desktop
-usr/share/applications/screensavers/galaxy.desktop
-usr/share/applications/screensavers/metaballs.desktop
-usr/share/applications/screensavers/penrose.desktop
-usr/share/applications/screensavers/ripples.desktop
-usr/share/applications/screensavers/shadebobs.desktop
-usr/share/applications/screensavers/slidescreen.desktop
-usr/share/applications/screensavers/sonar.desktop
-usr/share/applications/screensavers/swirl.desktop
-usr/share/applications/screensavers/xlyap.desktop
diff --git a/xscreensaver/debian/xscreensaver-gl.dirs b/xscreensaver/debian/xscreensaver-gl.dirs
deleted file mode 100644
index 8f0df1f..0000000
--- a/xscreensaver/debian/xscreensaver-gl.dirs
+++ /dev/null
@@ -1 +0,0 @@
-etc/X11/app-defaults
diff --git a/xscreensaver/debian/xscreensaver.files b/xscreensaver/debian/xscreensaver.files
index ee13f56..35868e1 100644
--- a/xscreensaver/debian/xscreensaver.files
+++ b/xscreensaver/debian/xscreensaver.files
@@ -37,3 +37,555 @@ usr/share/xscreensaver/glade/screensaver-locking.png
 usr/share/xscreensaver/glade/screensaver-power.png
 usr/share/xscreensaver/glade/screensaver-snap.png
 usr/share/xscreensaver/glade/xscreensaver-demo.glade2
+usr/lib/xscreensaver/anemone
+usr/lib/xscreensaver/anemotaxis
+usr/lib/xscreensaver/apollonian
+usr/lib/xscreensaver/apple2
+usr/lib/xscreensaver/attraction
+usr/lib/xscreensaver/barcode
+usr/lib/xscreensaver/blaster
+usr/lib/xscreensaver/blitspin
+usr/lib/xscreensaver/bouboule
+usr/lib/xscreensaver/boxfit
+usr/lib/xscreensaver/braid
+usr/lib/xscreensaver/bsod
+usr/lib/xscreensaver/bubbles
+usr/lib/xscreensaver/bumps
+usr/lib/xscreensaver/ccurve
+usr/lib/xscreensaver/celtic
+usr/lib/xscreensaver/cloudlife
+usr/lib/xscreensaver/compass
+usr/lib/xscreensaver/coral
+usr/lib/xscreensaver/critical
+usr/lib/xscreensaver/crystal
+usr/lib/xscreensaver/cynosure
+usr/lib/xscreensaver/decayscreen
+usr/lib/xscreensaver/deluxe
+usr/lib/xscreensaver/demon
+usr/lib/xscreensaver/discrete
+usr/lib/xscreensaver/drift
+usr/lib/xscreensaver/epicycle
+usr/lib/xscreensaver/eruption
+usr/lib/xscreensaver/euler2d
+usr/lib/xscreensaver/fadeplot
+usr/lib/xscreensaver/fireworkx
+usr/lib/xscreensaver/flag
+usr/lib/xscreensaver/flame
+usr/lib/xscreensaver/flow
+usr/lib/xscreensaver/fluidballs
+usr/lib/xscreensaver/fontglide
+usr/lib/xscreensaver/forest
+usr/lib/xscreensaver/goop
+usr/lib/xscreensaver/grav
+usr/lib/xscreensaver/greynetic
+usr/lib/xscreensaver/halftone
+usr/lib/xscreensaver/halo
+usr/lib/xscreensaver/helix
+usr/lib/xscreensaver/hopalong
+usr/lib/xscreensaver/hyperball
+usr/lib/xscreensaver/hypercube
+usr/lib/xscreensaver/ifs
+usr/lib/xscreensaver/imsmap
+usr/lib/xscreensaver/interaggregate
+usr/lib/xscreensaver/interference
+usr/lib/xscreensaver/intermomentary
+usr/lib/xscreensaver/jigsaw
+usr/lib/xscreensaver/juggle
+usr/lib/xscreensaver/julia
+usr/lib/xscreensaver/kaleidescope
+usr/lib/xscreensaver/kumppa
+usr/lib/xscreensaver/laser
+usr/lib/xscreensaver/lightning
+usr/lib/xscreensaver/lisa
+usr/lib/xscreensaver/lissie
+usr/lib/xscreensaver/ljlatest
+usr/lib/xscreensaver/lmorph
+usr/lib/xscreensaver/loop
+usr/lib/xscreensaver/maze
+usr/lib/xscreensaver/memscroller
+usr/lib/xscreensaver/mismunch
+usr/lib/xscreensaver/moire
+usr/lib/xscreensaver/moire2
+usr/lib/xscreensaver/mountain
+usr/lib/xscreensaver/munch
+usr/lib/xscreensaver/nerverot
+usr/lib/xscreensaver/noseguy
+usr/lib/xscreensaver/pacman
+usr/lib/xscreensaver/pedal
+usr/lib/xscreensaver/penetrate
+usr/lib/xscreensaver/petri
+usr/lib/xscreensaver/phosphor
+usr/lib/xscreensaver/piecewise
+usr/lib/xscreensaver/polyominoes
+usr/lib/xscreensaver/pong
+usr/lib/xscreensaver/pyro
+usr/lib/xscreensaver/qix
+usr/lib/xscreensaver/rd-bomb
+usr/lib/xscreensaver/rocks
+usr/lib/xscreensaver/rorschach
+usr/lib/xscreensaver/rotor
+usr/lib/xscreensaver/rotzoomer
+usr/lib/xscreensaver/sierpinski
+usr/lib/xscreensaver/slip
+usr/lib/xscreensaver/speedmine
+usr/lib/xscreensaver/sphere
+usr/lib/xscreensaver/spiral
+usr/lib/xscreensaver/spotlight
+usr/lib/xscreensaver/squiral
+usr/lib/xscreensaver/starfish
+usr/lib/xscreensaver/strange
+usr/lib/xscreensaver/substrate
+usr/lib/xscreensaver/t3d
+usr/lib/xscreensaver/thornbird
+usr/lib/xscreensaver/triangle
+usr/lib/xscreensaver/truchet
+usr/lib/xscreensaver/twang
+usr/lib/xscreensaver/vermiculate
+usr/lib/xscreensaver/vidwhacker
+usr/lib/xscreensaver/vines
+usr/lib/xscreensaver/wander
+usr/lib/xscreensaver/webcollage
+usr/lib/xscreensaver/webcollage-helper
+usr/lib/xscreensaver/whirlwindwarp
+usr/lib/xscreensaver/whirlygig
+usr/lib/xscreensaver/worm
+usr/lib/xscreensaver/wormhole
+usr/lib/xscreensaver/xanalogtv
+usr/lib/xscreensaver/xflame
+usr/lib/xscreensaver/xjack
+usr/lib/xscreensaver/xmatrix
+usr/lib/xscreensaver/xrayswarm
+usr/lib/xscreensaver/xspirograph
+usr/lib/xscreensaver/xsublim
+usr/lib/xscreensaver/zoom
+usr/share/man/man6/anemone.6x
+usr/share/man/man6/anemotaxis.6x
+usr/share/man/man6/apollonian.6x
+usr/share/man/man6/apple2.6x
+usr/share/man/man6/attraction.6x
+usr/share/man/man6/barcode.6x
+usr/share/man/man6/blaster.6x
+usr/share/man/man6/blitspin.6x
+usr/share/man/man6/bouboule.6x
+usr/share/man/man6/boxfit.6x
+usr/share/man/man6/braid.6x
+usr/share/man/man6/bsod.6x
+usr/share/man/man6/bubbles.6x
+usr/share/man/man6/bumps.6x
+usr/share/man/man6/celtic.6x
+usr/share/man/man6/ccurve.6x
+usr/share/man/man6/cloudlife.6x
+usr/share/man/man6/compass.6x
+usr/share/man/man6/coral.6x
+usr/share/man/man6/critical.6x
+usr/share/man/man6/crystal.6x
+usr/share/man/man6/cynosure.6x
+usr/share/man/man6/decayscreen.6x
+usr/share/man/man6/deluxe.6x
+usr/share/man/man6/demon.6x
+usr/share/man/man6/discrete.6x
+usr/share/man/man6/drift.6x
+usr/share/man/man6/epicycle.6x
+usr/share/man/man6/eruption.6x
+usr/share/man/man6/euler2d.6x
+usr/share/man/man6/fadeplot.6x
+usr/share/man/man6/fireworkx.6x
+usr/share/man/man6/flag.6x
+usr/share/man/man6/flame.6x
+usr/share/man/man6/flow.6x
+usr/share/man/man6/fluidballs.6x
+usr/share/man/man6/fontglide.6x
+usr/share/man/man6/forest.6x
+usr/share/man/man6/goop.6x
+usr/share/man/man6/grav.6x
+usr/share/man/man6/greynetic.6x
+usr/share/man/man6/halftone.6x
+usr/share/man/man6/halo.6x
+usr/share/man/man6/helix.6x
+usr/share/man/man6/hopalong.6x
+usr/share/man/man6/hyperball.6x
+usr/share/man/man6/hypercube.6x
+usr/share/man/man6/ifs.6x
+usr/share/man/man6/imsmap.6x
+usr/share/man/man6/interaggregate.6x
+usr/share/man/man6/interference.6x
+usr/share/man/man6/intermomentary.6x
+usr/share/man/man6/jigsaw.6x
+usr/share/man/man6/juggle.6x
+usr/share/man/man6/julia.6x
+usr/share/man/man6/kaleidescope.6x
+usr/share/man/man6/kumppa.6x
+usr/share/man/man6/laser.6x
+usr/share/man/man6/lightning.6x
+usr/share/man/man6/lisa.6x
+usr/share/man/man6/lissie.6x
+usr/share/man/man6/ljlatest.6x
+usr/share/man/man6/lmorph.6x
+usr/share/man/man6/loop.6x
+usr/share/man/man6/maze.6x
+usr/share/man/man6/memscroller.6x
+usr/share/man/man6/mismunch.6x
+usr/share/man/man6/moire.6x
+usr/share/man/man6/moire2.6x
+usr/share/man/man6/mountain.6x
+usr/share/man/man6/munch.6x
+usr/share/man/man6/nerverot.6x
+usr/share/man/man6/noseguy.6x
+usr/share/man/man6/pacman.6x
+usr/share/man/man6/pedal.6x
+usr/share/man/man6/penetrate.6x
+usr/share/man/man6/petri.6x
+usr/share/man/man6/phosphor.6x
+usr/share/man/man6/piecewise.6x
+usr/share/man/man6/polyominoes.6x
+usr/share/man/man6/pong.6x
+usr/share/man/man6/pyro.6x
+usr/share/man/man6/qix.6x
+usr/share/man/man6/rd-bomb.6x
+usr/share/man/man6/rocks.6x
+usr/share/man/man6/rorschach.6x
+usr/share/man/man6/rotor.6x
+usr/share/man/man6/rotzoomer.6x
+usr/share/man/man6/sierpinski.6x
+usr/share/man/man6/slip.6x
+usr/share/man/man6/speedmine.6x
+usr/share/man/man6/sphere.6x
+usr/share/man/man6/spiral.6x
+usr/share/man/man6/spotlight.6x
+usr/share/man/man6/squiral.6x
+usr/share/man/man6/starfish.6x
+usr/share/man/man6/strange.6x
+usr/share/man/man6/substrate.6x
+usr/share/man/man6/t3d.6x
+usr/share/man/man6/thornbird.6x
+usr/share/man/man6/triangle.6x
+usr/share/man/man6/truchet.6x
+usr/share/man/man6/twang.6x
+usr/share/man/man6/vermiculate.6x
+usr/share/man/man6/vidwhacker.6x
+usr/share/man/man6/vines.6x
+usr/share/man/man6/wander.6x
+usr/share/man/man6/webcollage.6x
+usr/share/man/man6/whirlwindwarp.6x
+usr/share/man/man6/whirlygig.6x
+usr/share/man/man6/worm.6x
+usr/share/man/man6/wormhole.6x
+usr/share/man/man6/xanalogtv.6x
+usr/share/man/man6/xflame.6x
+usr/share/man/man6/xjack.6x
+usr/share/man/man6/xmatrix.6x
+usr/share/man/man6/xrayswarm.6x
+usr/share/man/man6/xspirograph.6x
+usr/share/man/man6/xsublim.6x
+usr/share/man/man6/zoom.6x
+usr/share/xscreensaver/config/README
+usr/share/xscreensaver/config/anemone.xml
+usr/share/xscreensaver/config/anemotaxis.xml
+usr/share/xscreensaver/config/apollonian.xml
+usr/share/xscreensaver/config/apple2.xml
+usr/share/xscreensaver/config/attraction.xml
+usr/share/xscreensaver/config/barcode.xml
+usr/share/xscreensaver/config/blaster.xml
+usr/share/xscreensaver/config/blitspin.xml
+usr/share/xscreensaver/config/bouboule.xml
+usr/share/xscreensaver/config/boxfit.xml
+usr/share/xscreensaver/config/braid.xml
+usr/share/xscreensaver/config/bsod.xml
+usr/share/xscreensaver/config/bubbles.xml
+usr/share/xscreensaver/config/bumps.xml
+usr/share/xscreensaver/config/ccurve.xml
+usr/share/xscreensaver/config/celtic.xml
+usr/share/xscreensaver/config/cloudlife.xml
+usr/share/xscreensaver/config/compass.xml
+usr/share/xscreensaver/config/coral.xml
+usr/share/xscreensaver/config/critical.xml
+usr/share/xscreensaver/config/crystal.xml
+usr/share/xscreensaver/config/cynosure.xml
+usr/share/xscreensaver/config/decayscreen.xml
+usr/share/xscreensaver/config/deluxe.xml
+usr/share/xscreensaver/config/demon.xml
+usr/share/xscreensaver/config/discrete.xml
+usr/share/xscreensaver/config/drift.xml
+usr/share/xscreensaver/config/epicycle.xml
+usr/share/xscreensaver/config/eruption.xml
+usr/share/xscreensaver/config/euler2d.xml
+usr/share/xscreensaver/config/fadeplot.xml
+usr/share/xscreensaver/config/fireworkx.xml
+usr/share/xscreensaver/config/flag.xml
+usr/share/xscreensaver/config/flame.xml
+usr/share/xscreensaver/config/flow.xml
+usr/share/xscreensaver/config/fluidballs.xml
+usr/share/xscreensaver/config/fontglide.xml
+usr/share/xscreensaver/config/forest.xml
+usr/share/xscreensaver/config/goop.xml
+usr/share/xscreensaver/config/grav.xml
+usr/share/xscreensaver/config/greynetic.xml
+usr/share/xscreensaver/config/halftone.xml
+usr/share/xscreensaver/config/halo.xml
+usr/share/xscreensaver/config/helix.xml
+usr/share/xscreensaver/config/hopalong.xml
+usr/share/xscreensaver/config/hyperball.xml
+usr/share/xscreensaver/config/hypercube.xml
+usr/share/xscreensaver/config/ifs.xml
+usr/share/xscreensaver/config/imsmap.xml
+usr/share/xscreensaver/config/interaggregate.xml
+usr/share/xscreensaver/config/interference.xml
+usr/share/xscreensaver/config/intermomentary.xml
+usr/share/xscreensaver/config/jigsaw.xml
+usr/share/xscreensaver/config/juggle.xml
+usr/share/xscreensaver/config/julia.xml
+usr/share/xscreensaver/config/kaleidescope.xml
+usr/share/xscreensaver/config/kumppa.xml
+usr/share/xscreensaver/config/laser.xml
+usr/share/xscreensaver/config/lightning.xml
+usr/share/xscreensaver/config/lisa.xml
+usr/share/xscreensaver/config/lissie.xml
+usr/share/xscreensaver/config/lmorph.xml
+usr/share/xscreensaver/config/loop.xml
+usr/share/xscreensaver/config/maze.xml
+usr/share/xscreensaver/config/memscroller.xml
+usr/share/xscreensaver/config/mismunch.xml
+usr/share/xscreensaver/config/moire.xml
+usr/share/xscreensaver/config/moire2.xml
+usr/share/xscreensaver/config/mountain.xml
+usr/share/xscreensaver/config/munch.xml
+usr/share/xscreensaver/config/nerverot.xml
+usr/share/xscreensaver/config/noseguy.xml
+usr/share/xscreensaver/config/pacman.xml
+usr/share/xscreensaver/config/pedal.xml
+usr/share/xscreensaver/config/penetrate.xml
+usr/share/xscreensaver/config/petri.xml
+usr/share/xscreensaver/config/phosphor.xml
+usr/share/xscreensaver/config/piecewise.xml
+usr/share/xscreensaver/config/polyominoes.xml
+usr/share/xscreensaver/config/pong.xml
+usr/share/xscreensaver/config/pyro.xml
+usr/share/xscreensaver/config/qix.xml
+usr/share/xscreensaver/config/rd-bomb.xml
+usr/share/xscreensaver/config/rocks.xml
+usr/share/xscreensaver/config/rorschach.xml
+usr/share/xscreensaver/config/rotor.xml
+usr/share/xscreensaver/config/rotzoomer.xml
+usr/share/xscreensaver/config/sierpinski.xml
+usr/share/xscreensaver/config/slip.xml
+usr/share/xscreensaver/config/speedmine.xml
+usr/share/xscreensaver/config/sphere.xml
+usr/share/xscreensaver/config/spiral.xml
+usr/share/xscreensaver/config/spotlight.xml
+usr/share/xscreensaver/config/squiral.xml
+usr/share/xscreensaver/config/starfish.xml
+usr/share/xscreensaver/config/strange.xml
+usr/share/xscreensaver/config/substrate.xml
+usr/share/xscreensaver/config/t3d.xml
+usr/share/xscreensaver/config/thornbird.xml
+usr/share/xscreensaver/config/triangle.xml
+usr/share/xscreensaver/config/truchet.xml
+usr/share/xscreensaver/config/twang.xml
+usr/share/xscreensaver/config/vermiculate.xml
+usr/share/xscreensaver/config/vidwhacker.xml
+usr/share/xscreensaver/config/vines.xml
+usr/share/xscreensaver/config/wander.xml
+usr/share/xscreensaver/config/webcollage.xml
+usr/share/xscreensaver/config/whirlwindwarp.xml
+usr/share/xscreensaver/config/whirlygig.xml
+usr/share/xscreensaver/config/worm.xml
+usr/share/xscreensaver/config/wormhole.xml
+usr/share/xscreensaver/config/xanalogtv.xml
+usr/share/xscreensaver/config/xflame.xml
+usr/share/xscreensaver/config/xjack.xml
+usr/share/xscreensaver/config/xmatrix.xml
+usr/share/xscreensaver/config/xrayswarm.xml
+usr/share/xscreensaver/config/xspirograph.xml
+usr/share/xscreensaver/config/zoom.xml
+usr/share/applications/screensavers/anemone.desktop
+usr/share/applications/screensavers/anemotaxis.desktop
+usr/share/applications/screensavers/apollonian.desktop
+usr/share/applications/screensavers/apple2.desktop
+usr/share/applications/screensavers/attraction.desktop
+usr/share/applications/screensavers/barcode.desktop
+usr/share/applications/screensavers/blaster.desktop
+usr/share/applications/screensavers/blitspin.desktop
+usr/share/applications/screensavers/bouboule.desktop
+usr/share/applications/screensavers/boxfit.desktop
+usr/share/applications/screensavers/braid.desktop
+usr/share/applications/screensavers/bsod.desktop
+usr/share/applications/screensavers/bubbles.desktop
+usr/share/applications/screensavers/bumps.desktop
+usr/share/applications/screensavers/ccurve.desktop
+usr/share/applications/screensavers/celtic.desktop
+usr/share/applications/screensavers/cloudlife.desktop
+usr/share/applications/screensavers/compass.desktop
+usr/share/applications/screensavers/coral.desktop
+usr/share/applications/screensavers/critical.desktop
+usr/share/applications/screensavers/crystal.desktop
+usr/share/applications/screensavers/cynosure.desktop
+usr/share/applications/screensavers/decayscreen.desktop
+usr/share/applications/screensavers/deluxe.desktop
+usr/share/applications/screensavers/demon.desktop
+usr/share/applications/screensavers/discrete.desktop
+usr/share/applications/screensavers/drift.desktop
+usr/share/applications/screensavers/epicycle.desktop
+usr/share/applications/screensavers/eruption.desktop
+usr/share/applications/screensavers/euler2d.desktop
+usr/share/applications/screensavers/fadeplot.desktop
+usr/share/applications/screensavers/fireworkx.desktop
+usr/share/applications/screensavers/flag.desktop
+usr/share/applications/screensavers/flame.desktop
+usr/share/applications/screensavers/flow.desktop
+usr/share/applications/screensavers/fluidballs.desktop
+usr/share/applications/screensavers/fontglide.desktop
+usr/share/applications/screensavers/forest.desktop
+usr/share/applications/screensavers/goop.desktop
+usr/share/applications/screensavers/grav.desktop
+usr/share/applications/screensavers/greynetic.desktop
+usr/share/applications/screensavers/halftone.desktop
+usr/share/applications/screensavers/halo.desktop
+usr/share/applications/screensavers/helix.desktop
+usr/share/applications/screensavers/hopalong.desktop
+usr/share/applications/screensavers/hyperball.desktop
+usr/share/applications/screensavers/hypercube.desktop
+usr/share/applications/screensavers/ifs.desktop
+usr/share/applications/screensavers/imsmap.desktop
+usr/share/applications/screensavers/interaggregate.desktop
+usr/share/applications/screensavers/interference.desktop
+usr/share/applications/screensavers/intermomentary.desktop
+usr/share/applications/screensavers/jigsaw.desktop
+usr/share/applications/screensavers/juggle.desktop
+usr/share/applications/screensavers/julia.desktop
+usr/share/applications/screensavers/kaleidescope.desktop
+usr/share/applications/screensavers/kumppa.desktop
+usr/share/applications/screensavers/laser.desktop
+usr/share/applications/screensavers/lightning.desktop
+usr/share/applications/screensavers/lisa.desktop
+usr/share/applications/screensavers/lissie.desktop
+usr/share/applications/screensavers/lmorph.desktop
+usr/share/applications/screensavers/loop.desktop
+usr/share/applications/screensavers/maze.desktop
+usr/share/applications/screensavers/memscroller.desktop
+usr/share/applications/screensavers/mismunch.desktop
+usr/share/applications/screensavers/moire.desktop
+usr/share/applications/screensavers/moire2.desktop
+usr/share/applications/screensavers/mountain.desktop
+usr/share/applications/screensavers/munch.desktop
+usr/share/applications/screensavers/nerverot.desktop
+usr/share/applications/screensavers/noseguy.desktop
+usr/share/applications/screensavers/pacman.desktop
+usr/share/applications/screensavers/pedal.desktop
+usr/share/applications/screensavers/penetrate.desktop
+usr/share/applications/screensavers/petri.desktop
+usr/share/applications/screensavers/phosphor.desktop
+usr/share/applications/screensavers/piecewise.desktop
+usr/share/applications/screensavers/polyominoes.desktop
+usr/share/applications/screensavers/pong.desktop
+usr/share/applications/screensavers/pyro.desktop
+usr/share/applications/screensavers/qix.desktop
+usr/share/applications/screensavers/rd-bomb.desktop
+usr/share/applications/screensavers/rocks.desktop
+usr/share/applications/screensavers/rorschach.desktop
+usr/share/applications/screensavers/rotor.desktop
+usr/share/applications/screensavers/rotzoomer.desktop
+usr/share/applications/screensavers/sierpinski.desktop
+usr/share/applications/screensavers/slip.desktop
+usr/share/applications/screensavers/speedmine.desktop
+usr/share/applications/screensavers/sphere.desktop
+usr/share/applications/screensavers/spiral.desktop
+usr/share/applications/screensavers/spotlight.desktop
+usr/share/applications/screensavers/squiral.desktop
+usr/share/applications/screensavers/starfish.desktop
+usr/share/applications/screensavers/strange.desktop
+usr/share/applications/screensavers/substrate.desktop
+usr/share/applications/screensavers/t3d.desktop
+usr/share/applications/screensavers/thornbird.desktop
+usr/share/applications/screensavers/triangle.desktop
+usr/share/applications/screensavers/truchet.desktop
+usr/share/applications/screensavers/twang.desktop
+usr/share/applications/screensavers/vermiculate.desktop
+usr/share/applications/screensavers/vidwhacker.desktop
+usr/share/applications/screensavers/vines.desktop
+usr/share/applications/screensavers/wander.desktop
+usr/share/applications/screensavers/webcollage.desktop
+usr/share/applications/screensavers/whirlwindwarp.desktop
+usr/share/applications/screensavers/whirlygig.desktop
+usr/share/applications/screensavers/worm.desktop
+usr/share/applications/screensavers/wormhole.desktop
+usr/share/applications/screensavers/xanalogtv.desktop
+usr/share/applications/screensavers/xflame.desktop
+usr/share/applications/screensavers/xjack.desktop
+usr/share/applications/screensavers/xmatrix.desktop
+usr/share/applications/screensavers/xrayswarm.desktop
+usr/share/applications/screensavers/xspirograph.desktop
+usr/share/applications/screensavers/zoom.desktop
+usr/lib/xscreensaver/lcdscrub
+usr/share/xscreensaver/config/lcdscrub.xml
+usr/share/applications/screensavers/lcdscrub.desktop
+etc/X11/app-defaults/XScreenSaver
+usr/bin/xscreensaver-getimage
+usr/bin/xscreensaver-getimage-file
+usr/bin/xscreensaver-getimage-video
+usr/bin/xscreensaver-text
+usr/share/man/man1/xscreensaver-getimage-file.1
+usr/share/man/man1/xscreensaver-getimage-video.1
+usr/share/man/man1/xscreensaver-getimage.1
+usr/share/man/man1/xscreensaver-text.1
+usr/lib/xscreensaver/cwaves
+usr/lib/xscreensaver/deco
+usr/lib/xscreensaver/distort
+usr/lib/xscreensaver/fiberlamp
+usr/lib/xscreensaver/fuzzyflakes
+usr/lib/xscreensaver/galaxy
+usr/lib/xscreensaver/metaballs
+usr/lib/xscreensaver/penrose
+usr/lib/xscreensaver/popsquares
+usr/lib/xscreensaver/ripples
+usr/lib/xscreensaver/shadebobs
+usr/lib/xscreensaver/slidescreen
+usr/lib/xscreensaver/sonar
+usr/lib/xscreensaver/swirl
+usr/lib/xscreensaver/xlyap
+usr/lib/xscreensaver/abstractile
+usr/lib/xscreensaver/m6502
+usr/share/man/man6/cwaves.6x
+usr/share/man/man6/deco.6x
+usr/share/man/man6/distort.6x
+usr/share/man/man6/fiberlamp.6x
+usr/share/man/man6/fuzzyflakes.6x
+usr/share/man/man6/galaxy.6x
+usr/share/man/man6/metaballs.6x
+usr/share/man/man6/penrose.6x
+usr/share/man/man6/ripples.6x
+usr/share/man/man6/shadebobs.6x
+usr/share/man/man6/slidescreen.6x
+usr/share/man/man6/sonar.6x
+usr/share/man/man6/swirl.6x
+usr/share/man/man6/xlyap.6x
+usr/share/man/man6/abstractile.6x
+usr/share/xscreensaver/config/cwaves.xml
+usr/share/xscreensaver/config/deco.xml
+usr/share/xscreensaver/config/distort.xml
+usr/share/xscreensaver/config/fiberlamp.xml
+usr/share/xscreensaver/config/fuzzyflakes.xml
+usr/share/xscreensaver/config/galaxy.xml
+usr/share/xscreensaver/config/metaballs.xml
+usr/share/xscreensaver/config/penrose.xml
+usr/share/xscreensaver/config/popsquares.xml
+usr/share/xscreensaver/config/ripples.xml
+usr/share/xscreensaver/config/shadebobs.xml
+usr/share/xscreensaver/config/slidescreen.xml
+usr/share/xscreensaver/config/sonar.xml
+usr/share/xscreensaver/config/swirl.xml
+usr/share/xscreensaver/config/xlyap.xml
+usr/share/xscreensaver/config/abstractile.xml
+usr/share/xscreensaver/config/m6502.xml
+usr/share/applications/screensavers/deco.desktop
+usr/share/applications/screensavers/distort.desktop
+usr/share/applications/screensavers/fiberlamp.desktop
+usr/share/applications/screensavers/fuzzyflakes.desktop
+usr/share/applications/screensavers/galaxy.desktop
+usr/share/applications/screensavers/metaballs.desktop
+usr/share/applications/screensavers/penrose.desktop
+usr/share/applications/screensavers/ripples.desktop
+usr/share/applications/screensavers/shadebobs.desktop
+usr/share/applications/screensavers/slidescreen.desktop
+usr/share/applications/screensavers/sonar.desktop
+usr/share/applications/screensavers/swirl.desktop
+usr/share/applications/screensavers/xlyap.desktop
diff --git a/xscreensaver/driver/XScreenSaver_ad.h b/xscreensaver/driver/XScreenSaver_ad.h
index 73c586c..e556203 100644
--- a/xscreensaver/driver/XScreenSaver_ad.h
+++ b/xscreensaver/driver/XScreenSaver_ad.h
@@ -12,8 +12,8 @@
 "*dpmsOff:		4:00:00",
 "*grabDesktopImages:	True",
 "*grabVideoFrames:	False",
-"*chooseRandomImages:	False",
-"*imageDirectory:	",
+"*chooseRandomImages:	True",
+"*imageDirectory:	/Library/Desktop Pictures/",
 "*nice:			10",
 "*memoryLimit:		0",
 "*lock:			False",
@@ -30,9 +30,9 @@
 "*ignoreUninstalledPrograms: False",
 "*textMode:		file",
 "*textLiteral:		XScreenSaver",
-"*textFile:		/usr/share/doc/xserver-xorg-core/copyright",
+"*textFile:		",
 "*textProgram:		fortune",
-"*textURL:		http://planet.debian.org/rss20.xml",
+"*textURL:		http://www.livejournal.com/stats/latest-rss.bml",
 "*overlayTextForeground:	#FFFF00",
 "*overlayTextBackground:	#000000",
 "*overlayStderr:		True",
@@ -44,14 +44,10 @@
 "*demoCommand: xscreensaver-demo",
 "*prefsCommand: xscreensaver-demo -prefs",
 "*helpURL: http://www.jwz.org/xscreensaver/man.html",
-"*loadURL: x-www-browser '%s'",
-"*manualCommand: x-terminal-emulator -title '%s manual' \
-		-e '/bin/sh -c \"man %s; read foo\"'",
-"*loadURL: x-www-browser '%s'",
-"*manualCommand: x-terminal-emulator -title '%s manual' \
-		--command '/bin/sh -c \"man %s; read foo\"'",
+"*loadURL: firefox '%s' || mozilla '%s' || netscape '%s'",
+"*manualCommand: xterm -sb -fg black -bg gray75 -T '%s manual' \
+		    -e /bin/sh -c 'man \"%s\" ; read foo'",
 "*dateFormat:		%d-%b-%y (%a); %I:%M %p",
-"*newLoginCommand:	gdmflexiserver -l -a -c FLEXI_XSERVER",
 "*installColormap:	True",
 "*programs:								      \
 		 \"Qix (solid)\" 	qix -root -solid -segments 100		    \\n\
@@ -217,94 +213,94 @@
 				  'vidwhacker -stdin -stdout'		    \\n\
 - default-n:			vidwhacker -root			    \\n\
 									      \
--	   GL:			gears -root				    \\n\
--	   GL:			superquadrics -root			    \\n\
--	   GL:			morph3d -root				    \\n\
--	   GL:			cage -root				    \\n\
--	   GL:			moebius -root				    \\n\
--	   GL:			stairs -root				    \\n\
--	   GL:			pipes -root				    \\n\
--	   GL:			sproingies -root			    \\n\
--	   GL:			rubik -root				    \\n\
--	   GL:			atlantis -root				    \\n\
--	   GL:			lament -root				    \\n\
--	   GL:			bubble3d -root				    \\n\
--	   GL:			glplanet -root				    \\n\
--	   GL:			flurry -root				    \\n\
--	   GL:			pulsar -root				    \\n\
+	   GL:			gears -root				    \\n\
+	   GL:			superquadrics -root			    \\n\
+	   GL:			morph3d -root				    \\n\
+	   GL:			cage -root				    \\n\
+	   GL:			moebius -root				    \\n\
+	   GL:			stairs -root				    \\n\
+	   GL:			pipes -root				    \\n\
+	   GL:			sproingies -root			    \\n\
+	   GL:			rubik -root				    \\n\
+	   GL:			atlantis -root				    \\n\
+	   GL:			lament -root				    \\n\
+	   GL:			bubble3d -root				    \\n\
+	   GL:			glplanet -root				    \\n\
+	   GL:			flurry -root				    \\n\
+	   GL:			pulsar -root				    \\n\
 -	   GL:	   \"Pulsar (textures)\"					      \
 				  pulsar -root -texture -mipmap		      \
 				  -texture_quality -light -fog		    \\n\
 -	   GL:			extrusion -root				    \\n\
--	   GL:			sierpinski3d -root			    \\n\
--	   GL:			menger -root				    \\n\
--	   GL:	 		gflux -root				    \\n\
--	   GL:	 \"GFlux (grab)\"	gflux -root -mode grab			    \\n\
--	   GL:			stonerview -root			    \\n\
--	   GL:			starwars -root				    \\n\
--	   GL:			gltext -root				    \\n\
--	   GL:	\"GLText (clock)\" gltext -text \"%A%n%d %b %Y%n%r\" -root	    \\n\
--	   GL:	 		molecule -root				    \\n\
--	   GL:			dangerball -root			    \\n\
--	   GL:			circuit -root				    \\n\
--	   GL:			engine -root				    \\n\
--	   GL:			flipscreen3d -root			    \\n\
--	   GL:			glsnake -root				    \\n\
--	   GL:			boxed -root				    \\n\
+	   GL:			sierpinski3d -root			    \\n\
+	   GL:			menger -root				    \\n\
+	   GL:	 		gflux -root				    \\n\
+	   GL:	 \"GFlux (grab)\"	gflux -root -mode grab			    \\n\
+	   GL:			stonerview -root			    \\n\
+	   GL:			starwars -root				    \\n\
+	   GL:			gltext -root				    \\n\
+	   GL:	\"GLText (clock)\" gltext -text \"%A%n%d %b %Y%n%r\" -root	    \\n\
+	   GL:	 		molecule -root				    \\n\
+	   GL:			dangerball -root			    \\n\
+	   GL:			circuit -root				    \\n\
+	   GL:			engine -root				    \\n\
+	   GL:			flipscreen3d -root			    \\n\
+	   GL:			glsnake -root				    \\n\
+	   GL:			boxed -root				    \\n\
 -	   GL:			glforestfire -root			    \\n\
 -	   GL:	\"GLForestFire (rain)\"	glforestfire -root -count 0	    \\n\
 -	   GL:			sballs -root				    \\n\
--	   GL:			cubenetic -root				    \\n\
--	   GL:			spheremonics -root			    \\n\
--	   GL:			lavalite -root				    \\n\
--	   GL:			queens -root				    \\n\
--	   GL:			endgame -root				    \\n\
+	   GL:			cubenetic -root				    \\n\
+	   GL:			spheremonics -root			    \\n\
+	   GL:			lavalite -root				    \\n\
+	   GL:			queens -root				    \\n\
+	   GL:			endgame -root				    \\n\
 -	   GL:			glblur -root				    \\n\
--	   GL:			atunnel -root				    \\n\
--	   GL:			flyingtoasters -root			    \\n\
--	   GL:			bouncingcow -root			    \\n\
--	   GL:			jigglypuff -root			    \\n\
--	   GL:			klein -root				    \\n\
--	   GL:			hypertorus -root			    \\n\
--	   GL:			glmatrix -root				    \\n\
--	   GL:			cubestorm -root				    \\n\
--	   GL:			glknots -root				    \\n\
--	   GL:			blocktube -root				    \\n\
--	   GL:			flipflop -root				    \\n\
--	   GL:			antspotlight -root			    \\n\
+	   GL:			atunnel -root				    \\n\
+	   GL:			flyingtoasters -root			    \\n\
+	   GL:			bouncingcow -root			    \\n\
+	   GL:			jigglypuff -root			    \\n\
+	   GL:			klein -root				    \\n\
+	   GL:			hypertorus -root			    \\n\
+	   GL:			glmatrix -root				    \\n\
+	   GL:			cubestorm -root				    \\n\
+	   GL:			glknots -root				    \\n\
+	   GL:			blocktube -root				    \\n\
+	   GL:			flipflop -root				    \\n\
+	   GL:			antspotlight -root			    \\n\
 -	   GL:			glslideshow -root			    \\n\
--	   GL:			polytopes -root				    \\n\
--	   GL:			gleidescope -root			    \\n\
+	   GL:			polytopes -root				    \\n\
+	   GL:			gleidescope -root			    \\n\
 - 	   GL:			mirrorblob -root			    \\n\
--	   GL:	    \"MirrorBlob (color only)\"				      \
+	   GL:	    \"MirrorBlob (color only)\"				      \
                                 mirrorblob -root -colour -no-texture	    \\n\
--	   GL:			blinkbox -root				    \\n\
--	   GL:			noof -root				    \\n\
--	   GL:			polyhedra -root				    \\n\
+	   GL:			blinkbox -root				    \\n\
+	   GL:			noof -root				    \\n\
+	   GL:			polyhedra -root				    \\n\
 -	   GL:                  antinspect -root                            \\n\
--	   GL:			providence -root			    \\n\
--	   GL:	\"Pinion (large gears)\"	pinion -root			    \\n\
--	   GL:	\"Pinion (small gears)\"	pinion -root -size 0.2 -scroll 0.3  \\n\
--	   GL:			boing -root -lighting -smooth		    \\n\
+	   GL:			providence -root			    \\n\
+	   GL:	\"Pinion (large gears)\"	pinion -root			    \\n\
+	   GL:	\"Pinion (small gears)\"	pinion -root -size 0.2 -scroll 0.3  \\n\
+	   GL:			boing -root -lighting -smooth		    \\n\
 -	   GL:                  carousel -root                              \\n\
--	   GL:			fliptext -root				    \\n\
+	   GL:			fliptext -root				    \\n\
 -	   GL:                  antmaze -root                               \\n\
--	   GL:			tangram -root				    \\n\
--	   GL:			crackberg -root				    \\n\
--	   GL:			glhanoi -root				    \\n\
--	   GL:			cube21 -root				    \\n\
--	   GL:			timetunnel -root			    \\n\
--	   GL:			juggler3d -root				    \\n\
--	   GL:			topblock -root				    \\n\
--	   GL:			glschool -root				    \\n\
--	   GL:			glcells -root				    \\n\
--	   GL:			voronoi -root				    \\n\
--	   GL:			moebiusgears -root			    \\n\
--	   GL:			lockward -root				    \\n\
--	   GL:			cubicgrid -root				    \\n\
--	   GL:			hypnowheel -root			    \\n\
--	   GL:	\"Hypnowheel (dense)\"	hypnowheel -root -count 3 -layers 50 \\n\
--	   GL:	\"Hypnowheel (trifoil)\"	hypnowheel -root -count 3 -layers 2 -speed 9 -twist 9 -wander \\n\
+	   GL:			tangram -root				    \\n\
+	   GL:			crackberg -root				    \\n\
+	   GL:			glhanoi -root				    \\n\
+	   GL:			cube21 -root				    \\n\
+	   GL:			timetunnel -root			    \\n\
+	   GL:			juggler3d -root				    \\n\
+	   GL:			topblock -root				    \\n\
+	   GL:			glschool -root				    \\n\
+	   GL:			glcells -root				    \\n\
+	   GL:			voronoi -root				    \\n\
+	   GL:			moebiusgears -root			    \\n\
+	   GL:			lockward -root				    \\n\
+	   GL:			cubicgrid -root				    \\n\
+	   GL:			hypnowheel -root			    \\n\
+	   GL:	\"Hypnowheel (dense)\"	hypnowheel -root -count 3 -layers 50 \\n\
+	   GL:	\"Hypnowheel (trifoil)\"	hypnowheel -root -count 3 -layers 2 -speed 9 -twist 9 -wander \\n\
 									      \
 -				xdaliclock -root -font BUILTIN3		    \\n\
 -				xplanet -vroot -wait 1 -timewarp 90000        \
@@ -348,11 +344,10 @@
 "*Dialog.borderWidth:		1",
 "*Dialog.shadowThickness:	2",
 "*passwd.heading.label:		XScreenSaver %s",
-"*passwd.body.label:		Please enter your password.",
+"*passwd.body.label:		This screen is locked.",
 "*passwd.unlock.label:		OK",
 "*passwd.login.label:		New Login",
 "*passwd.user.label:		Username:",
-"*passwd.passwd.label:		Password:",
 "*passwd.thermometer.width:	8",
 "*passwd.asterisks:              True",
 "*passwd.uname:                  True",