From: vlad Date: Mon, 9 Aug 2010 20:48:28 +0000 (+0300) Subject: almost done X-Git-Url: https://vcs.maemo.org/git/?p=xscreensaver;a=commitdiff_plain;h=b91d7d8580643cc84639ef706a85bf382e409d97 almost done --- diff --git a/xscreensaver/config.guess b/xscreensaver/config.guess old mode 100644 new mode 100755 index 951383e..45bee13 --- a/xscreensaver/config.guess +++ b/xscreensaver/config.guess @@ -1,10 +1,9 @@ #! /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, 2006 Free Software Foundation, -# Inc. +# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. -timestamp='2007-05-17' +timestamp='2005-04-22' # 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 @@ -18,15 +17,13 @@ timestamp='2007-05-17' # # 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., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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 . # Please send patches to . Submit a context # diff and a properly formatted ChangeLog entry. @@ -69,11 +66,11 @@ Try \`$me --help' for more information." while test $# -gt 0 ; do case $1 in --time-stamp | --time* | -t ) - echo "$timestamp" ; exit ;; + echo "$timestamp" ; exit 0 ;; --version | -v ) - echo "$version" ; exit ;; + echo "$version" ; exit 0 ;; --help | --h* | -h ) - echo "$usage"; exit ;; + echo "$usage"; exit 0 ;; -- ) # Stop option processing shift; break ;; - ) # Use stdin as input. @@ -107,7 +104,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 "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { tmp=`(umask 077 && mktemp -d -q "$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 ; } ; @@ -126,7 +123,7 @@ case $CC_FOR_BUILD,$HOST_CC,$CC in ;; ,,*) CC_FOR_BUILD=$CC ;; ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac ; set_cc_for_build= ;' +esac ;' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi@noc.rutgers.edu 1994-08-24) @@ -161,7 +158,6 @@ 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 @@ -200,23 +196,55 @@ 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 ;; + 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 ;; *:OpenBSD:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} - exit ;; + echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; *:ekkoBSD:*:*) echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} - exit ;; - *:SolidBSD:*:*) - echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} - exit ;; + exit 0 ;; macppc:MirBSD:*:*) - echo powerpc-unknown-mirbsd${UNAME_RELEASE} - exit ;; + echo powerppc-unknown-mirbsd${UNAME_RELEASE} + exit 0 ;; *:MirBSD:*:*) echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} - exit ;; + exit 0 ;; alpha:OSF1:*:*) case $UNAME_RELEASE in *4.0) @@ -269,43 +297,40 @@ 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 ;; + exit 0 ;; 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 ;; + exit 0 ;; 21064:Windows_NT:50:3) echo alpha-dec-winnt3.5 - exit ;; + exit 0 ;; Amiga*:UNIX_System_V:4.0:*) echo m68k-unknown-sysv4 - exit ;; + exit 0;; *:[Aa]miga[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-amigaos - exit ;; + exit 0 ;; *:[Mm]orph[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-morphos - exit ;; + exit 0 ;; *:OS/390:*:*) echo i370-ibm-openedition - exit ;; + exit 0 ;; *:z/VM:*:*) echo s390-ibm-zvmoe - exit ;; + exit 0 ;; *:OS400:*:*) echo powerpc-ibm-os400 - exit ;; + exit 0 ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} - exit ;; - arm:riscos:*:*|arm:RISCOS:*:*) - echo arm-unknown-riscos - exit ;; + exit 0;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) echo hppa1.1-hitachi-hiuxmpp - exit ;; + exit 0;; 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 @@ -313,32 +338,32 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in else echo pyramid-pyramid-bsd fi - exit ;; + exit 0 ;; NILE*:*:*:dcosx) echo pyramid-pyramid-svr4 - exit ;; + exit 0 ;; DRS?6000:unix:4.0:6*) echo sparc-icl-nx6 - exit ;; + exit 0 ;; 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 ;; + sparc) echo sparc-icl-nx7 && exit 0 ;; esac ;; sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; + exit 0 ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - i86pc:SunOS:5.*:* | ix86xen:SunOS:5.*:*) + exit 0 ;; + i86pc:SunOS:5.*:*) echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; + exit 0 ;; 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 ;; + exit 0 ;; sun4*:SunOS:*:*) case "`/usr/bin/arch -k`" in Series*|S4*) @@ -347,10 +372,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 ;; + exit 0 ;; sun3*:SunOS:*:*) echo m68k-sun-sunos${UNAME_RELEASE} - exit ;; + exit 0 ;; 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 @@ -362,10 +387,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in echo sparc-sun-sunos${UNAME_RELEASE} ;; esac - exit ;; + exit 0 ;; aushp:SunOS:*:*) echo sparc-auspex-sunos${UNAME_RELEASE} - exit ;; + exit 0 ;; # 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 @@ -376,40 +401,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 ;; + exit 0 ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit ;; + exit 0 ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit ;; + exit 0 ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) echo m68k-milan-mint${UNAME_RELEASE} - exit ;; + exit 0 ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) echo m68k-hades-mint${UNAME_RELEASE} - exit ;; + exit 0 ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) echo m68k-unknown-mint${UNAME_RELEASE} - exit ;; + exit 0 ;; m68k:machten:*:*) echo m68k-apple-machten${UNAME_RELEASE} - exit ;; + exit 0 ;; powerpc:machten:*:*) echo powerpc-apple-machten${UNAME_RELEASE} - exit ;; + exit 0 ;; RISC*:Mach:*:*) echo mips-dec-mach_bsd4.3 - exit ;; + exit 0 ;; RISC*:ULTRIX:*:*) echo mips-dec-ultrix${UNAME_RELEASE} - exit ;; + exit 0 ;; VAX*:ULTRIX*:*:*) echo vax-dec-ultrix${UNAME_RELEASE} - exit ;; + exit 0 ;; 2020:CLIX:*:* | 2430:CLIX:*:*) echo clipper-intergraph-clix${UNAME_RELEASE} - exit ;; + exit 0 ;; mips:*:*:UMIPS | mips:*:*:RISCos) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -433,33 +458,32 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in exit (-1); } EOF - $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; } + $CC_FOR_BUILD -o $dummy $dummy.c \ + && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ + && exit 0 echo mips-mips-riscos${UNAME_RELEASE} - exit ;; + exit 0 ;; Motorola:PowerMAX_OS:*:*) echo powerpc-motorola-powermax - exit ;; + exit 0 ;; Motorola:*:4.3:PL8-*) echo powerpc-harris-powermax - exit ;; + exit 0 ;; Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) echo powerpc-harris-powermax - exit ;; + exit 0 ;; Night_Hawk:Power_UNIX:*:*) echo powerpc-harris-powerunix - exit ;; + exit 0 ;; m88k:CX/UX:7*:*) echo m88k-harris-cxux7 - exit ;; + exit 0 ;; m88k:*:4*:R4*) echo m88k-motorola-sysv4 - exit ;; + exit 0 ;; m88k:*:3*:R3*) echo m88k-motorola-sysv3 - exit ;; + exit 0 ;; AViiON:dgux:*:*) # DG/UX returns AViiON for all architectures UNAME_PROCESSOR=`/usr/bin/uname -p` @@ -475,29 +499,29 @@ EOF else echo i586-dg-dgux${UNAME_RELEASE} fi - exit ;; + exit 0 ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 - exit ;; + exit 0 ;; M88*:*:R3*:*) # Delta 88k system running SVR3 echo m88k-motorola-sysv3 - exit ;; + exit 0 ;; XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) echo m88k-tektronix-sysv3 - exit ;; + exit 0 ;; Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) echo m68k-tektronix-bsd - exit ;; + exit 0 ;; *:IRIX*:*:*) echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` - exit ;; + exit 0 ;; ????????: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 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id + exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' i*86:AIX:*:*) echo i386-ibm-aix - exit ;; + exit 0 ;; ia64:AIX:*:*) if [ -x /usr/bin/oslevel ] ; then IBM_REV=`/usr/bin/oslevel` @@ -505,7 +529,7 @@ EOF IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} - exit ;; + exit 0 ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then eval $set_cc_for_build @@ -520,18 +544,14 @@ EOF exit(0); } EOF - if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` - then - echo "$SYSTEM_NAME" - else - echo rs6000-ibm-aix3.2.5 - fi + $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 + echo rs6000-ibm-aix3.2.5 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 ;; + exit 0 ;; *: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 @@ -545,28 +565,28 @@ EOF IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi echo ${IBM_ARCH}-ibm-aix${IBM_REV} - exit ;; + exit 0 ;; *:AIX:*:*) echo rs6000-ibm-aix - exit ;; + exit 0 ;; ibmrt:4.4BSD:*|romp-ibm:BSD:*) echo romp-ibm-bsd4.4 - exit ;; + exit 0 ;; ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to - exit ;; # report: romp-ibm BSD 4.3 + exit 0 ;; # report: romp-ibm BSD 4.3 *:BOSX:*:*) echo rs6000-bull-bosx - exit ;; + exit 0 ;; DPX/2?00:B.O.S.:*:*) echo m68k-bull-sysv3 - exit ;; + exit 0 ;; 9000/[34]??:4.3bsd:1.*:*) echo m68k-hp-bsd - exit ;; + exit 0 ;; hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) echo m68k-hp-bsd4.4 - exit ;; + exit 0 ;; 9000/[34678]??:HP-UX:*:*) HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` case "${UNAME_MACHINE}" in @@ -628,19 +648,9 @@ EOF esac if [ ${HP_ARCH} = "hppa2.0w" ] then - 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 + # 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 then HP_ARCH="hppa2.0w" else @@ -648,11 +658,11 @@ EOF fi fi echo ${HP_ARCH}-hp-hpux${HPUX_REV} - exit ;; + exit 0 ;; ia64:HP-UX:*:*) HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` echo ia64-hp-hpux${HPUX_REV} - exit ;; + exit 0 ;; 3050*:HI-UX:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -680,182 +690,161 @@ EOF exit (0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } + $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 echo unknown-hitachi-hiuxwe2 - exit ;; + exit 0 ;; 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) echo hppa1.1-hp-bsd - exit ;; + exit 0 ;; 9000/8??:4.3bsd:*:*) echo hppa1.0-hp-bsd - exit ;; + exit 0 ;; *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) echo hppa1.0-hp-mpeix - exit ;; + exit 0 ;; hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) echo hppa1.1-hp-osf - exit ;; + exit 0 ;; hp8??:OSF1:*:*) echo hppa1.0-hp-osf - exit ;; + exit 0 ;; i*86:OSF1:*:*) if [ -x /usr/sbin/sysversion ] ; then echo ${UNAME_MACHINE}-unknown-osf1mk else echo ${UNAME_MACHINE}-unknown-osf1 fi - exit ;; + exit 0 ;; parisc*:Lites*:*:*) echo hppa1.1-hp-lites - exit ;; + exit 0 ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd - exit ;; + exit 0 ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit ;; + exit 0 ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) echo c34-convex-bsd - exit ;; + exit 0 ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd - exit ;; + exit 0 ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd - exit ;; + exit 0 ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; + exit 0 ;; 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 ;; + exit 0 ;; CRAY*TS:*:*:*) echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; + exit 0 ;; CRAY*T3E:*:*:*) echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; + exit 0 ;; CRAY*SV1:*:*:*) echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; + exit 0 ;; *:UNICOS/mp:*:*) echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; + exit 0 ;; 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 ;; + exit 0 ;; 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 ;; + exit 0 ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} - exit ;; + exit 0 ;; sparc*:BSD/OS:*:*) echo sparc-unknown-bsdi${UNAME_RELEASE} - exit ;; + exit 0 ;; *:BSD/OS:*:*) echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit ;; + exit 0 ;; *:FreeBSD:*:*) - 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 ;; + echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + exit 0 ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin - exit ;; - *:MINGW*:*) + exit 0 ;; + i*:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 - exit ;; - i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 - exit ;; + exit 0 ;; i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 - 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 ;; + exit 0 ;; + x86:Interix*:[34]*) + echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' + exit 0 ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks - exit ;; + exit 0 ;; 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 ;; + exit 0 ;; i*:UWIN*:*) echo ${UNAME_MACHINE}-pc-uwin - exit ;; - amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) + exit 0 ;; + amd64:CYGWIN*:*:*) echo x86_64-unknown-cygwin - exit ;; + exit 0 ;; p*:CYGWIN*:*) echo powerpcle-unknown-cygwin - exit ;; + exit 0 ;; prep*:SunOS:5.*:*) echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; + exit 0 ;; *:GNU:*:*) # the GNU system echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` - exit ;; + exit 0 ;; *: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 ;; + exit 0 ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix - exit ;; + exit 0 ;; arm*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + exit 0 ;; cris:Linux:*:*) echo cris-axis-linux-gnu - exit ;; + exit 0 ;; crisv32:Linux:*:*) echo crisv32-axis-linux-gnu - exit ;; + exit 0 ;; frv:Linux:*:*) echo frv-unknown-linux-gnu - exit ;; + exit 0 ;; ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + exit 0 ;; m32r*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + exit 0 ;; m68*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + exit 0 ;; mips:Linux:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -872,12 +861,8 @@ EOF #endif #endif EOF - 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; } + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` + test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 ;; mips64:Linux:*:*) eval $set_cc_for_build @@ -895,22 +880,15 @@ EOF #endif #endif EOF - 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; } + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` + test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 ;; - or32:Linux:*:*) - echo or32-unknown-linux-gnu - exit ;; ppc:Linux:*:*) echo powerpc-unknown-linux-gnu - exit ;; + exit 0 ;; ppc64:Linux:*:*) echo powerpc64-unknown-linux-gnu - exit ;; + exit 0 ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in EV5) UNAME_MACHINE=alphaev5 ;; @@ -924,7 +902,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 ;; + exit 0 ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in @@ -932,31 +910,25 @@ EOF PA8*) echo hppa2.0-unknown-linux-gnu ;; *) echo hppa-unknown-linux-gnu ;; esac - exit ;; + exit 0 ;; parisc64:Linux:*:* | hppa64:Linux:*:*) echo hppa64-unknown-linux-gnu - exit ;; + exit 0 ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux - exit ;; + exit 0 ;; sh64*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + exit 0 ;; sh*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + exit 0 ;; sparc:Linux:*:* | sparc64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu - exit ;; + exit 0 ;; x86_64:Linux:*:*) echo x86_64-unknown-linux-gnu - exit ;; - xtensa:Linux:*:*) - echo xtensa-unknown-linux-gnu - exit ;; + exit 0 ;; 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 @@ -974,15 +946,15 @@ EOF ;; a.out-i386-linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit ;; + exit 0 ;; coff-i386) echo "${UNAME_MACHINE}-pc-linux-gnucoff" - exit ;; + exit 0 ;; "") # 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 ;; + exit 0 ;; esac # Determine whether the default compiler is a.out or elf eval $set_cc_for_build @@ -999,7 +971,7 @@ EOF LIBC=gnulibc1 # endif #else - #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) + #ifdef __INTEL_COMPILER LIBC=gnu #else LIBC=gnuaout @@ -1009,23 +981,16 @@ EOF LIBC=dietlibc #endif EOF - 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; } + 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 ;; 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 ;; + exit 0 ;; i*86:UNIX_SV:4.2MP:2.*) # Unixware is an offshoot of SVR4, but it has its own version # number series starting with 2... @@ -1033,27 +998,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 ;; + exit 0 ;; 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 ;; + exit 0 ;; i*86:XTS-300:*:STOP) echo ${UNAME_MACHINE}-unknown-stop - exit ;; + exit 0 ;; i*86:atheos:*:*) echo ${UNAME_MACHINE}-unknown-atheos - exit ;; - i*86:syllable:*:*) + exit 0 ;; + i*86:syllable:*:*) echo ${UNAME_MACHINE}-pc-syllable - exit ;; + exit 0 ;; i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) echo i386-unknown-lynxos${UNAME_RELEASE} - exit ;; + exit 0 ;; i*86:*DOS:*:*) echo ${UNAME_MACHINE}-pc-msdosdjgpp - exit ;; + exit 0 ;; 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 @@ -1061,16 +1026,15 @@ EOF else echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} fi - exit ;; - i*86:*:5:[678]*) - # UnixWare 7.x, OpenUNIX and OpenServer 6. + exit 0 ;; + i*86:*:5:[78]*) 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 ;; + exit 0 ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then UNAME_REL=`sed -n 's/.*Version //p' /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 ;; + exit 0 ;; mini*:CTIX:SYS*5:*) # "miniframe" echo m68010-convergent-sysv - exit ;; + exit 0 ;; mc68k:UNIX:SYSTEM5:3.51m) echo m68k-convergent-sysv - exit ;; + exit 0 ;; M680?0:D-NIX:5.3:*) echo m68k-diab-dnix - exit ;; + exit 0 ;; M68*:*:R3V[5678]*:*) - test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; + test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; 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; } + && echo i486-ncr-sysv4.3${OS_REL} && exit 0 /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4; exit; } ;; + && echo i486-ncr-sysv4 && exit 0 ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) echo m68k-unknown-lynxos${UNAME_RELEASE} - exit ;; + exit 0 ;; mc68030:UNIX_System_V:4.*:*) echo m68k-atari-sysv4 - exit ;; + exit 0 ;; TSUNAMI:LynxOS:2.*:*) echo sparc-unknown-lynxos${UNAME_RELEASE} - exit ;; + exit 0 ;; rs6000:LynxOS:2.*:*) echo rs6000-unknown-lynxos${UNAME_RELEASE} - exit ;; + exit 0 ;; PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) echo powerpc-unknown-lynxos${UNAME_RELEASE} - exit ;; + exit 0 ;; SM[BE]S:UNIX_SV:*:*) echo mips-dde-sysv${UNAME_RELEASE} - exit ;; + exit 0 ;; RM*:ReliantUNIX-*:*:*) echo mips-sni-sysv4 - exit ;; + exit 0 ;; RM*:SINIX-*:*:*) echo mips-sni-sysv4 - exit ;; + exit 0 ;; *:SINIX-*:*:*) if uname -p 2>/dev/null >/dev/null ; then UNAME_MACHINE=`(uname -p) 2>/dev/null` @@ -1162,81 +1126,73 @@ EOF else echo ns32k-sni-sysv fi - exit ;; + exit 0 ;; PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort # says echo i586-unisys-sysv4 - exit ;; + exit 0 ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm echo hppa1.1-stratus-sysv4 - exit ;; + exit 0 ;; *:*:*:FTX*) # From seanf@swdc.stratus.com. echo i860-stratus-sysv4 - exit ;; + exit 0 ;; i*86:VOS:*:*) # From Paul.Green@stratus.com. echo ${UNAME_MACHINE}-stratus-vos - exit ;; + exit 0 ;; *:VOS:*:*) # From Paul.Green@stratus.com. echo hppa1.1-stratus-vos - exit ;; + exit 0 ;; mc68*:A/UX:*:*) echo m68k-apple-aux${UNAME_RELEASE} - exit ;; + exit 0 ;; news*:NEWS-OS:6*:*) echo mips-sony-newsos6 - exit ;; + exit 0 ;; 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 ;; + exit 0 ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. echo powerpc-be-beos - exit ;; + exit 0 ;; BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. echo powerpc-apple-beos - exit ;; + exit 0 ;; BePC:BeOS:*:*) # BeOS running on Intel PC compatible. echo i586-pc-beos - exit ;; + exit 0 ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} - exit ;; + exit 0 ;; SX-5:SUPER-UX:*:*) echo sx5-nec-superux${UNAME_RELEASE} - exit ;; + exit 0 ;; SX-6:SUPER-UX:*:*) echo sx6-nec-superux${UNAME_RELEASE} - 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 ;; + exit 0 ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} - exit ;; + exit 0 ;; *:Rhapsody:*:*) echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} - exit ;; + exit 0 ;; *: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 ;; + exit 0 ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` if test "$UNAME_PROCESSOR" = "x86"; then @@ -1244,25 +1200,25 @@ EOF UNAME_MACHINE=pc fi echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} - exit ;; + exit 0 ;; *:QNX:*:4*) echo i386-pc-qnx - exit ;; + exit 0 ;; NSE-?:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} - exit ;; + exit 0 ;; NSR-?:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} - exit ;; + exit 0 ;; *:NonStop-UX:*:*) echo mips-compaq-nonstopux - exit ;; + exit 0 ;; BS2000:POSIX*:*:*) echo bs2000-siemens-sysv - exit ;; + exit 0 ;; DS/*:UNIX_System_V:*:*) echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} - exit ;; + exit 0 ;; *:Plan9:*:*) # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 @@ -1273,47 +1229,41 @@ EOF UNAME_MACHINE="$cputype" fi echo ${UNAME_MACHINE}-unknown-plan9 - exit ;; + exit 0 ;; *:TOPS-10:*:*) echo pdp10-unknown-tops10 - exit ;; + exit 0 ;; *:TENEX:*:*) echo pdp10-unknown-tenex - exit ;; + exit 0 ;; KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) echo pdp10-dec-tops20 - exit ;; + exit 0 ;; XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) echo pdp10-xkl-tops20 - exit ;; + exit 0 ;; *:TOPS-20:*:*) echo pdp10-unknown-tops20 - exit ;; + exit 0 ;; *:ITS:*:*) echo pdp10-unknown-its - exit ;; + exit 0 ;; SEI:*:*:SEIUX) echo mips-sei-seiux${UNAME_RELEASE} - exit ;; + exit 0 ;; *:DragonFly:*:*) echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit ;; + exit 0 ;; *:*VMS:*:*) UNAME_MACHINE=`(uname -p) 2>/dev/null` case "${UNAME_MACHINE}" in - A*) echo alpha-dec-vms ; exit ;; - I*) echo ia64-dec-vms ; exit ;; - V*) echo vax-dec-vms ; exit ;; + A*) echo alpha-dec-vms && exit 0 ;; + I*) echo ia64-dec-vms && exit 0 ;; + V*) echo vax-dec-vms && exit 0 ;; esac ;; *:XENIX:*:SysV) echo i386-pc-xenix - 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 ;; + exit 0 ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 @@ -1345,7 +1295,7 @@ main () #endif #if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix\n"); exit (0); + printf ("arm-acorn-riscix"); exit (0); #endif #if defined (hp300) && !defined (hpux) @@ -1434,12 +1384,11 @@ main () } EOF -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 # Apollos put the system type in the environment. -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } +test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } # Convex versions that predate uname can use getsysinfo(1) @@ -1448,22 +1397,22 @@ then case `getsysinfo -f cpu_type` in c1*) echo c1-convex-bsd - exit ;; + exit 0 ;; c2*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit ;; + exit 0 ;; c34*) echo c34-convex-bsd - exit ;; + exit 0 ;; c38*) echo c38-convex-bsd - exit ;; + exit 0 ;; c4*) echo c4-convex-bsd - exit ;; + exit 0 ;; esac fi diff --git a/xscreensaver/debian/xscreensaver.files b/xscreensaver/debian/xscreensaver.files index 73da0b9..0e1eedc 100644 --- a/xscreensaver/debian/xscreensaver.files +++ b/xscreensaver/debian/xscreensaver.files @@ -447,151 +447,151 @@ usr/share/applications/screensavers/slidescreen.desktop usr/share/applications/screensavers/sonar.desktop usr/share/applications/screensavers/swirl.desktop usr/share/applications/screensavers/xlyap.desktop -usr/share/livewp/applet/data/external_themes/abstractile.xml -usr/share/livewp/applet/data/external_themes/anemone.xml -usr/share/livewp/applet/data/external_themes/anemotaxis.xml -usr/share/livewp/applet/data/external_themes/apollonian.xml -usr/share/livewp/applet/data/external_themes/apple2.xml -usr/share/livewp/applet/data/external_themes/attraction.xml -usr/share/livewp/applet/data/external_themes/barcode.xml -usr/share/livewp/applet/data/external_themes/blaster.xml -usr/share/livewp/applet/data/external_themes/blitspin.xml -usr/share/livewp/applet/data/external_themes/bouboule.xml -usr/share/livewp/applet/data/external_themes/boxfit.xml -usr/share/livewp/applet/data/external_themes/braid.xml -usr/share/livewp/applet/data/external_themes/bsod.xml -usr/share/livewp/applet/data/external_themes/bubbles.xml -usr/share/livewp/applet/data/external_themes/bumps.xml -usr/share/livewp/applet/data/external_themes/ccurve.xml -usr/share/livewp/applet/data/external_themes/celtic.xml -usr/share/livewp/applet/data/external_themes/cloudlife.xml -usr/share/livewp/applet/data/external_themes/compass.xml -usr/share/livewp/applet/data/external_themes/coral.xml -usr/share/livewp/applet/data/external_themes/cosmos.xml -usr/share/livewp/applet/data/external_themes/critical.xml -usr/share/livewp/applet/data/external_themes/crystal.xml -usr/share/livewp/applet/data/external_themes/cwaves.xml -usr/share/livewp/applet/data/external_themes/cynosure.xml -usr/share/livewp/applet/data/external_themes/decayscreen.xml -usr/share/livewp/applet/data/external_themes/deco.xml -usr/share/livewp/applet/data/external_themes/deluxe.xml -usr/share/livewp/applet/data/external_themes/demon.xml -usr/share/livewp/applet/data/external_themes/discrete.xml -usr/share/livewp/applet/data/external_themes/distort.xml -usr/share/livewp/applet/data/external_themes/drift.xml -usr/share/livewp/applet/data/external_themes/electricsheep.xml -usr/share/livewp/applet/data/external_themes/epicycle.xml -usr/share/livewp/applet/data/external_themes/eruption.xml -usr/share/livewp/applet/data/external_themes/euler2d.xml -usr/share/livewp/applet/data/external_themes/extrusion.xml -usr/share/livewp/applet/data/external_themes/fadeplot.xml -usr/share/livewp/applet/data/external_themes/fiberlamp.xml -usr/share/livewp/applet/data/external_themes/fireflies.xml -usr/share/livewp/applet/data/external_themes/fireworkx.xml -usr/share/livewp/applet/data/external_themes/flag.xml -usr/share/livewp/applet/data/external_themes/flame.xml -usr/share/livewp/applet/data/external_themes/flow.xml -usr/share/livewp/applet/data/external_themes/fluidballs.xml -usr/share/livewp/applet/data/external_themes/fontglide.xml -usr/share/livewp/applet/data/external_themes/forest.xml -usr/share/livewp/applet/data/external_themes/fuzzyflakes.xml -usr/share/livewp/applet/data/external_themes/galaxy.xml -usr/share/livewp/applet/data/external_themes/goban.xml -usr/share/livewp/applet/data/external_themes/goop.xml -usr/share/livewp/applet/data/external_themes/grav.xml -usr/share/livewp/applet/data/external_themes/greynetic.xml -usr/share/livewp/applet/data/external_themes/halftone.xml -usr/share/livewp/applet/data/external_themes/halo.xml -usr/share/livewp/applet/data/external_themes/helix.xml -usr/share/livewp/applet/data/external_themes/hopalong.xml -usr/share/livewp/applet/data/external_themes/hyperball.xml -usr/share/livewp/applet/data/external_themes/hypercube.xml -usr/share/livewp/applet/data/external_themes/ifs.xml -usr/share/livewp/applet/data/external_themes/imsmap.xml -usr/share/livewp/applet/data/external_themes/interaggregate.xml -usr/share/livewp/applet/data/external_themes/interference.xml -usr/share/livewp/applet/data/external_themes/intermomentary.xml -usr/share/livewp/applet/data/external_themes/jigsaw.xml -usr/share/livewp/applet/data/external_themes/juggle.xml -usr/share/livewp/applet/data/external_themes/julia.xml -usr/share/livewp/applet/data/external_themes/kaleidescope.xml -usr/share/livewp/applet/data/external_themes/kumppa.xml -usr/share/livewp/applet/data/external_themes/laser.xml -usr/share/livewp/applet/data/external_themes/lcdscrub.xml -usr/share/livewp/applet/data/external_themes/lightning.xml -usr/share/livewp/applet/data/external_themes/lisa.xml -usr/share/livewp/applet/data/external_themes/lissie.xml -usr/share/livewp/applet/data/external_themes/lmorph.xml -usr/share/livewp/applet/data/external_themes/loop.xml -usr/share/livewp/applet/data/external_themes/m6502.xml -usr/share/livewp/applet/data/external_themes/maze.xml -usr/share/livewp/applet/data/external_themes/memscroller.xml -usr/share/livewp/applet/data/external_themes/metaballs.xml -usr/share/livewp/applet/data/external_themes/mismunch.xml -usr/share/livewp/applet/data/external_themes/moire2.xml -usr/share/livewp/applet/data/external_themes/moire.xml -usr/share/livewp/applet/data/external_themes/mountain.xml -usr/share/livewp/applet/data/external_themes/munch.xml -usr/share/livewp/applet/data/external_themes/nerverot.xml -usr/share/livewp/applet/data/external_themes/noseguy.xml -usr/share/livewp/applet/data/external_themes/pacman.xml -usr/share/livewp/applet/data/external_themes/pedal.xml -usr/share/livewp/applet/data/external_themes/penetrate.xml -usr/share/livewp/applet/data/external_themes/penrose.xml -usr/share/livewp/applet/data/external_themes/petri.xml -usr/share/livewp/applet/data/external_themes/phosphor.xml -usr/share/livewp/applet/data/external_themes/piecewise.xml -usr/share/livewp/applet/data/external_themes/polyominoes.xml -usr/share/livewp/applet/data/external_themes/pong.xml -usr/share/livewp/applet/data/external_themes/popsquares.xml -usr/share/livewp/applet/data/external_themes/pyro.xml -usr/share/livewp/applet/data/external_themes/qix.xml -usr/share/livewp/applet/data/external_themes/rd-bomb.xml -usr/share/livewp/applet/data/external_themes/ripples.xml -usr/share/livewp/applet/data/external_themes/rocks.xml -usr/share/livewp/applet/data/external_themes/rorschach.xml -usr/share/livewp/applet/data/external_themes/rotor.xml -usr/share/livewp/applet/data/external_themes/rotzoomer.xml -usr/share/livewp/applet/data/external_themes/shadebobs.xml -usr/share/livewp/applet/data/external_themes/sierpinski.xml -usr/share/livewp/applet/data/external_themes/slidescreen.xml -usr/share/livewp/applet/data/external_themes/slip.xml -usr/share/livewp/applet/data/external_themes/sonar.xml -usr/share/livewp/applet/data/external_themes/speedmine.xml -usr/share/livewp/applet/data/external_themes/sphereeversion.xml -usr/share/livewp/applet/data/external_themes/sphere.xml -usr/share/livewp/applet/data/external_themes/spiral.xml -usr/share/livewp/applet/data/external_themes/spotlight.xml -usr/share/livewp/applet/data/external_themes/squiral.xml -usr/share/livewp/applet/data/external_themes/starfish.xml -usr/share/livewp/applet/data/external_themes/strange.xml -usr/share/livewp/applet/data/external_themes/substrate.xml -usr/share/livewp/applet/data/external_themes/swirl.xml -usr/share/livewp/applet/data/external_themes/t3d.xml -usr/share/livewp/applet/data/external_themes/thornbird.xml -usr/share/livewp/applet/data/external_themes/triangle.xml -usr/share/livewp/applet/data/external_themes/truchet.xml -usr/share/livewp/applet/data/external_themes/twang.xml -usr/share/livewp/applet/data/external_themes/vermiculate.xml -usr/share/livewp/applet/data/external_themes/vidwhacker.xml -usr/share/livewp/applet/data/external_themes/vines.xml -usr/share/livewp/applet/data/external_themes/wander.xml -usr/share/livewp/applet/data/external_themes/webcollage.xml -usr/share/livewp/applet/data/external_themes/whirlwindwarp.xml -usr/share/livewp/applet/data/external_themes/whirlygig.xml -usr/share/livewp/applet/data/external_themes/wormhole.xml -usr/share/livewp/applet/data/external_themes/worm.xml -usr/share/livewp/applet/data/external_themes/xanalogtv.xml -usr/share/livewp/applet/data/external_themes/xaos.xml -usr/share/livewp/applet/data/external_themes/xdaliclock.xml -usr/share/livewp/applet/data/external_themes/xflame.xml -usr/share/livewp/applet/data/external_themes/xjack.xml -usr/share/livewp/applet/data/external_themes/xlyap.xml -usr/share/livewp/applet/data/external_themes/xmatrix.xml -usr/share/livewp/applet/data/external_themes/xmountains.xml -usr/share/livewp/applet/data/external_themes/xplanet.xml -usr/share/livewp/applet/data/external_themes/xrayswarm.xml -usr/share/livewp/applet/data/external_themes/xsnow.xml -usr/share/livewp/applet/data/external_themes/xspirograph.xml -usr/share/livewp/applet/data/external_themes/zoom.xml +usr/share/livewp/external_themes/abstractile.xml +usr/share/livewp/external_themes/anemone.xml +usr/share/livewp/external_themes/anemotaxis.xml +usr/share/livewp/external_themes/apollonian.xml +usr/share/livewp/external_themes/apple2.xml +usr/share/livewp/external_themes/attraction.xml +usr/share/livewp/external_themes/barcode.xml +usr/share/livewp/external_themes/blaster.xml +usr/share/livewp/external_themes/blitspin.xml +usr/share/livewp/external_themes/bouboule.xml +usr/share/livewp/external_themes/boxfit.xml +usr/share/livewp/external_themes/braid.xml +usr/share/livewp/external_themes/bsod.xml +usr/share/livewp/external_themes/bubbles.xml +usr/share/livewp/external_themes/bumps.xml +usr/share/livewp/external_themes/ccurve.xml +usr/share/livewp/external_themes/celtic.xml +usr/share/livewp/external_themes/cloudlife.xml +usr/share/livewp/external_themes/compass.xml +usr/share/livewp/external_themes/coral.xml +usr/share/livewp/external_themes/cosmos.xml +usr/share/livewp/external_themes/critical.xml +usr/share/livewp/external_themes/crystal.xml +usr/share/livewp/external_themes/cwaves.xml +usr/share/livewp/external_themes/cynosure.xml +usr/share/livewp/external_themes/decayscreen.xml +usr/share/livewp/external_themes/deco.xml +usr/share/livewp/external_themes/deluxe.xml +usr/share/livewp/external_themes/demon.xml +usr/share/livewp/external_themes/discrete.xml +usr/share/livewp/external_themes/distort.xml +usr/share/livewp/external_themes/drift.xml +usr/share/livewp/external_themes/electricsheep.xml +usr/share/livewp/external_themes/epicycle.xml +usr/share/livewp/external_themes/eruption.xml +usr/share/livewp/external_themes/euler2d.xml +usr/share/livewp/external_themes/extrusion.xml +usr/share/livewp/external_themes/fadeplot.xml +usr/share/livewp/external_themes/fiberlamp.xml +usr/share/livewp/external_themes/fireflies.xml +usr/share/livewp/external_themes/fireworkx.xml +usr/share/livewp/external_themes/flag.xml +usr/share/livewp/external_themes/flame.xml +usr/share/livewp/external_themes/flow.xml +usr/share/livewp/external_themes/fluidballs.xml +usr/share/livewp/external_themes/fontglide.xml +usr/share/livewp/external_themes/forest.xml +usr/share/livewp/external_themes/fuzzyflakes.xml +usr/share/livewp/external_themes/galaxy.xml +usr/share/livewp/external_themes/goban.xml +usr/share/livewp/external_themes/goop.xml +usr/share/livewp/external_themes/grav.xml +usr/share/livewp/external_themes/greynetic.xml +usr/share/livewp/external_themes/halftone.xml +usr/share/livewp/external_themes/halo.xml +usr/share/livewp/external_themes/helix.xml +usr/share/livewp/external_themes/hopalong.xml +usr/share/livewp/external_themes/hyperball.xml +usr/share/livewp/external_themes/hypercube.xml +usr/share/livewp/external_themes/ifs.xml +usr/share/livewp/external_themes/imsmap.xml +usr/share/livewp/external_themes/interaggregate.xml +usr/share/livewp/external_themes/interference.xml +usr/share/livewp/external_themes/intermomentary.xml +usr/share/livewp/external_themes/jigsaw.xml +usr/share/livewp/external_themes/juggle.xml +usr/share/livewp/external_themes/julia.xml +usr/share/livewp/external_themes/kaleidescope.xml +usr/share/livewp/external_themes/kumppa.xml +usr/share/livewp/external_themes/laser.xml +usr/share/livewp/external_themes/lcdscrub.xml +usr/share/livewp/external_themes/lightning.xml +usr/share/livewp/external_themes/lisa.xml +usr/share/livewp/external_themes/lissie.xml +usr/share/livewp/external_themes/lmorph.xml +usr/share/livewp/external_themes/loop.xml +usr/share/livewp/external_themes/m6502.xml +usr/share/livewp/external_themes/maze.xml +usr/share/livewp/external_themes/memscroller.xml +usr/share/livewp/external_themes/metaballs.xml +usr/share/livewp/external_themes/mismunch.xml +usr/share/livewp/external_themes/moire2.xml +usr/share/livewp/external_themes/moire.xml +usr/share/livewp/external_themes/mountain.xml +usr/share/livewp/external_themes/munch.xml +usr/share/livewp/external_themes/nerverot.xml +usr/share/livewp/external_themes/noseguy.xml +usr/share/livewp/external_themes/pacman.xml +usr/share/livewp/external_themes/pedal.xml +usr/share/livewp/external_themes/penetrate.xml +usr/share/livewp/external_themes/penrose.xml +usr/share/livewp/external_themes/petri.xml +usr/share/livewp/external_themes/phosphor.xml +usr/share/livewp/external_themes/piecewise.xml +usr/share/livewp/external_themes/polyominoes.xml +usr/share/livewp/external_themes/pong.xml +usr/share/livewp/external_themes/popsquares.xml +usr/share/livewp/external_themes/pyro.xml +usr/share/livewp/external_themes/qix.xml +usr/share/livewp/external_themes/rd-bomb.xml +usr/share/livewp/external_themes/ripples.xml +usr/share/livewp/external_themes/rocks.xml +usr/share/livewp/external_themes/rorschach.xml +usr/share/livewp/external_themes/rotor.xml +usr/share/livewp/external_themes/rotzoomer.xml +usr/share/livewp/external_themes/shadebobs.xml +usr/share/livewp/external_themes/sierpinski.xml +usr/share/livewp/external_themes/slidescreen.xml +usr/share/livewp/external_themes/slip.xml +usr/share/livewp/external_themes/sonar.xml +usr/share/livewp/external_themes/speedmine.xml +usr/share/livewp/external_themes/sphereeversion.xml +usr/share/livewp/external_themes/sphere.xml +usr/share/livewp/external_themes/spiral.xml +usr/share/livewp/external_themes/spotlight.xml +usr/share/livewp/external_themes/squiral.xml +usr/share/livewp/external_themes/starfish.xml +usr/share/livewp/external_themes/strange.xml +usr/share/livewp/external_themes/substrate.xml +usr/share/livewp/external_themes/swirl.xml +usr/share/livewp/external_themes/t3d.xml +usr/share/livewp/external_themes/thornbird.xml +usr/share/livewp/external_themes/triangle.xml +usr/share/livewp/external_themes/truchet.xml +usr/share/livewp/external_themes/twang.xml +usr/share/livewp/external_themes/vermiculate.xml +usr/share/livewp/external_themes/vidwhacker.xml +usr/share/livewp/external_themes/vines.xml +usr/share/livewp/external_themes/wander.xml +usr/share/livewp/external_themes/webcollage.xml +usr/share/livewp/external_themes/whirlwindwarp.xml +usr/share/livewp/external_themes/whirlygig.xml +usr/share/livewp/external_themes/wormhole.xml +usr/share/livewp/external_themes/worm.xml +usr/share/livewp/external_themes/xanalogtv.xml +usr/share/livewp/external_themes/xaos.xml +usr/share/livewp/external_themes/xdaliclock.xml +usr/share/livewp/external_themes/xflame.xml +usr/share/livewp/external_themes/xjack.xml +usr/share/livewp/external_themes/xlyap.xml +usr/share/livewp/external_themes/xmatrix.xml +usr/share/livewp/external_themes/xmountains.xml +usr/share/livewp/external_themes/xplanet.xml +usr/share/livewp/external_themes/xrayswarm.xml +usr/share/livewp/external_themes/xsnow.xml +usr/share/livewp/external_themes/xspirograph.xml +usr/share/livewp/external_themes/zoom.xml diff --git a/xscreensaver/driver/XScreenSaver_ad.h b/xscreensaver/driver/XScreenSaver_ad.h index e556203..73c586c 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: True", -"*imageDirectory: /Library/Desktop Pictures/", +"*chooseRandomImages: False", +"*imageDirectory: ", "*nice: 10", "*memoryLimit: 0", "*lock: False", @@ -30,9 +30,9 @@ "*ignoreUninstalledPrograms: False", "*textMode: file", "*textLiteral: XScreenSaver", -"*textFile: ", +"*textFile: /usr/share/doc/xserver-xorg-core/copyright", "*textProgram: fortune", -"*textURL: http://www.livejournal.com/stats/latest-rss.bml", +"*textURL: http://planet.debian.org/rss20.xml", "*overlayTextForeground: #FFFF00", "*overlayTextBackground: #000000", "*overlayStderr: True", @@ -44,10 +44,14 @@ "*demoCommand: xscreensaver-demo", "*prefsCommand: xscreensaver-demo -prefs", "*helpURL: http://www.jwz.org/xscreensaver/man.html", -"*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'", +"*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\"'", "*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\ @@ -213,94 +217,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 \ @@ -344,10 +348,11 @@ "*Dialog.borderWidth: 1", "*Dialog.shadowThickness: 2", "*passwd.heading.label: XScreenSaver %s", -"*passwd.body.label: This screen is locked.", +"*passwd.body.label: Please enter your password.", "*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",