--- circuslinux-1.0.3.orig/data/Makefile.in +++ circuslinux-1.0.3/data/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -68,6 +68,7 @@ SDL_CFLAGS = @SDL_CFLAGS@ SDL_CONFIG = @SDL_CONFIG@ SDL_LIBS = @SDL_LIBS@ +SHARED_SCOREFILE = @SHARED_SCOREFILE@ TARGET_DEF = @TARGET_DEF@ VERSION = @VERSION@ @@ -79,14 +80,14 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = tar GZIP_ENV = --best all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps data/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --foreign data/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -99,6 +100,11 @@ subdir = data distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign data/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ --- circuslinux-1.0.3.orig/debian/control +++ circuslinux-1.0.3/debian/control @@ -0,0 +1,26 @@ +Source: circuslinux +Section: games +Priority: optional +Maintainer: Christian T. Steigies +Standards-Version: 3.6.1.0 +Build-Depends: dbs, debhelper (>= 4.9.1), libsdl1.2-dev (>= 1.2.2-3.1), libsdl-mixer1.2-dev (>= 1.2.0-1.1), libsdl-image1.2-dev (>= 1.2.0-1.1), autotools-dev, devscripts + +Package: circuslinux +Architecture: any +Depends: ${shlibs:Depends}, circuslinux-data, debconf +Description: The clowns are trying to pop balloons to score points! + "Circus Linux!" is based on the Atari 2600 game "Circus Atari" by Atari, + released in 1980. Gameplay is similar to "Breakout" and "Arkanoid" - you + slide a device left and right to bounce objects into the air which destroy + a wall. + +Package: circuslinux-data +Architecture: all +Replaces: circuslinux (<< 1.0.3-9) +Description: data files for circuslinux + "Circus Linux!" is based on the Atari 2600 game "Circus Atari" by Atari, + released in 1980. Gameplay is similar to "Breakout" and "Arkanoid" - you + slide a device left and right to bounce objects into the air which destroy + a wall. + . + This package contains sound and image files for circuslinux. --- circuslinux-1.0.3.orig/debian/rules +++ circuslinux-1.0.3/debian/rules @@ -0,0 +1,200 @@ +#!/usr/bin/make -f +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# This is the debhelper compatability version to use. +#export DH_COMPAT=1 +#export DH_COMPAT=3 +# this is not in debian/compat? + +# DBS options, taken from hello-dbs + +package := circuslinux +PWD := $(shell pwd) +CFLAGS := -O2 -Wall +INSTALL = install +INSTALL_DATA := $(INSTALL) -m644 +INSTALL_DIR := $(INSTALL) -p -d -o root -g root -m 755 +INSTALL_FILE := $(INSTALL) -p -o root -g root -m 644 +INSTALL_PROGRAM := $(INSTALL) -m755 +INSTALL_SCRIPT := $(INSTALL) -p -o root -g root -m 755 +#SCRIPT_DIR = /usr/share/dbs + +# prepare for dbs, use for next upstream version only! +# the dbs rules +#TAR_DIR := circuslinux-x.y.z +#include $(SCRIPT_DIR)/dbs-build.mk + +# dpkg-arch rules +#ifeq (,$(DEB_BUILD_GNU_TYPE)) +# include $(SCRIPT_DIR)/dpkg-arch.mk +#endif + +# Some vars needed for clean building the package + +DEBIAN_ROOT := $(PWD)/debian/$(package) + +export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +# FOR AUTOCONF 2.52 AND NEWER ONLY +ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) + confflags += --build $(DEB_HOST_GNU_TYPE) +else + confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) +endif + +clean: configure autotools + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + + # Add here commands to clean up after the build process. + -$(MAKE) clean + -rm -f config.log config.status config.cache stamp-config +# -rm configure +# -rm Makefile.in + -rm -f Makefile data/Makefile +# -rm data/Makefile.in +# -rm aclocal.m4 + -rm circuslinux + -rm circuslinux.o + + dh_clean + +# THIS MUST NOT BE A .PHONY TARGET! +configure: + ./autogen.sh + +# The autotools target adds forced build-time dependencies on +# autotools-dev (for /usr/share/misc/config.*) and devscripts (for dch) +# It's also a .PHONY make target. +autotools: + OLDDATESUB=`./config.sub -t | tr -d -` ;\ + OLDDATEGUESS=`./config.guess -t | tr -d -` ;\ + NEWDATESUB=`/usr/share/misc/config.sub -t | tr -d -` ;\ + NEWDATEGUESS=`/usr/share/misc/config.guess -t | tr -d -` ;\ + if [ $$OLDDATESUB -lt $$NEWDATESUB -o \ + $$OLDDATEGUESS -lt $$NEWDATEGUESS ]; then \ + dch -a -p "GNU config automated update: config.sub\ + ($$OLDDATESUB to $$NEWDATESUB), config.guess\ + ($$OLDDATEGUESS to $$NEWDATEGUESS)" ;\ + cp -f /usr/share/misc/config.sub config.sub ;\ + cp -f /usr/share/misc/config.guess config.guess ;\ + echo WARNING: GNU config scripts updated from master copies 1>&2 ;\ + fi + +configure-stamp: + dh_testdir +# aclocal && automake && autoconf +# aclocal && autoheader && automake && autoconf + touch aclocal.m4 # aclocal +# touch config.h.in # autoheader + touch Makefile.in # automake + touch data/Makefile.in + touch configure # autoconf + ./configure --prefix=/usr \ + --mandir=\$${prefix}/share/man \ + --infodir=\$${prefix}/share/info \ + --datadir=\$${prefix}/share/games \ + --enable-scorefile + + touch configure-stamp + +build: configure-stamp build-stamp +build-stamp: + dh_testdir + + # Add here commands to compile the package. + $(MAKE) +# $(MAKE) USE_SHARED_SCOREFILE=yes +# $(MAKE) DATA_PREFIX=$(DESTDIR)/usr/share/games/circuslinux/data/ \ +# JOY=NO + +# Icon is provided upstream +# convert the icon... +# mogrify -format xpm -geometry 32x32 \ +# -map /usr/X11R6/include/X11/pixmaps/cmap.xpm data/images/icon.bmp +# and move it to the debian directory, its needed for the menu system +# mv data/images/icon.xpm debian/circuslinux-icon.xpm + + touch build-stamp + +install: DH_OPTIONS= +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Add here commands to install the package into debian/circuslinux. +# $(MAKE) install prefix=$(DEBIAN_ROOT)/usr \ +# bindir=$(DEBIAN_ROOT)/usr/games \ +# datadir=$(DEBIAN_ROOT)/usr/share/games + $(INSTALL_FILE) data/images/$(package)-icon.xpm \ + $(DEBIAN_ROOT)/usr/share/pixmaps/ + cp -R data/* $(DEBIAN_ROOT)/usr/share/games/$(package)/data/ + -rm $(DEBIAN_ROOT)/usr/share/games/$(package)/data/Makefile* + chmod -R a+rX,g-w,o-w $(DEBIAN_ROOT)/usr/share/games/$(package)/data/ + cp $(package) $(DEBIAN_ROOT)/usr/games/ + chmod a+rx,g-w,o-w $(DEBIAN_ROOT)/usr/games/$(package) +# $(INSTALL_FILE) debian/merge_scorefiles.pl \ +# $(DEBIAN_ROOT)/usr/share/doc/circuslinux/ + dh_movefiles --sourcedir=debian/$(package) + rm -rf $(PWD)/debian/$(package)/usr/share/games + +# Build architecture-independent files here. +binary-indep: build install + dh_testdir -i + dh_testroot -i + dh_installdebconf -i + dh_installdocs -i + dh_installexamples -i + dh_installmenu -i +# dh_installmanpages -i + dh_installinfo -i + dh_installchangelogs CHANGES.txt -i + dh_link -i + dh_strip -i + dh_compress -i + dh_fixperms -i + dh_installdeb -i + dh_shlibdeps -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir -a + dh_testroot -a + dh_installdebconf -a + dh_installdocs -a + dh_installexamples -a + dh_installmenu -a +# dh_installmanpages -a + dh_installman debian/circuslinux.6 + dh_installinfo -a + dh_installchangelogs CHANGES.txt -a + dh_link -a + dh_strip -a + dh_compress -a + dh_fixperms -a +# # You may want to make some executables suid here. +# dh_suidregister + -chown root.games debian/circuslinux/usr/games/circuslinux + -chmod g+s debian/circuslinux/usr/games/circuslinux + -chown root.games debian/circuslinux/var/games/circuslinux + -chmod 775 debian/circuslinux/var/games/circuslinux + dh_installdeb -a + dh_shlibdeps -a + dh_gencontrol -a + dh_md5sums -a + dh_builddeb -a + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- circuslinux-1.0.3.orig/debian/menu +++ circuslinux-1.0.3/debian/menu @@ -0,0 +1,7 @@ +?package(circuslinux):\ + needs="x11" \ + section="Games/Arcade" \ + longtitle="Circus Linux!" \ + title="Circus Linux" \ + command="/usr/games/circuslinux --fullscreen" \ + icon="/usr/share/pixmaps/circuslinux-icon.xpm" --- circuslinux-1.0.3.orig/debian/circuslinux.docs +++ circuslinux-1.0.3/debian/circuslinux.docs @@ -0,0 +1,7 @@ +AUTHORS.txt +CHANGES.txt +FAQ.txt +README.txt +README-SDL.txt +debian/merge_scorefiles.pl +debian/merge_scorefiles.sh --- circuslinux-1.0.3.orig/debian/patches/001_choppy_sound.diff +++ circuslinux-1.0.3/debian/patches/001_choppy_sound.diff @@ -0,0 +1,34 @@ +Package: circuslinux +Version: N/A; reported 2003-04-13 +Severity: normal +Tags: patch + +For over a year (perhaps two years), circuslinux has had very choppy +sound, even on fast machines (Athlon 1.2GHz, PIII-800, etc). The +problem seems to be that the call to Mix_OpenAudio uses a chunksize +(i.e. buffer size) that is too low. Applying the following patch fixes +it for me, and causes no noticeable lag in the sound. + +[...] + +Actually, change that "4096" -- "1024" seems to skip just a little bit on +my PIII-800 box. + +The "4096" is 4096 bytes, which translates into a 23 ms buffer +(4096/(44100*4) = .0232 s), which is still quite small. Even with that, I +still couldn't detect any lag in the sound. + + +----- BEGIN PATCH ----- +--- circuslinux-1.0.3/circuslinux.c 2001-04-29 00:38:01.000000000 -0600 ++++ /home/dwon/build/circuslinux-1.0.3/circuslinux.c 2003-04-13 10:10:14.000000000 -0600 +@@ -2809,7 +2809,7 @@ + #ifndef NOSOUND + if (use_sound == 1) + { +- if (Mix_OpenAudio(44100, AUDIO_S16, 2, 256) < 0) ++ if (Mix_OpenAudio(44100, AUDIO_S16, 2, 4096) < 0) + { + fprintf(stderr, + "\nWarning: I could not set up audio for 44100 Hz " +----- END PATCH ----- --- circuslinux-1.0.3.orig/debian/patches/002_debconf.diff +++ circuslinux-1.0.3/debian/patches/002_debconf.diff @@ -0,0 +1,164 @@ +diff -Nru circuslinux-1.0.3.ori/debian/circuslinux.templates circuslinux-1.0.3/debian/circuslinux.templates +--- circuslinux-1.0.3.ori/debian/circuslinux.templates 2003-08-01 10:02:57.000000000 +0200 ++++ circuslinux-1.0.3/debian/circuslinux.templates 2003-08-11 09:29:02.000000000 +0200 +@@ -1,26 +1,23 @@ + Template: circuslinux/shared_score_file + Type: note +-Description: Shared scorefile +- This version of Circuslinux! uses a shared score file. From now on ++_Description: Shared scorefile ++ This version of Circuslinux! uses a shared score file. From now on + highscores will no longer be saved in ~/.circuslinux but in + /var/games/circuslinux/scorefile. For configuration options the new file + ~/.circuslinuxrc will be used. + . + To merge all players' old highscores into one file, you can run: +- . +- bash /usr/share/doc/circuslinux/merge_scorefiles.sh +- . ++ bash /usr/share/doc/circuslinux/merge_scorefiles.sh + as root. + . +- Each player can then, _after_ playing this version of Circuslinux! at least +- once, delete his ~/.circuslinux file, since his configuration options will +- be saved in ~/.circuslinuxrc. +- If the player decides not to delete ~/.circuslinux, he can still use a +- version of circuslinux which was compiled without shared scorefile support +- without loosing his old score- and config file. +- Circuslinux! with shared scorefile support will only read the old config +- file to get the players options if ~/.circuslinuxrc does not exist, but +- never write to this file. ++ Each player can then, _after_ playing this version of Circuslinux! at ++ least once, delete his ~/.circuslinux file, since his configuration ++ options will be saved in ~/.circuslinuxrc. If the player decides not to ++ delete ~/.circuslinux, he can still use a version of circuslinux which was ++ compiled without shared scorefile support without loosing his old score- ++ and config file. Circuslinux! with shared scorefile support will only read ++ the old config file to get the players options if ~/.circuslinuxrc does ++ not exist, but never write to this file. + . + In short: don't worry, play Circuslinux! If you run low on diskspace and + every block counts, you might tell your users to remove the old config +@@ -28,11 +25,10 @@ + + Template: circuslinux/merge_score_files + Type: boolean +-Description: Merge score files? ++_Description: Merge score files? + Do you want me to run the merge_scorefile script for you? + + Template: circuslinux/score_file_exists + Type: boolean +-Description: scorefile exists +- You already have a scorefile! +- ++_Description: Scorefile exists ++ A merged scorefile in /var/games/circuslinux already exists! +diff -Nru circuslinux-1.0.3.ori/debian/control circuslinux-1.0.3/debian/control +--- circuslinux-1.0.3.ori/debian/control 2003-08-01 10:02:57.000000000 +0200 ++++ circuslinux-1.0.3/debian/control 2003-08-11 09:08:09.000000000 +0200 +@@ -3,7 +3,7 @@ + Priority: optional + Maintainer: Christian T. Steigies + Standards-Version: 3.5.9 +-Build-Depends: dbs, debhelper, libsdl1.2-dev (>= 1.2.2-3.1), libsdl-mixer1.2-dev (>= 1.2.0-1.1), libsdl-image1.2-dev (>= 1.2.0-1.1), autotools-dev, devscripts ++Build-Depends: dbs, debhelper (>= 4.1.16), libsdl1.2-dev (>= 1.2.2-3.1), libsdl-mixer1.2-dev (>= 1.2.0-1.1), libsdl-image1.2-dev (>= 1.2.0-1.1), autotools-dev, devscripts + + Package: circuslinux + Architecture: any +diff -Nru circuslinux-1.0.3.ori/debian/po/POTFILES.in circuslinux-1.0.3/debian/po/POTFILES.in +--- circuslinux-1.0.3.ori/debian/po/POTFILES.in 1970-01-01 01:00:00.000000000 +0100 ++++ circuslinux-1.0.3/debian/po/POTFILES.in 2003-08-11 09:08:10.000000000 +0200 +@@ -0,0 +1 @@ ++[type: gettext/rfc822deb] circuslinux.templates +diff -Nru circuslinux-1.0.3.ori/debian/po/templates.pot circuslinux-1.0.3/debian/po/templates.pot +--- circuslinux-1.0.3.ori/debian/po/templates.pot 1970-01-01 01:00:00.000000000 +0100 ++++ circuslinux-1.0.3/debian/po/templates.pot 2003-08-11 09:29:34.000000000 +0200 +@@ -0,0 +1,87 @@ ++# ++# Translators, if you are not familiar with the PO format, gettext ++# documentation is worth reading, especially sections dedicated to ++# this format, e.g. by running: ++# info -n '(gettext)PO Files' ++# info -n '(gettext)Header Entry' ++# ++# Some information specific to po-debconf are available at ++# /usr/share/doc/po-debconf/README-trans ++# or http://www.debian.org/intl/l10n/po-debconf/README-trans ++# ++# Developers do not need to manually edit POT or PO files. ++# ++#, fuzzy ++msgid "" ++msgstr "" ++"Project-Id-Version: PACKAGE VERSION\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2003-08-11 09:29+0200\n" ++"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" ++"Last-Translator: FULL NAME \n" ++"Language-Team: LANGUAGE \n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=CHARSET\n" ++"Content-Transfer-Encoding: 8bit\n" ++ ++#. Description ++#: ../circuslinux.templates:3 ++msgid "Shared scorefile" ++msgstr "" ++ ++#. Description ++#: ../circuslinux.templates:3 ++msgid "" ++"This version of Circuslinux! uses a shared score file. From now on " ++"highscores will no longer be saved in ~/.circuslinux but in /var/games/" ++"circuslinux/scorefile. For configuration options the new file ~/." ++"circuslinuxrc will be used." ++msgstr "" ++ ++#. Description ++#: ../circuslinux.templates:3 ++msgid "" ++"To merge all players' old highscores into one file, you can run:\n" ++" bash /usr/share/doc/circuslinux/merge_scorefiles.sh\n" ++"as root." ++msgstr "" ++ ++#. Description ++#: ../circuslinux.templates:3 ++msgid "" ++"Each player can then, _after_ playing this version of Circuslinux! at least " ++"once, delete his ~/.circuslinux file, since his configuration options will " ++"be saved in ~/.circuslinuxrc. If the player decides not to delete ~/." ++"circuslinux, he can still use a version of circuslinux which was compiled " ++"without shared scorefile support without loosing his old score- and config " ++"file. Circuslinux! with shared scorefile support will only read the old " ++"config file to get the players options if ~/.circuslinuxrc does not exist, " ++"but never write to this file." ++msgstr "" ++ ++#. Description ++#: ../circuslinux.templates:3 ++msgid "" ++"In short: don't worry, play Circuslinux! If you run low on diskspace and " ++"every block counts, you might tell your users to remove the old config file." ++msgstr "" ++ ++#. Description ++#: ../circuslinux.templates:28 ++msgid "Merge score files?" ++msgstr "" ++ ++#. Description ++#: ../circuslinux.templates:28 ++msgid "Do you want me to run the merge_scorefile script for you?" ++msgstr "" ++ ++#. Description ++#: ../circuslinux.templates:33 ++msgid "Scorefile exists" ++msgstr "" ++ ++#. Description ++#: ../circuslinux.templates:33 ++msgid "A merged scorefile in /var/games/circuslinux already exists!" ++msgstr "" --- circuslinux-1.0.3.orig/debian/copyright +++ circuslinux-1.0.3/debian/copyright @@ -0,0 +1,12 @@ +This package was debianized by Christian T. Steigies on +Thu, 10 Feb 2000 20:15:15 +0100. + +It was downloaded from ftp.sonic.net:/pub/users/nbs/unix/x/circus-linux +See also http://www.newbreedsoftware.com/ + +Upstream Author and Copyright: William (Bill) Kendrick + +Circus Linux! is distributed under the GNU GENERAL PUBLIC LICENSE. + +On Debian GNU/Linux systems, the complete text of the GNU General Public +License is found in `/usr/share/common-licenses/GPL'. --- circuslinux-1.0.3.orig/debian/changelog +++ circuslinux-1.0.3/debian/changelog @@ -0,0 +1,185 @@ +circuslinux (1.0.3-13) unstable; urgency=low + + * add Czech debconf template from Martin Sin (closes: #305393) + * add Vietnamese debconf template from Clytie Siddall (closes: #313343) + * typo fixes in German debconf template from Jens Seidel (closes: #313683) + * use debhelper compat 5 (moves menu file to /usr/share/menu) + * change build-depends for debhelper to (>= 4.9.1) + * GNU config automated update: config.sub (20041130 to 20050422), + config.guess (20041112 to 20050422) + + -- Christian T. Steigies Wed, 15 Jun 2005 21:38:25 +0200 + +circuslinux (1.0.3-12) unstable; urgency=low + + * fix copyright file + * add Catalan debconf template (closes: #290576) + * GNU config automated update: config.sub (20040624 to 20041130), + config.guess (20040813 to 20041112) + * fix lintian warnings about menu: + - menu icons now seem to belong in /usr/share/pixmaps + - change menu and rules accordingly + + -- Christian T. Steigies Sat, 15 Jan 2005 15:25:30 +0100 + +circuslinux (1.0.3-11) unstable; urgency=low + + * add Japanese debconf template (closes: #279955) + * use dh_installman instead of dh_installmanpages + * add correct section in manpage (6, not SECTION) + * GNU config automated update: config.sub (20040105 to 20040624), + config.guess (20040105 to 20040813) + + -- Christian T. Steigies Wed, 10 Nov 2004 00:33:18 +0100 + +circuslinux (1.0.3-10) unstable; urgency=low + + * add Dutch debconf template translations (closes: #241424) + * updated Standards-Version to 3.6.1.0 (no changes) + + -- Christian T. Steigies Mon, 19 Apr 2004 20:58:23 +0200 + +circuslinux (1.0.3-9) unstable; urgency=low + + * split data files into separate package (closes: #233332) + * GNU config automated update: config.sub (20030717 to 20031007), + config.guess (20030702 to 20031007) + * GNU config automated update: config.sub (20031007 to 20040105), + config.guess (20031007 to 20040105) + + -- Christian T. Steigies Tue, 24 Feb 2004 09:27:54 +0100 + +circuslinux (1.0.3-8) unstable; urgency=low + + * add Brazilian Portuguese debconf template translations (closes: #206942) + * add German templates, am I allowed to do that myself? + * add French debconf template translations (closes: #207241) + + -- Christian T. Steigies Thu, 28 Aug 2003 21:22:02 -0400 + +circuslinux (1.0.3-7) unstable; urgency=low + + * switch to gettext-based debconf templates, thanks to + Christian Perrier for the patch (closes: #205789) + * GNU config automated update: config.sub (20020307 to 20030717), + config.guess (20020320 to 20030702) + + -- Christian T. Steigies Sun, 17 Aug 2003 12:17:15 -0400 + +circuslinux (1.0.3-6) unstable; urgency=medium + + * make sure the scorefile is owned by root, thanks Dwayne Litzenberger + + -- Christian T. Steigies Fri, 18 Apr 2003 19:39:59 -0400 + +circuslinux (1.0.3-5) unstable; urgency=low + + * apply (improved) sound patch from Dwayne Litzenberger (closes: #188863) + * use debconf to explain how to merge all players scorefiles + * added shell script that calls perl script to do the actual merge + * enable shared scorefile (closes: #74127) + * GNU config automated update: config.sub (20011005 to 20020307), + config.guess (20011005 to 20020320) + + -- Christian T. Steigies Thu, 17 Apr 2003 22:41:39 -0400 + +circuslinux (1.0.3-4) unstable; urgency=low + + * add enable-scorefile option to configure.in and use it + + -- Christian T. Steigies Sun, 28 Oct 2001 22:25:50 -0500 + +circuslinux (1.0.3-3) unstable; urgency=low + + * do not use automake, autoconf for package building (closes: #114130) + * complete overhaul, do not delete configure, aclocal.m4 and Makefile.in + in clean target, added configure and autotools target, many thanks to hmh + for the hints + * added autotools-dev, devscripts to Build-Depends, maybe it should + Build-Conflict with the autochain tools? + + -- Christian T. Steigies Sat, 13 Oct 2001 20:17:28 -0400 + +circuslinux (1.0.3-2) unstable; urgency=low + + * Build-Depends on libsdl1.2-dev (>= 1.2.2-3.1), + libsdl-image1.2-dev(>= 1.2.0-1.1), libsdl-mixer1.2-dev (>= 1.2.0-1.1) + due to SDL overhaul + + -- Christian T. Steigies Wed, 10 Oct 2001 23:17:59 -0400 + +circuslinux (1.0.3-1) unstable; urgency=low + + * new upstream version + * build with SDL1.2 packages + * fix version number (this _is_ 1.0.3, not 1.0.2) + * improve clean target in debian/rules (rm circuslinux and circuslinux.o) + * update manpage (new --digital and --paddle options) + * update Standards-Version + * do not ship INSTALL.txt + + -- Christian T. Steigies Tue, 5 Jun 2001 21:18:54 -0400 + +circuslinux (1.0.1-3) unstable; urgency=low + + * remove (unneeded) dh_suidregister from debian/rules + * debian/changelog + + -- Christian T. Steigies Sat, 3 Feb 2001 21:16:47 +0100 + +circuslinux (1.0.1-2) unstable; urgency=low + + * rebuild with SDL1.0, sdl-image1.0 and sdl-mixer1.0 + + -- Christian T. Steigies Sat, 4 Nov 2000 01:24:15 +0100 + +circuslinux (1.0.1-1) unstable; urgency=low + + * New upstream version (closes: #65266) + * Fixed build-depends (closes: #65243) + + -- Christian T. Steigies Tue, 6 Jun 2000 13:28:11 +0200 + +circuslinux (0.0.4-2) unstable; urgency=low + + * Added an improved description from Bill. I hope this (closes: #62417) + (the bug submitter never bothered to answer my questions) + * SDL 1.1 has appeared in the archives (closes: #62501) + + -- Christian T. Steigies Thu, 11 May 2000 22:28:13 +0200 + +circuslinux (0.0.4-1) unstable; urgency=low + + * new upstream version, joystick not yet supported SDL available in debian + * when started from the menu, start in fullscreen mode + + -- Christian T. Steigies Wed, 12 Apr 2000 18:11:53 +0200 + +circuslinux (0.0.3-1) unstable; urgency=low + + * new upstream version + + -- Christian T. Steigies Mon, 10 Apr 2000 18:45:12 +0200 + +circuslinux (0.0.2-2) unstable; urgency=low + + * sdl-config --static-libs instead of --libs, thanks Roman + * closes: #61255 + + -- Christian T. Steigies Tue, 28 Mar 2000 22:43:04 +0200 + +circuslinux (0.0.2-1) unstable; urgency=low + + * new upstream version + * icon is now provided upstream, don't convert the bitmap and + no longer Build-Depend on imagemagick + + -- Christian T. Steigies Mon, 13 Mar 2000 21:48:45 +0100 + +circuslinux (0.0.1-1) unstable; urgency=low + + * Initial Release. + + -- Christian T. Steigies Thu, 10 Feb 2000 20:15:15 +0100 + + --- circuslinux-1.0.3.orig/debian/circuslinux.6 +++ circuslinux-1.0.3/debian/circuslinux.6 @@ -0,0 +1,83 @@ +.\" Hey, EMACS: -*- nroff -*- +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.TH CIRCUSLINUX 6 "November 10, 2004" +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.SH NAME +circuslinux \- The clowns are trying to pop balloons to score points! +.SH SYNOPSIS +.B circuslinux [--disable-sound] [--fullscreen] [--low] | [--digital] [--paddle] [--help | --usage] [--version] +.SH DESCRIPTION +This manual page was written for the Debian GNU/Linux distribution +because the original program does not have a manual page. +Instead, it has documentation in /usr/share/doc/circuslinux/README.txt.gz +.PP +\fB"Circus Linux!"\fP is based on the Atari 2600 game "Circus Atari" by Atari, + released in 1980. Gameplay is similar to "Breakout" and "Arkanoid"- you + slide a device left and right to bounce objects into the air which destroy + a wall. + +.SH OPTIONS +.TP +.B --disable-sound +If sound support was compiled in, this will +disable it for this session of the game. +.B --fullscreen +Run in fullscreen mode. +.B --low +Disable some features so that the game might run +better on low-end hardware. Titlescreen ballons +and game backgrounds are disabled, and the game +screen refreshes every 1/15th of a second instead +of 1/30th of a second. +.B --digital +When using a joystick, left and right cause the +teeter-totter to move incrementally. (This is +as opposed to the default mode, where the analog +position of the joystick is used literally.) +Useful for playing with a digital gamepad. +.B --paddle +For using real Atari 2600 paddles connected to +a your PC's joystick port. +.B --help +Display a help message summarizing command-line +options, copyright, and game controls. +.B --usage +Display a brief message summarizing command-line +options. +.B --version +Display the version of Circus Linux! you're +running. +.SH CONTROL +.B Controlling the Teeter-Totter +Move the mouse left and right to move the teeter-totter left and right. + +If a clown is in the air, you can also click any of the mouse buttons +to flip the teeter-totter. (This causes the low and high ends of the +teeter-totter to change places, useful when the teeter-totter is at a +far side of the screen and the low end is on the outside.) +.B Pausing +To pause the game, you can press either the [SPACE], [TAB] or [P] +key. To unpause, press one of those keys again. +.B Quitting +To quit the current game, you can press [ESCAPE]. This forfeits your game +(as though you ran out of lives). + +To quit Circus Linux! altogether, you can use your window manager's +close command or press EXIT on the title screen. + +.SH AUTHOR +This manual page was written by Christian T. Steigies , +for the Debian GNU/Linux system (but may be used by others). --- circuslinux-1.0.3.orig/debian/watch +++ circuslinux-1.0.3/debian/watch @@ -0,0 +1,7 @@ +# format version number, currently 2; this line is compulsory! +version=2 + +# Site Directory Pattern Version Script +#ftp://ftp.sonic.net /pub/users/nbs/unix/x/circus-linux circuslinux-(.*)\.tar\.gz debian uupdate +#ftp://ftp.sonic.net/pub/users/nbs/unix/x/circus-linux/circuslinux-([\d\.]+)\.tar\.gz debian uupdate +http://nbswebfx.com/downloads/circuslinux-([\d\.]+)\.tar\.gz debian uupdate --- circuslinux-1.0.3.orig/debian/po/vi.po +++ circuslinux-1.0.3/debian/po/vi.po @@ -0,0 +1,108 @@ +# Vietnamese translation for circuslinux. +# Copyright © 2005 Free Software Foundation, Inc. +# Clytie Siddall , 2005. +# +msgid "" +msgstr "" +"Project-Id-Version: circuslinux 1.0.3-12\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-04-19 21:27+0200\n" +"PO-Revision-Date: 2005-06-13 17:02+0930\n" +"Last-Translator: Clytie Siddall \n" +"Language-Team: Vietnamese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0\n" + +#. Type: note +#. Description +#: ../circuslinux.templates:3 +msgid "Shared scorefile" +msgstr "Tập tin điểm dùng chung" + +#. Type: note +#. Description +#: ../circuslinux.templates:3 +msgid "" +"This version of Circuslinux! uses a shared score file. From now on " +"highscores will no longer be saved in ~/.circuslinux but in /var/games/" +"circuslinux/scorefile. For configuration options the new file ~/." +"circuslinuxrc will be used." +msgstr "" +"Phiên bản Circuslinux! này dùng một tập tin điểm dùng chung. Từ lúc này, sé " +"không lưu điểm cao vào «~/.circuslinux»: sẽ lưu các điểm ấy vào «/var/games/" +"circuslinux/scorefile» thay vào đó. Sẽ cũng sử dụng tập tin mới «~/." +"circuslinuxrc» để sửa đổi cấu hình." + +#. Type: note +#. Description +#: ../circuslinux.templates:3 +msgid "" +"To merge all players' old highscores into one file, you can run:\n" +" bash /usr/share/doc/circuslinux/merge_scorefiles.sh\n" +"as root." +msgstr "" +"Để phối hợp các điểm cao của mọi người chơi vào cùng một tập tin, bạn có thể " +"chạy lệnh này với tư cách người chủ (root):\n" +"bash /usr/share/doc/circuslinux/merge_scorefiles.sh" + +#. Type: note +#. Description +#: ../circuslinux.templates:3 +msgid "" +"Each player can then, _after_ playing this version of Circuslinux! at least " +"once, delete his ~/.circuslinux file, since his configuration options will " +"be saved in ~/.circuslinuxrc. If the player decides not to delete ~/." +"circuslinux, he can still use a version of circuslinux which was compiled " +"without shared scorefile support without loosing his old score- and config " +"file. Circuslinux! with shared scorefile support will only read the old " +"config file to get the players options if ~/.circuslinuxrc does not exist, " +"but never write to this file." +msgstr "" +"Sau đó, mỗi người chơi cần phải chơi phiên bản Circuslinux! này ít nhất một " +"lần trước khi xóa bỏ tập tin «~/.circuslinux» của họ. Các tùy chọn cấu hình " +"của họ sẽ được lưu vào tập tin «~/.circuslinuxrc», như nói trên. Nếu một " +"người chơi nào đó quyết định không xóa bỏ tập tin «~/.circuslinux», trong " +"trường hợp ấy họ vẫn còn có thể sử dụng một phiên bản Circuslinux! được biên " +"dịch không có cách hỗ trợ tập tin điểm dùng chung, và không mất tập tin điểm " +"và cấu hình cũ. Trình Circuslinux! mới, có cách hỗ trợ tập tin điểm dùng " +"chung, sẽ đọc tập tin cấu hình cũ để gọi các tùy chọn của những người chơi " +"chỉ nếu không có tập tin «~/.circuslinuxrc». Nó sẽ không bao giờ ghi vào tập " +"tin cũ ấy." + +#. Type: note +#. Description +#: ../circuslinux.templates:3 +msgid "" +"In short: don't worry, play Circuslinux! If you run low on diskspace and " +"every block counts, you might tell your users to remove the old config file." +msgstr "" +"Tức là, đừng lo bạn, chơi đi! Nếu bạn không có đủ sức chứa trên đĩa, có lẽ " +"bạn sẽ muốn loại bỏ các tập tin cấu hình ấy. Nếu không thì không có sao." + +#. Type: boolean +#. Description +#: ../circuslinux.templates:28 +msgid "Merge score files?" +msgstr "Phối hợp các tập tin điểm không?" + +#. Type: boolean +#. Description +#: ../circuslinux.templates:28 +msgid "Do you want me to run the merge_scorefile script for you?" +msgstr "" +"Bạn có muốn trình này chạy tập lệnh «merge_scorefile» (phối tập tin điểm) " +"cho bạn không?" + +#. Type: boolean +#. Description +#: ../circuslinux.templates:33 +msgid "Scorefile exists" +msgstr "Có tập tin điểm rồi" + +#. Type: boolean +#. Description +#: ../circuslinux.templates:33 +msgid "A merged scorefile in /var/games/circuslinux already exists!" +msgstr "Có một tập tin điểm đã phối hợp trong «/var/games/circuslinux» rồi." --- circuslinux-1.0.3.orig/debian/po/templates.pot +++ circuslinux-1.0.3/debian/po/templates.pot @@ -0,0 +1,96 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-04-19 21:27+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: note +#. Description +#: ../circuslinux.templates:3 +msgid "Shared scorefile" +msgstr "" + +#. Type: note +#. Description +#: ../circuslinux.templates:3 +msgid "" +"This version of Circuslinux! uses a shared score file. From now on " +"highscores will no longer be saved in ~/.circuslinux but in /var/games/" +"circuslinux/scorefile. For configuration options the new file ~/." +"circuslinuxrc will be used." +msgstr "" + +#. Type: note +#. Description +#: ../circuslinux.templates:3 +msgid "" +"To merge all players' old highscores into one file, you can run:\n" +" bash /usr/share/doc/circuslinux/merge_scorefiles.sh\n" +"as root." +msgstr "" + +#. Type: note +#. Description +#: ../circuslinux.templates:3 +msgid "" +"Each player can then, _after_ playing this version of Circuslinux! at least " +"once, delete his ~/.circuslinux file, since his configuration options will " +"be saved in ~/.circuslinuxrc. If the player decides not to delete ~/." +"circuslinux, he can still use a version of circuslinux which was compiled " +"without shared scorefile support without loosing his old score- and config " +"file. Circuslinux! with shared scorefile support will only read the old " +"config file to get the players options if ~/.circuslinuxrc does not exist, " +"but never write to this file." +msgstr "" + +#. Type: note +#. Description +#: ../circuslinux.templates:3 +msgid "" +"In short: don't worry, play Circuslinux! If you run low on diskspace and " +"every block counts, you might tell your users to remove the old config file." +msgstr "" + +#. Type: boolean +#. Description +#: ../circuslinux.templates:28 +msgid "Merge score files?" +msgstr "" + +#. Type: boolean +#. Description +#: ../circuslinux.templates:28 +msgid "Do you want me to run the merge_scorefile script for you?" +msgstr "" + +#. Type: boolean +#. Description +#: ../circuslinux.templates:33 +msgid "Scorefile exists" +msgstr "" + +#. Type: boolean +#. Description +#: ../circuslinux.templates:33 +msgid "A merged scorefile in /var/games/circuslinux already exists!" +msgstr "" --- circuslinux-1.0.3.orig/debian/po/POTFILES.in +++ circuslinux-1.0.3/debian/po/POTFILES.in @@ -0,0 +1 @@ +[type: gettext/rfc822deb] circuslinux.templates --- circuslinux-1.0.3.orig/debian/po/pt_BR.po +++ circuslinux-1.0.3/debian/po/pt_BR.po @@ -0,0 +1,117 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: circuslinux_1.0.3-7\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-04-19 21:27+0200\n" +"PO-Revision-Date: 2003-08-21 21:52-0300\n" +"Last-Translator: Andr Lus Lopes \n" +"Language-Team: Debian-BR Project \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-1\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: note +#. Description +#: ../circuslinux.templates:3 +msgid "Shared scorefile" +msgstr "Arquivo de pontuao compartilhado" + +#. Type: note +#. Description +#: ../circuslinux.templates:3 +msgid "" +"This version of Circuslinux! uses a shared score file. From now on " +"highscores will no longer be saved in ~/.circuslinux but in /var/games/" +"circuslinux/scorefile. For configuration options the new file ~/." +"circuslinuxrc will be used." +msgstr "" +"Esta verso do Circuslinux! utiliza um arquivo de pontuao compartilhado. A " +"partir de agora as pontuaes mais altas no sero mais armazenadas em ~/." +"circuslinux mas sim no arquivo /var/games/circuslinux/scorefile. Para " +"armazenar as opes de configurao o novo arquivo ~/.circuslinuxrc ser " +"usado." + +#. Type: note +#. Description +#: ../circuslinux.templates:3 +msgid "" +"To merge all players' old highscores into one file, you can run:\n" +" bash /usr/share/doc/circuslinux/merge_scorefiles.sh\n" +"as root." +msgstr "" +"Para mesclar todas as antigas pontuaes mais altas de todos os jogadores em " +"um nico arquivo voc pode executar o comando : \n" +" bash /usr/share/doc/circuslinux/merge_scorefiles.sh\n" +"como usurio root." + +#. Type: note +#. Description +#: ../circuslinux.templates:3 +msgid "" +"Each player can then, _after_ playing this version of Circuslinux! at least " +"once, delete his ~/.circuslinux file, since his configuration options will " +"be saved in ~/.circuslinuxrc. If the player decides not to delete ~/." +"circuslinux, he can still use a version of circuslinux which was compiled " +"without shared scorefile support without loosing his old score- and config " +"file. Circuslinux! with shared scorefile support will only read the old " +"config file to get the players options if ~/.circuslinuxrc does not exist, " +"but never write to this file." +msgstr "" +"Cada jogador poder ento, _aps_ jogar esta verso co Circuslinux! pelo " +"menos uma vez, apagar seu arquivo ~/.circuslinux, uma vez que suas opes de " +"configurao sero gravadas em ~/.circuslinuxrc. Caso o jogador decida no " +"apagar seu arquivo ~/.circuslinux, o mesmo poder ainda usar a verso do " +"circuslinux que foi compilada sem o suporte a arquivos de pontuao " +"compartilhados sem perder sua antiga pontuao - e arquivo de configurao. " +"O Circuslinux! com suporte ao arquivo de pontuao compartilhado ir ler " +"somente o antigo arquivo de configurao para obter as opes dos jogadores " +"caso o arquivo ~/.circuslinuxrc no exista, mas nunca ir gravar nesse " +"arquivo." + +#. Type: note +#. Description +#: ../circuslinux.templates:3 +msgid "" +"In short: don't worry, play Circuslinux! If you run low on diskspace and " +"every block counts, you might tell your users to remove the old config file." +msgstr "" +"Resumindo: no se preocupe, jogue o Circuslinux! Caso voc fique sem espao " +"em disco e cada bloco adicional seja precioso, voc pode pedir a seus " +"usurios para removerem seus antigos arquivos de configurao." + +#. Type: boolean +#. Description +#: ../circuslinux.templates:28 +msgid "Merge score files?" +msgstr "Mesclar arquivos de pontuao ?" + +#. Type: boolean +#. Description +#: ../circuslinux.templates:28 +msgid "Do you want me to run the merge_scorefile script for you?" +msgstr "Deseja que o script merge_scorefiles seja executado para voc ?" + +#. Type: boolean +#. Description +#: ../circuslinux.templates:33 +msgid "Scorefile exists" +msgstr "Arquivo de pontuao existe" + +#. Type: boolean +#. Description +#: ../circuslinux.templates:33 +msgid "A merged scorefile in /var/games/circuslinux already exists!" +msgstr "Um arquivo de pontuao mesclado em /var/games/circuslinux j existe !" --- circuslinux-1.0.3.orig/debian/po/fr.po +++ circuslinux-1.0.3/debian/po/fr.po @@ -0,0 +1,119 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: circuslinux (1.0.3-6)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-04-19 21:27+0200\n" +"PO-Revision-Date: 2003-08-11 09:25+0100\n" +"Last-Translator: Christian Perrier \n" +"Language-Team: French \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-15\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: note +#. Description +#: ../circuslinux.templates:3 +msgid "Shared scorefile" +msgstr "Fichier de scores partag" + +#. Type: note +#. Description +#: ../circuslinux.templates:3 +msgid "" +"This version of Circuslinux! uses a shared score file. From now on " +"highscores will no longer be saved in ~/.circuslinux but in /var/games/" +"circuslinux/scorefile. For configuration options the new file ~/." +"circuslinuxrc will be used." +msgstr "" +"Cette version de Circuslinux! utilise un fichier de scores partag. partir " +"de maintenant, les scores les plus levs ne seront plus prservs dans ~/." +"circuslinux mais dans le fichier /var/games/circuslinux/scorefile. Les " +"options de configuration seront, elles, conserves dans un nouveau fichier: " +"~/.circuslinuxrc." + +#. Type: note +#. Description +#: ../circuslinux.templates:3 +msgid "" +"To merge all players' old highscores into one file, you can run:\n" +" bash /usr/share/doc/circuslinux/merge_scorefiles.sh\n" +"as root." +msgstr "" +"Si vous souhaitez fusionner les scores les plus levs de tous les joueurs " +"en un seul fichier, vous pouvez utiliser, en tant que super-utilisateur, la " +"commande bash /usr/share/doc/circuslinux/merge_scorefiles.sh." + +#. Type: note +#. Description +#: ../circuslinux.templates:3 +msgid "" +"Each player can then, _after_ playing this version of Circuslinux! at least " +"once, delete his ~/.circuslinux file, since his configuration options will " +"be saved in ~/.circuslinuxrc. If the player decides not to delete ~/." +"circuslinux, he can still use a version of circuslinux which was compiled " +"without shared scorefile support without loosing his old score- and config " +"file. Circuslinux! with shared scorefile support will only read the old " +"config file to get the players options if ~/.circuslinuxrc does not exist, " +"but never write to this file." +msgstr "" +"Chaque joueur pourra alors, _aprs_ avoir jou au moins une fois " +"Circuslinux!, effacer son fichier ~/.circuslinux puisque ses options seront " +"alors prserves dans ~/.circuslinuxrc. Si le joueur prfre ne pas effacer " +"ce fichier, il peut continuer utiliser une version de Circuslinux! " +"compile sans la gestion du fichier de scores partag. Ainsi, il ne perdra " +"pas ses anciens fichiers de scores et de configuration. Circuslinux! avec " +"gestion du fichier de scores partag utilisera l'ancien fichier pour lire " +"les options des joueurs, si un fichier ~/.circuslinuxrc n'existe pas. " +"Cependant, il n'crira jamais dans cet ancien fichier." + +#. Type: note +#. Description +#: ../circuslinux.templates:3 +msgid "" +"In short: don't worry, play Circuslinux! If you run low on diskspace and " +"every block counts, you might tell your users to remove the old config file." +msgstr "" +"En rsum: pas de panique et jouez Circuslinux!. Si vous manquez d'espace " +"disque et que chaque bloc compte, vous pouvez demander vos utilisateurs de " +"supprimer leurs anciens fichiers de configuration." + +#. Type: boolean +#. Description +#: ../circuslinux.templates:28 +msgid "Merge score files?" +msgstr "Faut-il fusionner les fichiers de scores?" + +#. Type: boolean +#. Description +#: ../circuslinux.templates:28 +msgid "Do you want me to run the merge_scorefile script for you?" +msgstr "" +"Souhaitez-vous que les fichiers de scores soient fusionns automatiquement?" + +#. Type: boolean +#. Description +#: ../circuslinux.templates:33 +msgid "Scorefile exists" +msgstr "Un fichier de scores existe dj" + +#. Type: boolean +#. Description +#: ../circuslinux.templates:33 +msgid "A merged scorefile in /var/games/circuslinux already exists!" +msgstr "Un fichier de scores est dj prsent dans /var/games/circuslinux!" + +#~ msgid "You already have a scorefile!" +#~ msgstr "Un fichier de scores est dj prsent sur le systme!" --- circuslinux-1.0.3.orig/debian/po/de.po +++ circuslinux-1.0.3/debian/po/de.po @@ -0,0 +1,119 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: circuslinux_1.0.3-13\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-04-19 21:27+0200\n" +"PO-Revision-Date: 2005-06-14 23:55+0200\n" +"Last-Translator: Christian T. Steigies \n" +"Language-Team: team? What team?\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-1\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: note +#. Description +#: ../circuslinux.templates:3 +msgid "Shared scorefile" +msgstr "Gemeinsame Spielstandsdatei" + +#. Type: note +#. Description +#: ../circuslinux.templates:3 +msgid "" +"This version of Circuslinux! uses a shared score file. From now on " +"highscores will no longer be saved in ~/.circuslinux but in /var/games/" +"circuslinux/scorefile. For configuration options the new file ~/." +"circuslinuxrc will be used." +msgstr "" +"Diese Version von Circuslinux! benutzt eine gemeinsame Spielstandsdatei. Von " +"nun an werden Spielstnde nicht mehr in der Datei ~/.circuslinux, sondern " +"in /var/games/circuslinux/scorefile gespeichert. Fr " +"Konfigurationseinstellungen wird die neue Datei ~/.circuslinuxrc benutzt." + +#. Type: note +#. Description +#: ../circuslinux.templates:3 +msgid "" +"To merge all players' old highscores into one file, you can run:\n" +" bash /usr/share/doc/circuslinux/merge_scorefiles.sh\n" +"as root." +msgstr "" +"Um die Spielstnde aller Spieler in einer Datei zu speichern, knnen Sie als " +"Benutzer root folgendes ausfhren: bash /usr/share/doc/circuslinux/" +"merge_scorefiles.sh." + +#. Type: note +#. Description +#: ../circuslinux.templates:3 +msgid "" +"Each player can then, _after_ playing this version of Circuslinux! at least " +"once, delete his ~/.circuslinux file, since his configuration options will " +"be saved in ~/.circuslinuxrc. If the player decides not to delete ~/." +"circuslinux, he can still use a version of circuslinux which was compiled " +"without shared scorefile support without loosing his old score- and config " +"file. Circuslinux! with shared scorefile support will only read the old " +"config file to get the players options if ~/.circuslinuxrc does not exist, " +"but never write to this file." +msgstr "" +"Jeder Spieler kann nun, nachdem er mindestens einmal diese Version von " +"Circuslinux! gepielt hat, seine ~/.circuslinux Datei lschen, da seine " +"Konfiguration nun in ~/.circuslinuxrc gespeichert ist. Wenn der Spieler sich " +"entschliet die Datei ~/.circuslinux nicht zu lschen, kann er immer noch " +"eine Version von circuslinux benutzen, die ohne die Option fr Gemeinsame " +"Spielstnde kompiliert wurde, ohne dabei seine alte Spielstands- und " +"Konfigurationsdatei zu verlieren. Circuslinux! mit der Gemeinsamen " +"Spielstands Option liest lediglich die Konfigurationsoptionen aus der " +"alten Datei wenn die Datei ~/.circuslinuxrc nicht existiert, es wird jedoch " +"niemals die alte Datei berschreiben." + +#. Type: note +#. Description +#: ../circuslinux.templates:3 +msgid "" +"In short: don't worry, play Circuslinux! If you run low on diskspace and " +"every block counts, you might tell your users to remove the old config file." +msgstr "" +"Kurz gesagt, keine Bange, spielt Circuslinux!\n" +"Wenn Sie jedoch wenig Festplattenplatz haben sollten und jeder einzelne " +"Block wichtig ist, knnen Sie Ihre Benutzer bitten die alte " +"Konfigurationsdatei zu entfernen." + +#. Type: boolean +#. Description +#: ../circuslinux.templates:28 +msgid "Merge score files?" +msgstr "Sollen die Spielstnde zu einer Datei zusammengefgt werden?" + +#. Type: boolean +#. Description +#: ../circuslinux.templates:28 +msgid "Do you want me to run the merge_scorefile script for you?" +msgstr "Soll nun das merge_scorefile script ausgefhrt werden?" + +#. Type: boolean +#. Description +#: ../circuslinux.templates:33 +msgid "Scorefile exists" +msgstr "Spielstandsdatei existiert bereits" + +#. Type: boolean +#. Description +#: ../circuslinux.templates:33 +msgid "A merged scorefile in /var/games/circuslinux already exists!" +msgstr "" +"Eine gemeinsame Spielstandsdatei existiert bereits in /var/games/" +"circuslinux !" --- circuslinux-1.0.3.orig/debian/po/nl.po +++ circuslinux-1.0.3/debian/po/nl.po @@ -0,0 +1,116 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: circuslinux 1.0.3-9\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-04-19 21:27+0200\n" +"PO-Revision-Date: 2004-03-29 10:08+0100\n" +"Last-Translator: Luk Claes \n" +"Language-Team: Debian l10n Dutch \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-1\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: note +#. Description +#: ../circuslinux.templates:3 +msgid "Shared scorefile" +msgstr "Gedeeld scorebestand" + +#. Type: note +#. Description +#: ../circuslinux.templates:3 +msgid "" +"This version of Circuslinux! uses a shared score file. From now on " +"highscores will no longer be saved in ~/.circuslinux but in /var/games/" +"circuslinux/scorefile. For configuration options the new file ~/." +"circuslinuxrc will be used." +msgstr "" +"Deze versie van Circuslinux! gebruikt een gedeeld scorebestand. Vanaf nu " +"zullen de beste scores niet langer bewaard worden in ~/.circuslinux, maar " +"in /var/games/circuslinux/scorefile. Voor configuratie-opties zal het nieuwe " +"bestand ~/.circuslinuxrc worden gebruikt." + +#. Type: note +#. Description +#: ../circuslinux.templates:3 +msgid "" +"To merge all players' old highscores into one file, you can run:\n" +" bash /usr/share/doc/circuslinux/merge_scorefiles.sh\n" +"as root." +msgstr "" +"Om de beste scores van alle spelers samen te voegen in n bestand, kunt u " +"het volgende uitvoeren:\n" +" bash /usr/share/doc/circuslinux/merge_scorefiles.sh\n" +"als root." + +#. Type: note +#. Description +#: ../circuslinux.templates:3 +msgid "" +"Each player can then, _after_ playing this version of Circuslinux! at least " +"once, delete his ~/.circuslinux file, since his configuration options will " +"be saved in ~/.circuslinuxrc. If the player decides not to delete ~/." +"circuslinux, he can still use a version of circuslinux which was compiled " +"without shared scorefile support without loosing his old score- and config " +"file. Circuslinux! with shared scorefile support will only read the old " +"config file to get the players options if ~/.circuslinuxrc does not exist, " +"but never write to this file." +msgstr "" +"Elke speler kan dan, _na_ deze versie van Circuslinux! tenminste n keer " +"gespeeld te hebben, zijn ~/.circuslinux-bestand verwijderen omdat zijn " +"configuratie-opties bewaard zullen worden in ~/.circuslinuxrc. De speler kan " +"besluiten om ~/.circuslinx niet te verwijderen. Hij kan dan nog altijd een " +"versie van circuslinux gebruiken die gecompileerd was zonder ondersteuning " +"voor een gedeeld scorebestand zonder zijn oude score- en " +"configuratiebestanden te verliezen. Circuslinux! met ondersteuning voor een " +"gedeeld scorebestand zal enkel het oude configuratiebestand lezen om de " +"opties van de spelers te weten als ~/.circuslinuxrc niet bestaat, maar zal " +"nooit naar dit bestand schrijven." + +#. Type: note +#. Description +#: ../circuslinux.templates:3 +msgid "" +"In short: don't worry, play Circuslinux! If you run low on diskspace and " +"every block counts, you might tell your users to remove the old config file." +msgstr "" +"In het kort: trek het u niet aan, speel Circuslinux! Als u weinig " +"schijfruimte overhoudt en elk blok telt, kunt u uw gebruikers vragen de oude " +"configuratiebestanden te verwijderen." + +#. Type: boolean +#. Description +#: ../circuslinux.templates:28 +msgid "Merge score files?" +msgstr "Scorebestanden samenvoegen?" + +#. Type: boolean +#. Description +#: ../circuslinux.templates:28 +msgid "Do you want me to run the merge_scorefile script for you?" +msgstr "Wilt u dat merge_scorefile voor u wordt uitgevoerd?" + +#. Type: boolean +#. Description +#: ../circuslinux.templates:33 +msgid "Scorefile exists" +msgstr "Het scorebestand bestaat al" + +#. Type: boolean +#. Description +#: ../circuslinux.templates:33 +msgid "A merged scorefile in /var/games/circuslinux already exists!" +msgstr "Het samengevoegde scorebestand in /var/games/circuslinux bestaat al!" --- circuslinux-1.0.3.orig/debian/po/ja.po +++ circuslinux-1.0.3/debian/po/ja.po @@ -0,0 +1,114 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +# +msgid "" +msgstr "" +"Project-Id-Version: circuslinux 1.0.3-10\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-04-19 21:27+0200\n" +"PO-Revision-Date: 2004-09-24 15:33+0900\n" +"Last-Translator: Hideki Yamane \n" +"Language-Team: Japanese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=EUC-JP\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: note +#. Description +#: ../circuslinux.templates:3 +msgid "Shared scorefile" +msgstr "ͭեˤĤ" + +#. Type: note +#. Description +#: ../circuslinux.templates:3 +msgid "" +"This version of Circuslinux! uses a shared score file. From now on " +"highscores will no longer be saved in ~/.circuslinux but in /var/games/" +"circuslinux/scorefile. For configuration options the new file ~/." +"circuslinuxrc will be used." +msgstr "" +"ΥС Circuslinux! ϶ͭեȤޤʹߡϥ" +" ~/.circuslinux ǤϤʤ /var/games/circuslinux/scorefile ˥֤" +"ޤꥪץˤϿե ~/.circuslinuxrc Ȥ褦ˤ" +"ޤ" + +#. Type: note +#. Description +#: ../circuslinux.templates:3 +msgid "" +"To merge all players' old highscores into one file, you can run:\n" +" bash /usr/share/doc/circuslinux/merge_scorefiles.sh\n" +"as root." +msgstr "" +"ץ쥤䡼βΥϥ 1 ե˥ޡˤϡroot 桼Ȥ" +"ưʲͤ˼¹ԤвǽǤ:\n" +" bash /usr/share/doc/circuslinux/merge_scorefiles.sh" + +#. Type: note +#. Description +#: ../circuslinux.templates:3 +msgid "" +"Each player can then, _after_ playing this version of Circuslinux! at least " +"once, delete his ~/.circuslinux file, since his configuration options will " +"be saved in ~/.circuslinuxrc. If the player decides not to delete ~/." +"circuslinux, he can still use a version of circuslinux which was compiled " +"without shared scorefile support without loosing his old score- and config " +"file. Circuslinux! with shared scorefile support will only read the old " +"config file to get the players options if ~/.circuslinuxrc does not exist, " +"but never write to this file." +msgstr "" +"ġΥץ쥤䡼Ϥ줫顢ΥС Circuslinux! 򾯤ʤȤ 1 " +"ץ쥤ָפˡʬ ~/.circuslinux եǤꥪץ" +" ~/.circuslinuxrc ե˥֤ޤץ쥤䡼 ~/.circuslinux " +"ʤȷ᤿硢Υե򼺤Ȥʤͭ" +"ե륵ݡȤʤǥѥ뤵줿С Circuslinux! ȤĤ" +"ޤͭե򥵥ݡȤƤ Circuslinux! ϡ~/." +"circuslinuxrc ¸ߤƤʤ硢ץ쥤䡼Υץ뤿˲" +"եɤ߼ǡΥեˤϽ񤭹ߤ򤷤ޤ" + +#. Type: note +#. Description +#: ../circuslinux.templates:3 +msgid "" +"In short: don't worry, play Circuslinux! If you run low on diskspace and " +"every block counts, you might tell your users to remove the old config file." +msgstr "" +"Ǹ: ˤ Circuslinux! ͷǤĤ꾯ʤǥ" +"̤֥åǼ¹ԤƤϡ桼ФƸŤե" +"褦ˤꤤۤɤ⤷ޤ" + +#. Type: boolean +#. Description +#: ../circuslinux.templates:28 +msgid "Merge score files?" +msgstr "եޡޤ?" + +#. Type: boolean +#. Description +#: ../circuslinux.templates:28 +msgid "Do you want me to run the merge_scorefile script for you?" +msgstr "merge_scorefile ץȤ¹Ԥޤ?" + +#. Type: boolean +#. Description +#: ../circuslinux.templates:33 +msgid "Scorefile exists" +msgstr "ե뤬¸ߤƤޤ" + +#. Type: boolean +#. Description +#: ../circuslinux.templates:33 +msgid "A merged scorefile in /var/games/circuslinux already exists!" +msgstr "˥ޡ줿ե뤬 /var/games/circuslinux ˤޤ!" --- circuslinux-1.0.3.orig/debian/po/ca.po +++ circuslinux-1.0.3/debian/po/ca.po @@ -0,0 +1,89 @@ +# translation of circuslinux_1.0.3-11_templates.po to catalan +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans# +# Developers do not need to manually edit POT or PO files. +# Jordi Fernández Mora , 2004. +# Miguel Gea Milvaques , 2004. +# +msgid "" +msgstr "" +"Project-Id-Version: circuslinux_1.0.3-11\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2003-08-11 09:29+0200\n" +"PO-Revision-Date: 2004-12-13 23:46+0100\n" +"Last-Translator: Miguel Gea Milvaques \n" +"Language-Team: Catalan \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.9.1\n" + +#. Description +#: ../circuslinux.templates:3 +msgid "Shared scorefile" +msgstr "Fitxer de puntuacions compartit" + +#. Description +#: ../circuslinux.templates:3 +msgid "" +"This version of Circuslinux! uses a shared score file. From now on " +"highscores will no longer be saved in ~/.circuslinux but in /var/games/" +"circuslinux/scorefile. For configuration options the new file ~/." +"circuslinuxrc will be used." +msgstr "Aquesta versió de Circuslinux fa servir un fitxer de puntuacions compartit. A partir d'ara els rècords no es guardaran a ~/.circuslinux sinó a /var/games/circuslinux/scorefile. Per les opcions de configuració feu servir el fitxer ~/.circuslinuxrc." + +#. Description +#: ../circuslinux.templates:3 +msgid "" +"To merge all players' old highscores into one file, you can run:\n" +" bash /usr/share/doc/circuslinux/merge_scorefiles.sh\n" +"as root." +msgstr "Per ajuntar tots els rècords dels jugadors vells a un fitxer cal executar: \n bash /usr/share/doc/circuslinux/merge_scorefiles.sh\n com a root. " + +#. Description +#: ../circuslinux.templates:3 +msgid "" +"Each player can then, _after_ playing this version of Circuslinux! at least " +"once, delete his ~/.circuslinux file, since his configuration options will " +"be saved in ~/.circuslinuxrc. If the player decides not to delete ~/." +"circuslinux, he can still use a version of circuslinux which was compiled " +"without shared scorefile support without loosing his old score- and config " +"file. Circuslinux! with shared scorefile support will only read the old " +"config file to get the players options if ~/.circuslinuxrc does not exist, " +"but never write to this file." +msgstr "Cada jugador pot, després de jugar a aquesta versió de Circuslinux! com a mínim un cop, suprimir el seu ~/.circuslinux, ja que les seves opcions de configuració seran desades a ~/circuslinuxrc. Si el jugador decideix no borrar el fitxer ~/circuslinux, encara pot fer servir una versió ja compilada sense el fitxer de puntuacions compartit sense perdre les antigues puntuacions ni les seves configuracions. Circuslinux! amb el fitxer de puntuacions compartit només llegirà el fitxer antic per agafar les opcions dels jugadors si no existeix el fitxer ~/circuslinuxrc, tot i això mai escriurà en ell." + +#. Description +#: ../circuslinux.templates:3 +msgid "" +"In short: don't worry, play Circuslinux! If you run low on diskspace and " +"every block counts, you might tell your users to remove the old config file." +msgstr "No es preocupeu, jugueu Circuslinux! Si teniu poc espai de disc i cada bloc conta, podeu dir als usuaris que borrin el fitxer de configuració vell." + +#. Description +#: ../circuslinux.templates:28 +msgid "Merge score files?" +msgstr "Ajuntem els fitxers de puntuacions?" + +#. Description +#: ../circuslinux.templates:28 +msgid "Do you want me to run the merge_scorefile script for you?" +msgstr "Voleu que executi el guió merge_scorefiles per vosaltres ?" + +#. Description +#: ../circuslinux.templates:33 +msgid "Scorefile exists" +msgstr "Existeix el fitxer de puntuacions" + +#. Description +#: ../circuslinux.templates:33 +msgid "A merged scorefile in /var/games/circuslinux already exists!" +msgstr "Ja existeix un fitxer de puntuacions ajuntat anteriorment a /var/games/circuslinux!" + --- circuslinux-1.0.3.orig/debian/po/cs.po +++ circuslinux-1.0.3/debian/po/cs.po @@ -0,0 +1,103 @@ +# +# Czech translation of circuslinux templates +# +msgid "" +msgstr "" +"Project-Id-Version: circuslinux 1.0.3-12\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-04-19 21:27+0200\n" +"PO-Revision-Date: 2005-04-18 21:28+0200\n" +"Last-Translator: Martin Sin \n" +"Language-Team: Czech \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-2\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: note +#. Description +#: ../circuslinux.templates:3 +msgid "Shared scorefile" +msgstr "Sdlen soubor s vsledky" + +#. Type: note +#. Description +#: ../circuslinux.templates:3 +msgid "" +"This version of Circuslinux! uses a shared score file. From now on " +"highscores will no longer be saved in ~/.circuslinux but in /var/games/" +"circuslinux/scorefile. For configuration options the new file ~/." +"circuslinuxrc will be used." +msgstr "" +"Tato verze Circuslinux! pouv sdlen soubor s vsledky. Nejlep vsledky " +"nebudou dle ukldny v souboru ~/.circuslinux ale v /var/games/circuslinux/" +"scorefile. Pro konfiguraci voleb bude pouit nov soubor ~/.circuslinuxrc." + +#. Type: note +#. Description +#: ../circuslinux.templates:3 +msgid "" +"To merge all players' old highscores into one file, you can run:\n" +" bash /usr/share/doc/circuslinux/merge_scorefiles.sh\n" +"as root." +msgstr "" +"K pipojen starch nejlepch vsledk vech hr do jednoho souboru " +"mete jako root spustit:\n" +"bash /usr/share/doc/circuslinux/merge_scorefiles.sh" + +#. Type: note +#. Description +#: ../circuslinux.templates:3 +msgid "" +"Each player can then, _after_ playing this version of Circuslinux! at least " +"once, delete his ~/.circuslinux file, since his configuration options will " +"be saved in ~/.circuslinuxrc. If the player decides not to delete ~/." +"circuslinux, he can still use a version of circuslinux which was compiled " +"without shared scorefile support without loosing his old score- and config " +"file. Circuslinux! with shared scorefile support will only read the old " +"config file to get the players options if ~/.circuslinuxrc does not exist, " +"but never write to this file." +msgstr "" +"Kad hr pak me, po alespo jednom sputn tto verze Circuslinux!, " +"smazat svj soubor ~/.circuslinux, protoe jeho konfiguran volby budou " +"uloeny do ~/.circuslinuxrc. Jestlie hr nesmae ~/.circuslinux, me " +"klidn pouvat verzi circuslinux kter byla zkompilovna bez sdlen " +"soubor s vsledky ani by dolo ke ztrt jeho starch vsledk- a " +"konfiguranho souboru. Pokud nebude existovat ~/.circuslinuxrc pak " +"Circuslinux! se sdlenm souborem vsledk bude podporovat pouze ten " +"starho konfiguranho souboru pro zskn voleb hre, ale nikdy do tohoto " +"souboru nezape." + +#. Type: note +#. Description +#: ../circuslinux.templates:3 +msgid "" +"In short: don't worry, play Circuslinux! If you run low on diskspace and " +"every block counts, you might tell your users to remove the old config file." +msgstr "" +"Jednodue eeno: nemuste se obvat pouvat Circuslinux! Jestlie mte " +"mlo diskovho prostoru a potte kad MB, pak byste mon mli ci svm " +"uivatelm, aby smazali star konfiguran soubor." + +#. Type: boolean +#. Description +#: ../circuslinux.templates:28 +msgid "Merge score files?" +msgstr "Slouit soubory s vsledky?" + +#. Type: boolean +#. Description +#: ../circuslinux.templates:28 +msgid "Do you want me to run the merge_scorefile script for you?" +msgstr "Chcete spustit skript slouen soubor vsledk?" + +#. Type: boolean +#. Description +#: ../circuslinux.templates:33 +msgid "Scorefile exists" +msgstr "Soubor s vsledky existuje" + +#. Type: boolean +#. Description +#: ../circuslinux.templates:33 +msgid "A merged scorefile in /var/games/circuslinux already exists!" +msgstr "Slouen soubor s vsledky v /var/games/circuslinux ji existuje!" --- circuslinux-1.0.3.orig/debian/circuslinux.templates +++ circuslinux-1.0.3/debian/circuslinux.templates @@ -0,0 +1,34 @@ +Template: circuslinux/shared_score_file +Type: note +_Description: Shared scorefile + This version of Circuslinux! uses a shared score file. From now on + highscores will no longer be saved in ~/.circuslinux but in + /var/games/circuslinux/scorefile. For configuration options the new file + ~/.circuslinuxrc will be used. + . + To merge all players' old highscores into one file, you can run: + bash /usr/share/doc/circuslinux/merge_scorefiles.sh + as root. + . + Each player can then, _after_ playing this version of Circuslinux! at + least once, delete his ~/.circuslinux file, since his configuration + options will be saved in ~/.circuslinuxrc. If the player decides not to + delete ~/.circuslinux, he can still use a version of circuslinux which was + compiled without shared scorefile support without loosing his old score- + and config file. Circuslinux! with shared scorefile support will only read + the old config file to get the players options if ~/.circuslinuxrc does + not exist, but never write to this file. + . + In short: don't worry, play Circuslinux! If you run low on diskspace and + every block counts, you might tell your users to remove the old config + file. + +Template: circuslinux/merge_score_files +Type: boolean +_Description: Merge score files? + Do you want me to run the merge_scorefile script for you? + +Template: circuslinux/score_file_exists +Type: boolean +_Description: Scorefile exists + A merged scorefile in /var/games/circuslinux already exists! --- circuslinux-1.0.3.orig/debian/circuslinux.config +++ circuslinux-1.0.3/debian/circuslinux.config @@ -0,0 +1,15 @@ +#! /bin/sh -e + +# Source debconf library. +. /usr/share/debconf/confmodule + +# Old scorefile +if [ ! -e /var/games/circuslinux/scorefile ]; then + db_input high circuslinux/shared_score_file || true + db_go +# db_input high circuslinux/merge_score_files || true +# db_go +#else +# db_input high circuslinux/score_file_exists || true +# db_go +fi --- circuslinux-1.0.3.orig/debian/scorefile +++ circuslinux-1.0.3/debian/scorefile @@ -0,0 +1,30 @@ +# Circus Linux! options file + +# Highscores: + +highscore0=253 +highscorer0=CTS + +highscore1=1685 +highscorer1=ABC + +highscore2=207 +highscorer2=CTS + +highscore3=100 +highscorer3=TUX + +highscore4=100 +highscorer4=TUX + +highscore5=100 +highscorer5=TUX + +highscore6=100 +highscorer6=TUX + +highscore7=100 +highscorer7=TUX + + +# (File automatically created.) --- circuslinux-1.0.3.orig/debian/compat +++ circuslinux-1.0.3/debian/compat @@ -0,0 +1 @@ +5 \ No newline at end of file --- circuslinux-1.0.3.orig/debian/merge_scorefiles.sh +++ circuslinux-1.0.3/debian/merge_scorefiles.sh @@ -0,0 +1,23 @@ +#!/bin/bash + +# Copyright (c) 2003 Christian T. Steigies +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# 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 + +find /home -name .circuslinux -print0 | \ +xargs -0 perl /usr/share/doc/circuslinux/merge_scorefiles.pl + +chown root.games /var/games/circuslinux/scorefile +chmod 664 /var/games/circuslinux/scorefile --- circuslinux-1.0.3.orig/debian/merge_scorefiles.pl +++ circuslinux-1.0.3/debian/merge_scorefiles.pl @@ -0,0 +1,111 @@ +#!/usr/bin/perl -w + +# Copyright (c) 2003 Christian T. Steigies +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# 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 + +# merge multiple /home//.circuslinux files into one +# /var/games/circuslinux/scores files +# +# usage: +# merge_scorefiles.pl /home//.circuslinux ... /home/.circuslinux +# mv merged_score /var/games/circuslinux/scores +# each user should remove his ~/.circuslinux file _after_ running circuslinux +# his config will be saved in ~/.circuslinuxrc by circuslinux + +my $i=0; +my @line = ("# Circus Linux! options file" , "", "# Highscores:", ""); +my @highscore; +my @highscorer; + +my $filename = "/var/games/circuslinux/scorefile"; + +if ($#ARGV < 0) { + die "no scorefiles given, please pass at least one scorefile as argument.\n"; +} + +if (-e $filename) { + die "scorefile exists already, please move it out of the way.\n"; +} + +open OUT, ">".$filename + or die "can not open scorefile for output!\n"; + +for ($i = 0; $i < 8; $i++) { + $highscore[$i] = -1; + $score[$i] = -1; +} + +while (@ARGV) { + $this = shift(@ARGV); +# print "$this\n"; + + open INPUT, $this + or die "can not open input file $this"; +# while (defined($_ = )) { + for ($i = 0; $i < 4; $i++) { + $_ = ; + chomp; + if ($_ eq $line[$i]) { +# print "line$i found\n"; + } else { + die "not a valid score file!\n"; + } + } + + for ($i = 0; $i < 8; $i++) { + $_ = ; + chomp; + if (substr($_, 0, 11) eq ("highscore".$i."=")) { + $score[$i] = substr($_, 11); +# print "score $score[$i]\n"; + } + + $_ = ; + chomp; + if (substr($_, 0, 12) eq ("highscorer".$i."=")) { + $scorer[$i] = substr($_, 12); +# print "scorer $scorer[$i]\n"; + } + + $_ = ; +# chomp; +# if ($_ eq "") { +# print "newline\n"; +# } + + if ($score[$i] > $highscore[$i]) { + $highscore[$i] = $score[$i]; + $highscorer[$i] = $scorer[$i]; + } + } + +# print "|$_|\n" +# check first 4 lines if its a score file +# read highscore, highscorer 0..7, newline +# check for max and save +# write out new scorefile after reading all input files + } + +for ($i = 0; $i < 4; $i++) { + printf (OUT "%s\n", $line[$i]); +} + +for ($i = 0; $i < 8; $i++) { + printf (OUT "highscore%i=%s\n", $i, $highscore[$i]); + printf (OUT "highscorer%i=%s\n\n", $i, $highscorer[$i]); +} + +printf (OUT "\n# (File automatically created.)\n"); --- circuslinux-1.0.3.orig/debian/circuslinux.postinst +++ circuslinux-1.0.3/debian/circuslinux.postinst @@ -0,0 +1,28 @@ +#!/bin/bash + +#export DEBCONF_DEBUG=developer + +# Source debconf library. + . /usr/share/debconf/confmodule + +db_get circuslinux/shared_score_file + +#db_get circuslinux/merge_score_files +#if [ "$RET" = "true" ]; then +# if [ ! -e /var/games/circuslinux/scorefile ]; then +# bash /usr/share/games/circuslinux/merge_scorefiles.sh +# else +# db_get circuslinux/score_file_exists +# fi +#fi + +if [ ! -d /var/games/circuslinux ]; then + mkdir -p /var/games/circuslinux +fi +chown root.root /var/games/circuslinux +chmod 755 /var/games/circuslinux +touch /var/games/circuslinux/scorefile +chown root.games /var/games/circuslinux/scorefile +chmod 775 /var/games/circuslinux/scorefile + +#DEBHELPER# --- circuslinux-1.0.3.orig/debian/circuslinux.dirs +++ circuslinux-1.0.3/debian/circuslinux.dirs @@ -0,0 +1,7 @@ +usr/games +usr/share/games/circuslinux/data/images +usr/share/games/circuslinux/data/music +usr/share/games/circuslinux/data/sounds +usr/share/pixmaps +var/games +var/games/circuslinux \ No newline at end of file --- circuslinux-1.0.3.orig/debian/circuslinux-data.files +++ circuslinux-1.0.3/debian/circuslinux-data.files @@ -0,0 +1 @@ +usr/share/games/circuslinux \ No newline at end of file --- circuslinux-1.0.3.orig/debian/circuslinux-data.docs +++ circuslinux-1.0.3/debian/circuslinux-data.docs @@ -0,0 +1,4 @@ +AUTHORS.txt +CHANGES.txt +FAQ.txt +README.txt --- circuslinux-1.0.3.orig/configure.in +++ circuslinux-1.0.3/configure.in @@ -3,7 +3,7 @@ dnl Setup for automake -AM_INIT_AUTOMAKE(circuslinux,1.0.2) +AM_INIT_AUTOMAKE(circuslinux,1.0.3) dnl Detect host info AC_CANONICAL_HOST @@ -62,6 +62,14 @@ fi +SHARED_SCOREFILE=NO +dnl shared scorefile +AC_ARG_ENABLE(scorefile, + [ --enable-scorefile Use shared scorefile [default=no]], + SHARED_SCOREFILE=YES) + +AC_SUBST(SHARED_SCOREFILE) + dnl Joystick option JOY=NO AC_ARG_ENABLE(joystick, --- circuslinux-1.0.3.orig/configure +++ circuslinux-1.0.3/configure @@ -18,6 +18,8 @@ ac_help="$ac_help --disable-sdltest Do not try to compile and run a test SDL program" ac_help="$ac_help + --enable-scorefile Use shared scorefile [default=no]" +ac_help="$ac_help --enable-joystick Have joystick enabled SDL [default=no]" # Initialize some variables set by options. @@ -562,7 +564,7 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:566: checking for a BSD compatible install" >&5 +echo "configure:568: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -615,7 +617,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 -echo "configure:619: checking whether build environment is sane" >&5 +echo "configure:621: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -672,7 +674,7 @@ test "$program_transform_name" = "" && program_transform_name="s,x,x," echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:676: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:678: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -718,7 +720,7 @@ missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:722: checking for working aclocal" >&5 +echo "configure:724: checking for working aclocal" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -731,7 +733,7 @@ fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:735: checking for working autoconf" >&5 +echo "configure:737: checking for working autoconf" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -744,7 +746,7 @@ fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:748: checking for working automake" >&5 +echo "configure:750: checking for working automake" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -757,7 +759,7 @@ fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:761: checking for working autoheader" >&5 +echo "configure:763: checking for working autoheader" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -770,7 +772,7 @@ fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:774: checking for working makeinfo" >&5 +echo "configure:776: checking for working makeinfo" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -791,7 +793,7 @@ fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:795: checking host system type" >&5 +echo "configure:797: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -812,7 +814,7 @@ echo "$ac_t""$host" 1>&6 echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:816: checking target system type" >&5 +echo "configure:818: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -839,7 +841,7 @@ echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:843: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:845: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -868,7 +870,7 @@ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:872: checking for $ac_word" >&5 +echo "configure:874: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -898,7 +900,7 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:902: checking for $ac_word" >&5 +echo "configure:904: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -949,7 +951,7 @@ # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:953: checking for $ac_word" >&5 +echo "configure:955: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -981,7 +983,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:985: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:987: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -992,12 +994,12 @@ cat > conftest.$ac_ext << EOF -#line 996 "configure" +#line 998 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1023,12 +1025,12 @@ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1027: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1029: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1032: checking whether we are using GNU C" >&5 +echo "configure:1034: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1037,7 +1039,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1041: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1043: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1056,7 +1058,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1060: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1062: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1099,7 +1101,7 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1103: checking for a BSD compatible install" >&5 +echo "configure:1105: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1195,7 +1197,7 @@ # Extract the first word of "sdl-config", so it can be a program name with args. set dummy sdl-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1199: checking for $ac_word" >&5 +echo "configure:1201: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_SDL_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1230,7 +1232,7 @@ min_sdl_version=$SDL_VERSION echo $ac_n "checking for SDL - version >= $min_sdl_version""... $ac_c" 1>&6 -echo "configure:1234: checking for SDL - version >= $min_sdl_version" >&5 +echo "configure:1236: checking for SDL - version >= $min_sdl_version" >&5 no_sdl="" if test "$SDL_CONFIG" = "no" ; then no_sdl=yes @@ -1254,7 +1256,7 @@ echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -1315,7 +1317,7 @@ EOF -if { (eval echo configure:1319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -1349,7 +1351,7 @@ CFLAGS="$CFLAGS $SDL_CFLAGS" LIBS="$LIBS $SDL_LIBS" cat > conftest.$ac_ext < @@ -1359,7 +1361,7 @@ return 0; ; return 0; } EOF -if { (eval echo configure:1363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding SDL or finding the wrong" @@ -1402,7 +1404,7 @@ echo $ac_n "checking for main in -lSDL_image""... $ac_c" 1>&6 -echo "configure:1406: checking for main in -lSDL_image" >&5 +echo "configure:1408: checking for main in -lSDL_image" >&5 ac_lib_var=`echo SDL_image'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1410,14 +1412,14 @@ ac_save_LIBS="$LIBS" LIBS="-lSDL_image $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1443,7 +1445,7 @@ use_mixer=yes echo $ac_n "checking for main in -lSDL_mixer""... $ac_c" 1>&6 -echo "configure:1447: checking for main in -lSDL_mixer" >&5 +echo "configure:1449: checking for main in -lSDL_mixer" >&5 ac_lib_var=`echo SDL_mixer'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1451,14 +1453,14 @@ ac_save_LIBS="$LIBS" LIBS="-lSDL_mixer $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1464: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1487,6 +1489,16 @@ fi +SHARED_SCOREFILE=NO +# Check whether --enable-scorefile or --disable-scorefile was given. +if test "${enable_scorefile+set}" = set; then + enableval="$enable_scorefile" + SHARED_SCOREFILE=YES +fi + + + + JOY=NO # Check whether --enable-joystick or --disable-joystick was given. if test "${enable_joystick+set}" = set; then @@ -1683,6 +1695,7 @@ s%@SDL_CONFIG@%$SDL_CONFIG%g s%@SDL_CFLAGS@%$SDL_CFLAGS%g s%@SDL_LIBS@%$SDL_LIBS%g +s%@SHARED_SCOREFILE@%$SHARED_SCOREFILE%g s%@JOY@%$JOY%g s%@TARGET_DEF@%$TARGET_DEF%g --- circuslinux-1.0.3.orig/config.sub +++ circuslinux-1.0.3/config.sub @@ -1,6 +1,10 @@ #! /bin/sh -# Configuration validation subroutine script, version 1.1. -# Copyright (C) 1991, 92-97, 1998, 1999 Free Software Foundation, Inc. +# Configuration validation subroutine script. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + +timestamp='2005-04-22' + # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software # can handle that machine. It does not imply ALL GNU software can. @@ -25,6 +29,9 @@ # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. +# Please send patches to . Submit a context +# diff and a properly formatted ChangeLog entry. +# # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. # If it is invalid, we print an error message on stderr and exit with code 1. @@ -45,30 +52,74 @@ # CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM # It is wrong to echo any other type of specification. -if [ x$1 = x ] -then - echo Configuration name missing. 1>&2 - echo "Usage: $0 CPU-MFR-OPSYS" 1>&2 - echo "or $0 ALIAS" 1>&2 - echo where ALIAS is a recognized configuration type. 1>&2 - exit 1 -fi +me=`echo "$0" | sed -e 's,.*/,,'` -# First pass through any local machine types. -case $1 in - *local*) - echo $1 - exit 0 - ;; - *) - ;; +usage="\ +Usage: $0 [OPTION] CPU-MFR-OPSYS + $0 [OPTION] ALIAS + +Canonicalize a configuration name. + +Operation modes: + -h, --help print this help, then exit + -t, --time-stamp print date of last modification, then exit + -v, --version print version number, then exit + +Report bugs and patches to ." + +version="\ +GNU config.sub ($timestamp) + +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +Free Software Foundation, Inc. + +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + +help=" +Try \`$me --help' for more information." + +# Parse command line +while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) + echo "$timestamp" ; exit 0 ;; + --version | -v ) + echo "$version" ; exit 0 ;; + --help | --h* | -h ) + echo "$usage"; exit 0 ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. + break ;; + -* ) + echo "$me: invalid option $1$help" + exit 1 ;; + + *local*) + # First pass through any local machine types. + echo $1 + exit 0;; + + * ) + break ;; + esac +done + +case $# in + 0) echo "$me: missing argument$help" >&2 + exit 1;; + 1) ;; + *) echo "$me: too many arguments$help" >&2 + exit 1;; esac # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - linux-gnu*) + nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \ + kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; @@ -94,7 +145,7 @@ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple) + -apple | -axis | -knuth | -cray) os= basic_machine=$1 ;; @@ -105,9 +156,17 @@ -scout) ;; -wrs) - os=vxworks + os=-vxworks + basic_machine=$1 + ;; + -chorusos*) + os=-chorusos basic_machine=$1 ;; + -chorusrdb) + os=-chorusrdb + basic_machine=$1 + ;; -hiux*) os=-hiuxwe2 ;; @@ -156,33 +215,76 @@ -psos*) os=-psos ;; + -mint | -mint[0-9]*) + basic_machine=m68k-atari + os=-mint + ;; esac # Decode aliases for certain CPU-COMPANY combinations. case $basic_machine in # Recognize the basic CPU types without company name. # Some are omitted here because they have special meanings below. - tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \ - | arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \ - | 580 | i960 | h8300 \ - | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \ - | alpha | alphaev[4-7] | alphaev56 | alphapca5[67] \ - | we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \ - | 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \ - | mips64orion | mips64orionel | mipstx39 | mipstx39el \ - | mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \ - | mips64vr5000 | miprs64vr5000el \ - | sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \ - | thumb | d10v) + 1750a | 580 \ + | a29k \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ + | bfin \ + | c4x | clipper \ + | d10v | d30v | dlx | dsp16xx \ + | fr30 | frv \ + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | i370 | i860 | i960 | ia64 \ + | ip2k | iq2000 \ + | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64el \ + | mips64vr | mips64vrel \ + | mips64orion | mips64orionel \ + | mips64vr4100 | mips64vr4100el \ + | mips64vr4300 | mips64vr4300el \ + | mips64vr5000 | mips64vr5000el \ + | mipsisa32 | mipsisa32el \ + | mipsisa32r2 | mipsisa32r2el \ + | mipsisa64 | mipsisa64el \ + | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64sb1 | mipsisa64sb1el \ + | mipsisa64sr71k | mipsisa64sr71kel \ + | mipstx39 | mipstx39el \ + | mn10200 | mn10300 \ + | msp430 \ + | ns16k | ns32k \ + | openrisc | or32 \ + | pdp10 | pdp11 | pj | pjl \ + | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | pyramid \ + | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ + | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b \ + | strongarm \ + | tahoe | thumb | tic4x | tic80 | tron \ + | v850 | v850e \ + | we32k \ + | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ + | z8k) + basic_machine=$basic_machine-unknown + ;; + m6811 | m68hc11 | m6812 | m68hc12) + # Motorola 68HC11/12. basic_machine=$basic_machine-unknown + os=-none ;; - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65) + m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) ;; # We use `pc' rather than `unknown' # because (1) that's what they normally are, and # (2) the word "unknown" tends to confuse beginning users. - i[34567]86) + i*86 | x86_64) basic_machine=$basic_machine-pc ;; # Object if more than one company name word. @@ -191,23 +293,63 @@ exit 1 ;; # Recognize the basic CPU types with company name. - vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \ - | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \ - | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \ - | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \ - | xmp-* | ymp-* \ - | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* | hppa2.0n-* \ - | alpha-* | alphaev[4-7]-* | alphaev56-* | alphapca5[67]-* \ - | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \ - | clipper-* | orion-* \ - | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \ - | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \ - | mips64el-* | mips64orion-* | mips64orionel-* \ - | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \ - | mipstx39-* | mipstx39el-* \ - | f301-* | armv*-* | t3e-* \ - | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \ - | thumb-* | v850-* | d30v-* | tic30-* | c30-* ) + 580-* \ + | a29k-* \ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ + | avr-* \ + | bfin-* | bs2000-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ + | clipper-* | craynv-* | cydra-* \ + | d10v-* | d30v-* | dlx-* \ + | elxsi-* \ + | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ + | h8300-* | h8500-* \ + | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | i*86-* | i860-* | i960-* | ia64-* \ + | ip2k-* | iq2000-* \ + | m32r-* | m32rle-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ + | m88110-* | m88k-* | maxq-* | mcore-* \ + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ + | mips16-* \ + | mips64-* | mips64el-* \ + | mips64vr-* | mips64vrel-* \ + | mips64orion-* | mips64orionel-* \ + | mips64vr4100-* | mips64vr4100el-* \ + | mips64vr4300-* | mips64vr4300el-* \ + | mips64vr5000-* | mips64vr5000el-* \ + | mipsisa32-* | mipsisa32el-* \ + | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa64-* | mipsisa64el-* \ + | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64sb1-* | mipsisa64sb1el-* \ + | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipstx39-* | mipstx39el-* \ + | mmix-* \ + | msp430-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ + | orion-* \ + | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ + | pyramid-* \ + | romp-* | rs6000-* \ + | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \ + | sparclite-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ + | tahoe-* | thumb-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tron-* \ + | v850-* | v850e-* | vax-* \ + | we32k-* \ + | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ + | xstormy16-* | xtensa-* \ + | ymp-* \ + | z8k-*) ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. @@ -225,6 +367,9 @@ basic_machine=a29k-amd os=-udi ;; + abacus) + basic_machine=abacus-unknown + ;; adobe68k) basic_machine=m68010-adobe os=-scout @@ -239,19 +384,25 @@ basic_machine=a29k-none os=-bsd ;; + amd64) + basic_machine=x86_64-pc + ;; + amd64-*) + basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; amdahl) basic_machine=580-amdahl os=-sysv ;; amiga | amiga-*) - basic_machine=m68k-cbm + basic_machine=m68k-unknown ;; amigaos | amigados) - basic_machine=m68k-cbm + basic_machine=m68k-unknown os=-amigaos ;; amigaunix | amix) - basic_machine=m68k-cbm + basic_machine=m68k-unknown os=-sysv4 ;; apollo68) @@ -270,6 +421,10 @@ basic_machine=ns32k-sequent os=-dynix ;; + c90) + basic_machine=c90-cray + os=-unicos + ;; convex-c1) basic_machine=c1-convex os=-bsd @@ -290,27 +445,45 @@ basic_machine=c38-convex os=-bsd ;; - cray | ymp) - basic_machine=ymp-cray + cray | j90) + basic_machine=j90-cray os=-unicos ;; - cray2) - basic_machine=cray2-cray - os=-unicos + craynv) + basic_machine=craynv-cray + os=-unicosmp ;; - [ctj]90-cray) - basic_machine=c90-cray - os=-unicos + cr16c) + basic_machine=cr16c-unknown + os=-elf ;; crds | unos) basic_machine=m68k-crds ;; + crisv32 | crisv32-* | etraxfs*) + basic_machine=crisv32-axis + ;; + cris | cris-* | etrax*) + basic_machine=cris-axis + ;; + crx) + basic_machine=crx-unknown + os=-elf + ;; da30 | da30-*) basic_machine=m68k-da30 ;; decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) basic_machine=mips-dec ;; + decsystem10* | dec10*) + basic_machine=pdp10-dec + os=-tops10 + ;; + decsystem20* | dec20*) + basic_machine=pdp10-dec + os=-tops20 + ;; delta | 3300 | motorola-3300 | motorola-delta \ | 3300-motorola | delta-motorola) basic_machine=m68k-motorola @@ -319,6 +492,10 @@ basic_machine=m88k-motorola os=-sysv3 ;; + djgpp) + basic_machine=i586-pc + os=-msdosdjgpp + ;; dpx20 | dpx20-*) basic_machine=rs6000-bull os=-bosx @@ -352,6 +529,10 @@ basic_machine=tron-gmicro os=-sysv ;; + go32) + basic_machine=i386-pc + os=-go32 + ;; h3050r* | hiux*) basic_machine=hppa1.1-hitachi os=-hiuxwe2 @@ -425,22 +606,21 @@ ;; i370-ibm* | ibm*) basic_machine=i370-ibm - os=-mvs ;; # I'm not sure what "Sysv32" means. Should this be sysv3.2? - i[34567]86v32) + i*86v32) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv32 ;; - i[34567]86v4*) + i*86v4*) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv4 ;; - i[34567]86v) + i*86v) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv ;; - i[34567]86sol2) + i*86sol2) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-solaris2 ;; @@ -452,14 +632,6 @@ basic_machine=i386-unknown os=-vsta ;; - i386-go32 | go32) - basic_machine=i386-unknown - os=-go32 - ;; - i386-mingw32 | mingw32) - basic_machine=i386-unknown - os=-mingw32 - ;; iris | iris4d) basic_machine=mips-sgi case $os in @@ -485,21 +657,17 @@ basic_machine=ns32k-utek os=-sysv ;; + mingw32) + basic_machine=i386-pc + os=-mingw32 + ;; miniframe) basic_machine=m68000-convergent ;; - *mint | *MiNT) + *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) basic_machine=m68k-atari os=-mint ;; - mipsel*-linux*) - basic_machine=mipsel-unknown - os=-linux-gnu - ;; - mips*-linux*) - basic_machine=mips-unknown - os=-linux-gnu - ;; mips3*-*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` ;; @@ -510,10 +678,18 @@ basic_machine=m68k-rom68k os=-coff ;; + morphos) + basic_machine=powerpc-unknown + os=-morphos + ;; msdos) - basic_machine=i386-unknown + basic_machine=i386-pc os=-msdos ;; + mvs) + basic_machine=i370-ibm + os=-mvs + ;; ncr3000) basic_machine=i486-ncr os=-sysv4 @@ -523,7 +699,7 @@ os=-netbsd ;; netwinder) - basic_machine=armv4l-corel + basic_machine=armv4l-rebel os=-linux ;; news | news700 | news800 | news900) @@ -571,13 +747,28 @@ basic_machine=i960-intel os=-mon960 ;; + nonstopux) + basic_machine=mips-compaq + os=-nonstopux + ;; np1) basic_machine=np1-gould ;; + nsr-tandem) + basic_machine=nsr-tandem + ;; op50n-* | op60c-*) basic_machine=hppa1.1-oki os=-proelf ;; + or32 | or32-*) + basic_machine=or32-unknown + os=-coff + ;; + os400) + basic_machine=powerpc-ibm + os=-os400 + ;; OSE68000 | ose68000) basic_machine=m68000-ericsson os=-ose @@ -600,45 +791,65 @@ pbb) basic_machine=m68k-tti ;; - pc532 | pc532-*) + pc532 | pc532-*) basic_machine=ns32k-pc532 ;; - pentium | p5 | k5 | k6 | nexen) + pentium | p5 | k5 | k6 | nexgen | viac3) basic_machine=i586-pc ;; - pentiumpro | p6 | 6x86) + pentiumpro | p6 | 6x86 | athlon | athlon_*) + basic_machine=i686-pc + ;; + pentiumii | pentium2 | pentiumiii | pentium3) basic_machine=i686-pc ;; - pentiumii | pentium2) + pentium4) basic_machine=i786-pc ;; - pentium-* | p5-* | k5-* | k6-* | nexen-*) + pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - pentiumpro-* | p6-* | 6x86-*) + pentiumpro-* | p6-* | 6x86-* | athlon-*) basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - pentiumii-* | pentium2-*) + pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) + basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentium4-*) basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` ;; pn) basic_machine=pn-gould ;; - power) basic_machine=rs6000-ibm + power) basic_machine=power-ibm ;; ppc) basic_machine=powerpc-unknown - ;; + ;; ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown - ;; + ;; ppcle-* | powerpclittle-*) basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` ;; + ppc64) basic_machine=powerpc64-unknown + ;; + ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppc64le | powerpc64little | ppc64-le | powerpc64-little) + basic_machine=powerpc64le-unknown + ;; + ppc64le-* | powerpc64little-*) + basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; ps2) basic_machine=i386-ibm ;; + pw32) + basic_machine=i586-unknown + os=-pw32 + ;; rom68k) basic_machine=m68k-rom68k os=-coff @@ -649,10 +860,26 @@ rtpc | rtpc-*) basic_machine=romp-ibm ;; + s390 | s390-*) + basic_machine=s390-ibm + ;; + s390x | s390x-*) + basic_machine=s390x-ibm + ;; sa29200) basic_machine=a29k-amd os=-udi ;; + sb1) + basic_machine=mipsisa64sb1-unknown + ;; + sb1el) + basic_machine=mipsisa64sb1el-unknown + ;; + sei) + basic_machine=mips-sei + os=-seiux + ;; sequent) basic_machine=i386-sequent ;; @@ -660,7 +887,10 @@ basic_machine=sh-hitachi os=-hms ;; - sparclite-wrs) + sh64) + basic_machine=sh64-unknown + ;; + sparclite-wrs | simso-wrs) basic_machine=sparclite-wrs os=-vxworks ;; @@ -718,23 +948,51 @@ sun386 | sun386i | roadrunner) basic_machine=i386-sun ;; + sv1) + basic_machine=sv1-cray + os=-unicos + ;; symmetry) basic_machine=i386-sequent os=-dynix ;; t3e) - basic_machine=t3e-cray + basic_machine=alphaev5-cray + os=-unicos + ;; + t90) + basic_machine=t90-cray os=-unicos ;; + tic54x | c54x*) + basic_machine=tic54x-unknown + os=-coff + ;; + tic55x | c55x*) + basic_machine=tic55x-unknown + os=-coff + ;; + tic6x | c6x*) + basic_machine=tic6x-unknown + os=-coff + ;; tx39) basic_machine=mipstx39-unknown ;; tx39el) basic_machine=mipstx39el-unknown ;; + toad1) + basic_machine=pdp10-xkl + os=-tops20 + ;; tower | tower-32) basic_machine=m68k-ncr ;; + tpf) + basic_machine=s390x-ibm + os=-tpf + ;; udi29k) basic_machine=a29k-amd os=-udi @@ -756,8 +1014,8 @@ os=-vms ;; vpp*|vx|vx-*) - basic_machine=f301-fujitsu - ;; + basic_machine=f301-fujitsu + ;; vxworks960) basic_machine=i960-wrs os=-vxworks @@ -778,13 +1036,17 @@ basic_machine=hppa1.1-winbond os=-proelf ;; - xmp) - basic_machine=xmp-cray - os=-unicos + xbox) + basic_machine=i686-pc + os=-mingw32 ;; - xps | xps100) + xps | xps100) basic_machine=xps100-honeywell ;; + ymp) + basic_machine=ymp-cray + os=-unicos + ;; z8k-*-coff) basic_machine=z8k-unknown os=-sim @@ -805,32 +1067,38 @@ op60c) basic_machine=hppa1.1-oki ;; - mips) - if [ x$os = x-linux-gnu ]; then - basic_machine=mips-unknown - else - basic_machine=mips-mips - fi - ;; romp) basic_machine=romp-ibm ;; + mmix) + basic_machine=mmix-knuth + ;; rs6000) basic_machine=rs6000-ibm ;; vax) basic_machine=vax-dec ;; + pdp10) + # there are many clones, so DEC is not a safe bet + basic_machine=pdp10-unknown + ;; pdp11) basic_machine=pdp11-dec ;; we32k) basic_machine=we32k-att ;; - sparc | sparcv9) + sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele) + basic_machine=sh-unknown + ;; + sh64) + basic_machine=sh64-unknown + ;; + sparc | sparcv8 | sparcv9 | sparcv9b) basic_machine=sparc-sun ;; - cydra) + cydra) basic_machine=cydra-cydrome ;; orion) @@ -845,9 +1113,8 @@ pmac | pmac-mpw) basic_machine=powerpc-apple ;; - c4x*) - basic_machine=c4x-none - os=-coff + *-unknown) + # Make sure to match an already-canonicalized machine name. ;; *) echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 @@ -901,22 +1168,46 @@ | -aos* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \ - | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -rhapsody* | -openstep* | -oskit*) + | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ + | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*) # Remember, each alternative MUST END IN *, to match a version number. ;; + -qnx*) + case $basic_machine in + x86-* | i*86-*) + ;; + *) + os=-nto$os + ;; + esac + ;; + -nto-qnx*) + ;; + -nto*) + os=`echo $os | sed -e 's|nto|nto-qnx|'` + ;; -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ - | -macos* | -mpw* | -magic* | -mon960* | -lnews*) + | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) ;; -mac*) os=`echo $os | sed -e 's|mac|macos|'` ;; + -linux-dietlibc) + os=-linux-dietlibc + ;; -linux*) os=`echo $os | sed -e 's|linux|linux-gnu|'` ;; @@ -926,6 +1217,15 @@ -sunos6*) os=`echo $os | sed -e 's|sunos6|solaris3|'` ;; + -opened*) + os=-openedition + ;; + -os400*) + os=-os400 + ;; + -wince*) + os=-wince + ;; -osfrose*) os=-osfrose ;; @@ -941,14 +1241,26 @@ -acis*) os=-aos ;; + -atheos*) + os=-atheos + ;; + -syllable*) + os=-syllable + ;; -386bsd) os=-bsd ;; -ctix* | -uts*) os=-sysv ;; + -nova*) + os=-rtmk-nova + ;; -ns2 ) - os=-nextstep2 + os=-nextstep2 + ;; + -nsk*) + os=-nsk ;; # Preserve the version number of sinix5. -sinix5.*) @@ -957,6 +1269,9 @@ -sinix*) os=-sysv4 ;; + -tpf*) + os=-tpf + ;; -triton*) os=-sysv3 ;; @@ -984,8 +1299,17 @@ -xenix) os=-xenix ;; - -*mint | -*MiNT) - os=-mint + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + os=-mint + ;; + -aros*) + os=-aros + ;; + -kaos*) + os=-kaos + ;; + -zvmoe) + os=-zvmoe ;; -none) ;; @@ -1012,13 +1336,20 @@ *-acorn) os=-riscix1.2 ;; - arm*-corel) + arm*-rebel) os=-linux ;; arm*-semi) os=-aout ;; - pdp11-*) + c4x-* | tic4x-*) + os=-coff + ;; + # This must come before the *-dec entry. + pdp10-*) + os=-tops20 + ;; + pdp11-*) os=-none ;; *-dec | vax-*) @@ -1045,6 +1376,9 @@ mips*-*) os=-elf ;; + or32-*) + os=-coff + ;; *-tti) # must be before sparc entry or we get the wrong os. os=-sysv3 ;; @@ -1057,6 +1391,9 @@ *-ibm) os=-aix ;; + *-knuth) + os=-mmixware + ;; *-wec) os=-proelf ;; @@ -1108,25 +1445,25 @@ *-next) os=-nextstep3 ;; - *-gould) + *-gould) os=-sysv ;; - *-highlevel) + *-highlevel) os=-bsd ;; *-encore) os=-bsd ;; - *-sgi) + *-sgi) os=-irix ;; - *-siemens) + *-siemens) os=-sysv4 ;; *-masscomp) os=-rtu ;; - f301-fujitsu) + f30[01]-fujitsu | f700-fujitsu) os=-uxpv ;; *-rom68k) @@ -1186,13 +1523,19 @@ -genix*) vendor=ns ;; - -mvs*) + -mvs* | -opened*) + vendor=ibm + ;; + -os400*) vendor=ibm ;; -ptx*) vendor=sequent ;; - -vxsim* | -vxworks*) + -tpf*) + vendor=ibm + ;; + -vxsim* | -vxworks* | -windiss*) vendor=wrs ;; -aux*) @@ -1204,12 +1547,23 @@ -mpw* | -macos*) vendor=apple ;; - -*mint | -*MiNT) + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) vendor=atari ;; + -vos*) + vendor=stratus + ;; esac basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` ;; esac echo $basic_machine$os +exit 0 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "timestamp='" +# time-stamp-format: "%:y-%02m-%02d" +# time-stamp-end: "'" +# End: --- circuslinux-1.0.3.orig/config.guess +++ circuslinux-1.0.3/config.guess @@ -1,8 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999 -# Free Software Foundation, Inc. -# +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + +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 # the Free Software Foundation; either version 2 of the License, or @@ -22,100 +24,279 @@ # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. -# Written by Per Bothner . -# The master version of this file is at the FSF in /home/gd/gnu/lib. -# Please send patches to the Autoconf mailing list . +# Originally written by Per Bothner . +# Please send patches to . Submit a context +# diff and a properly formatted ChangeLog entry. # # This script attempts to guess a canonical system name similar to # config.sub. If it succeeds, it prints the system name on stdout, and # exits with 0. Otherwise, it exits with 1. # # The plan is that this can be called by configure scripts if you -# don't specify an explicit system type (host/target name). -# -# Only a few systems have been added to this list; please add others -# (but try to keep the structure clean). -# +# don't specify an explicit build system type. -# Use $HOST_CC if defined. $CC may point to a cross-compiler -if test x"$CC_FOR_BUILD" = x; then - if test x"$HOST_CC" != x; then - CC_FOR_BUILD="$HOST_CC" - else - if test x"$CC" != x; then - CC_FOR_BUILD="$CC" - else - CC_FOR_BUILD=cc - fi - fi +me=`echo "$0" | sed -e 's,.*/,,'` + +usage="\ +Usage: $0 [OPTION] + +Output the configuration name of the system \`$me' is run on. + +Operation modes: + -h, --help print this help, then exit + -t, --time-stamp print date of last modification, then exit + -v, --version print version number, then exit + +Report bugs and patches to ." + +version="\ +GNU config.guess ($timestamp) + +Originally written by Per Bothner. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +Free Software Foundation, Inc. + +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + +help=" +Try \`$me --help' for more information." + +# Parse command line +while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) + echo "$timestamp" ; exit 0 ;; + --version | -v ) + echo "$version" ; exit 0 ;; + --help | --h* | -h ) + echo "$usage"; exit 0 ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. + break ;; + -* ) + echo "$me: invalid option $1$help" >&2 + exit 1 ;; + * ) + break ;; + esac +done + +if test $# != 0; then + echo "$me: too many arguments$help" >&2 + exit 1 fi +trap 'exit 1' 1 2 15 + +# CC_FOR_BUILD -- compiler used by this script. Note that the use of a +# compiler to aid in system detection is discouraged as it requires +# temporary files to be created and, as you can see below, it is a +# headache to deal with in a portable fashion. + +# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still +# use `HOST_CC' if defined, but it is deprecated. + +# Portable tmp directory creation inspired by the Autoconf team. + +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" ; } || + { 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 ; } ; +dummy=$tmp/dummy ; +tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; +case $CC_FOR_BUILD,$HOST_CC,$CC in + ,,) echo "int x;" > $dummy.c ; + for c in cc gcc c89 c99 ; do + if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then + CC_FOR_BUILD="$c"; break ; + fi ; + done ; + if test x"$CC_FOR_BUILD" = x ; then + CC_FOR_BUILD=no_compiler_found ; + fi + ;; + ,,*) CC_FOR_BUILD=$CC ;; + ,*,*) CC_FOR_BUILD=$HOST_CC ;; +esac ;' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. -# (ghazi@noc.rutgers.edu 8/24/94.) +# (ghazi@noc.rutgers.edu 1994-08-24) if (test -f /.attbin/uname) >/dev/null 2>&1 ; then PATH=$PATH:/.attbin ; export PATH fi UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown -UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown +UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown -dummy=dummy-$$ -trap 'rm -f $dummy.c $dummy.o $dummy; exit 1' 1 2 15 - # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in + *:NetBSD:*:*) + # NetBSD (nbsd) targets should (where applicable) match one or + # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, + # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently + # switched to ELF, *-*-netbsd* would select the old + # object file format. This provides both forward + # compatibility and a consistent mechanism for selecting the + # object file format. + # + # Note: NetBSD doesn't particularly care about the vendor + # portion of the name. We always set it to "unknown". + sysctl="sysctl -n hw.machine_arch" + UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ + /usr/sbin/$sysctl 2>/dev/null || echo unknown)` + case "${UNAME_MACHINE_ARCH}" in + armeb) machine=armeb-unknown ;; + arm*) machine=arm-unknown ;; + sh3el) machine=shl-unknown ;; + sh3eb) machine=sh-unknown ;; + *) machine=${UNAME_MACHINE_ARCH}-unknown ;; + esac + # The Operating System including object format, if it has switched + # to ELF recently, or will in the future. + case "${UNAME_MACHINE_ARCH}" in + arm*|i386|m68k|ns32k|sh3*|sparc|vax) + eval $set_cc_for_build + if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep __ELF__ >/dev/null + then + # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). + # Return netbsd for either. FIX? + os=netbsd + else + os=netbsdelf + fi + ;; + *) + os=netbsd + ;; + esac + # The OS release + # Debian GNU/NetBSD machines have a different userland, and + # thus, need a distinct triplet. However, they do not need + # kernel version information, so it can be replaced with a + # suitable tag, in the style of linux-gnu. + case "${UNAME_VERSION}" in + Debian*) + release='-gnu' + ;; + *) + release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + ;; + esac + # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: + # 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 ;; + *:OpenBSD:*:*) + echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + *:ekkoBSD:*:*) + echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + exit 0 ;; + macppc:MirBSD:*:*) + echo powerppc-unknown-mirbsd${UNAME_RELEASE} + exit 0 ;; + *:MirBSD:*:*) + echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} + exit 0 ;; alpha:OSF1:*:*) - if test $UNAME_RELEASE = "V4.0"; then + case $UNAME_RELEASE in + *4.0) UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` - fi + ;; + *5.*) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + ;; + esac + # According to Compaq, /usr/sbin/psrinfo has been available on + # OSF/1 and Tru64 systems produced since 1995. I hope that + # covers most systems running today. This code pipes the CPU + # types through head -n 1, so we only detect the type of CPU 0. + ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` + case "$ALPHA_CPU_TYPE" in + "EV4 (21064)") + UNAME_MACHINE="alpha" ;; + "EV4.5 (21064)") + UNAME_MACHINE="alpha" ;; + "LCA4 (21066/21068)") + UNAME_MACHINE="alpha" ;; + "EV5 (21164)") + UNAME_MACHINE="alphaev5" ;; + "EV5.6 (21164A)") + UNAME_MACHINE="alphaev56" ;; + "EV5.6 (21164PC)") + UNAME_MACHINE="alphapca56" ;; + "EV5.7 (21164PC)") + UNAME_MACHINE="alphapca57" ;; + "EV6 (21264)") + UNAME_MACHINE="alphaev6" ;; + "EV6.7 (21264A)") + UNAME_MACHINE="alphaev67" ;; + "EV6.8CB (21264C)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8AL (21264B)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8CX (21264D)") + UNAME_MACHINE="alphaev68" ;; + "EV6.9A (21264/EV69A)") + UNAME_MACHINE="alphaev69" ;; + "EV7 (21364)") + UNAME_MACHINE="alphaev7" ;; + "EV7.9 (21364A)") + UNAME_MACHINE="alphaev79" ;; + esac + # A Pn.n version is a patched version. # A Vn.n version is a released version. # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - cat <$dummy.s - .globl main - .ent main -main: - .frame \$30,0,\$26,0 - .prologue 0 - .long 0x47e03d80 # implver $0 - lda \$2,259 - .long 0x47e20c21 # amask $2,$1 - srl \$1,8,\$2 - sll \$2,2,\$2 - sll \$0,3,\$0 - addl \$1,\$0,\$0 - addl \$2,\$0,\$0 - ret \$31,(\$26),1 - .end main -EOF - $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null - if test "$?" = 0 ; then - ./$dummy - case "$?" in - 7) - UNAME_MACHINE="alpha" - ;; - 15) - UNAME_MACHINE="alphaev5" - ;; - 14) - UNAME_MACHINE="alphaev56" - ;; - 10) - UNAME_MACHINE="alphapca56" - ;; - 16) - UNAME_MACHINE="alphaev6" - ;; - esac - fi - rm -f $dummy.s $dummy - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` exit 0 ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? @@ -127,42 +308,27 @@ echo alpha-dec-winnt3.5 exit 0 ;; Amiga*:UNIX_System_V:4.0:*) - echo m68k-cbm-sysv4 + echo m68k-unknown-sysv4 exit 0;; - amiga:NetBSD:*:*) - echo m68k-cbm-netbsd${UNAME_RELEASE} - exit 0 ;; - amiga:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; *:[Aa]miga[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-amigaos exit 0 ;; - arc64:OpenBSD:*:*) - echo mips64el-unknown-openbsd${UNAME_RELEASE} + *:[Mm]orph[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-morphos exit 0 ;; - arc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} + *:OS/390:*:*) + echo i370-ibm-openedition exit 0 ;; - hkmips:OpenBSD:*:*) - echo mips-unknown-openbsd${UNAME_RELEASE} + *:z/VM:*:*) + echo s390-ibm-zvmoe exit 0 ;; - pmax:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sgi:OpenBSD:*:*) - echo mips-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - wgrisc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} + *:OS400:*:*) + echo powerpc-ibm-os400 exit 0 ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} exit 0;; - arm32:NetBSD:*:*) - echo arm-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` - exit 0 ;; - SR2?01:HI-UX/MPP:*:*) + SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) echo hppa1.1-hitachi-hiuxmpp exit 0;; Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) @@ -176,6 +342,13 @@ NILE*:*:*:dcosx) echo pyramid-pyramid-svr4 exit 0 ;; + DRS?6000:unix:4.0:6*) + echo sparc-icl-nx6 + 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 0 ;; + esac ;; sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit 0 ;; @@ -204,7 +377,7 @@ echo m68k-sun-sunos${UNAME_RELEASE} exit 0 ;; sun*:*:4.2BSD:*) - UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` + UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 case "`/bin/arch`" in sun3) @@ -218,15 +391,9 @@ aushp:SunOS:*:*) echo sparc-auspex-sunos${UNAME_RELEASE} exit 0 ;; - atari*:NetBSD:*:*) - echo m68k-atari-netbsd${UNAME_RELEASE} - exit 0 ;; - atari*:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - 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 + # "atarist" or "atariste" at least should have a processor # > m68000). The system name ranges from "MiNT" over "FreeMiNT" # to the lowercase version "mint" (or "freemint"). Finally # the system name "TOS" denotes a system which is actually not @@ -250,30 +417,12 @@ *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) echo m68k-unknown-mint${UNAME_RELEASE} exit 0 ;; - sun3*:NetBSD:*:*) - echo m68k-sun-netbsd${UNAME_RELEASE} - exit 0 ;; - sun3*:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mac68k:NetBSD:*:*) - echo m68k-apple-netbsd${UNAME_RELEASE} - exit 0 ;; - mac68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme88k:OpenBSD:*:*) - echo m88k-unknown-openbsd${UNAME_RELEASE} + m68k:machten:*:*) + echo m68k-apple-machten${UNAME_RELEASE} exit 0 ;; powerpc:machten:*:*) echo powerpc-apple-machten${UNAME_RELEASE} exit 0 ;; - macppc:NetBSD:*:*) - echo powerpc-apple-netbsd${UNAME_RELEASE} - exit 0 ;; RISC*:Mach:*:*) echo mips-dec-mach_bsd4.3 exit 0 ;; @@ -287,8 +436,10 @@ echo clipper-intergraph-clix${UNAME_RELEASE} exit 0 ;; mips:*:*:UMIPS | mips:*:*:RISCos) + eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #ifdef __cplusplus +#include /* for printf() prototype */ int main (int argc, char *argv[]) { #else int main (argc, argv) int argc; char *argv[]; { @@ -307,12 +458,20 @@ exit (-1); } EOF - $CC_FOR_BUILD $dummy.c -o $dummy \ - && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ - && rm $dummy.c $dummy && exit 0 - rm -f $dummy.c $dummy + $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 0 ;; + Motorola:PowerMAX_OS:*:*) + echo powerpc-motorola-powermax + exit 0 ;; + Motorola:*:4.3:PL8-*) + echo powerpc-harris-powermax + exit 0 ;; + Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) + echo powerpc-harris-powermax + exit 0 ;; Night_Hawk:Power_UNIX:*:*) echo powerpc-harris-powerunix exit 0 ;; @@ -328,15 +487,18 @@ AViiON:dgux:*:*) # DG/UX returns AViiON for all architectures UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88110 ] ; then - if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \ - -o ${TARGET_BINARY_INTERFACE}x = x ] ; then + if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] + then + if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ + [ ${TARGET_BINARY_INTERFACE}x = x ] + then echo m88k-dg-dgux${UNAME_RELEASE} - else + else echo m88k-dg-dguxbcs${UNAME_RELEASE} + fi + else + echo i586-dg-dgux${UNAME_RELEASE} fi - else echo i586-dg-dgux${UNAME_RELEASE} - fi exit 0 ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 @@ -357,11 +519,20 @@ ????????: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 ' - i?86:AIX:*:*) + i*86:AIX:*:*) echo i386-ibm-aix exit 0 ;; + ia64:AIX:*:*) + if [ -x /usr/bin/oslevel ] ; then + IBM_REV=`/usr/bin/oslevel` + else + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi + echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} + exit 0 ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then + eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #include @@ -373,8 +544,7 @@ exit(0); } EOF - $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0 - rm -f $dummy.c $dummy + $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 @@ -382,9 +552,9 @@ echo rs6000-ibm-aix3.2 fi exit 0 ;; - *:AIX:*:4) - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'` - if /usr/sbin/lsattr -EHl ${IBM_CPU_ID} | grep POWER >/dev/null 2>&1; then + *: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 IBM_ARCH=rs6000 else IBM_ARCH=powerpc @@ -392,7 +562,7 @@ if [ -x /usr/bin/oslevel ] ; then IBM_REV=`/usr/bin/oslevel` else - IBM_REV=4.${UNAME_RELEASE} + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi echo ${IBM_ARCH}-ibm-aix${IBM_REV} exit 0 ;; @@ -402,7 +572,7 @@ ibmrt:4.4BSD:*|romp-ibm:BSD:*) echo romp-ibm-bsd4.4 exit 0 ;; - ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC NetBSD and + 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 *:BOSX:*:*) @@ -418,11 +588,30 @@ echo m68k-hp-bsd4.4 exit 0 ;; 9000/[34678]??:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` case "${UNAME_MACHINE}" in 9000/31? ) HP_ARCH=m68000 ;; 9000/[34]?? ) HP_ARCH=m68k ;; 9000/[678][0-9][0-9]) - sed 's/^ //' << EOF >$dummy.c + if [ -x /usr/bin/getconf ]; then + sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` + case "${sc_cpu_version}" in + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 532) # CPU_PA_RISC2_0 + case "${sc_kernel_bits}" in + 32) HP_ARCH="hppa2.0n" ;; + 64) HP_ARCH="hppa2.0w" ;; + '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 + esac ;; + esac + fi + if [ "${HP_ARCH}" = "" ]; then + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + + #define _HPUX_SOURCE #include #include @@ -453,13 +642,29 @@ exit (0); } EOF - ($CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy` - rm -f $dummy.c $dummy + (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + test -z "$HP_ARCH" && HP_ARCH=hppa + fi ;; esac - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + 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 + then + HP_ARCH="hppa2.0w" + else + HP_ARCH="hppa64" + fi + fi echo ${HP_ARCH}-hp-hpux${HPUX_REV} exit 0 ;; + ia64:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + echo ia64-hp-hpux${HPUX_REV} + exit 0 ;; 3050*:HI-UX:*:*) + eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #include int @@ -485,8 +690,7 @@ exit (0); } EOF - $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0 - rm -f $dummy.c $dummy + $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 echo unknown-hitachi-hiuxwe2 exit 0 ;; 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) @@ -495,7 +699,7 @@ 9000/8??:4.3bsd:*:*) echo hppa1.0-hp-bsd exit 0 ;; - *9??*:MPE/iX:*:*) + *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) echo hppa1.0-hp-mpeix exit 0 ;; hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) @@ -504,7 +708,7 @@ hp8??:OSF1:*:*) echo hppa1.0-hp-osf exit 0 ;; - i?86:OSF1:*:*) + i*86:OSF1:*:*) if [ -x /usr/sbin/sysversion ] ; then echo ${UNAME_MACHINE}-unknown-osf1mk else @@ -514,9 +718,6 @@ parisc*:Lites*:*:*) echo hppa1.1-hp-lites exit 0 ;; - hppa*:OpenBSD:*:*) - echo hppa-unknown-openbsd - exit 0 ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd exit 0 ;; @@ -535,41 +736,39 @@ C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd exit 0 ;; - CRAY*X-MP:*:*:*) - echo xmp-cray-unicos - exit 0 ;; CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} + echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 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 y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ + -e 's/\.[^.]*$/.X/' exit 0 ;; CRAY*TS:*:*:*) - echo t90-cray-unicos${UNAME_RELEASE} + echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; CRAY*T3E:*:*:*) - echo t3e-cray-unicosmk${UNAME_RELEASE} + echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; - CRAY-2:*:*:*) - echo cray2-cray-unicos - exit 0 ;; - F300:UNIX_System_V:*:*) + CRAY*SV1:*:*:*) + echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit 0 ;; + *:UNICOS/mp:*:*) + echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + 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 "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit 0 ;; - F301:UNIX_System_V:*:*) - echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'` - exit 0 ;; - hp3[0-9][05]:NetBSD:*:*) - echo m68k-hp-netbsd${UNAME_RELEASE} - exit 0 ;; - hp300:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} + 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 ;; - i?86:BSD/386:*:* | i?86:BSD/OS:*:*) + i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} exit 0 ;; sparc*:BSD/OS:*:*) @@ -579,35 +778,35 @@ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit 0 ;; *:FreeBSD:*:*) - if test -x /usr/bin/objformat; then - if test "elf" = "`/usr/bin/objformat`"; then - echo ${UNAME_MACHINE}-unknown-freebsdelf`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'` - exit 0 - fi - fi echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit 0 ;; - *:NetBSD:*:*) - echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` - exit 0 ;; - *:OpenBSD:*:*) - echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` - exit 0 ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit 0 ;; i*:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit 0 ;; + i*:PW*:*) + echo ${UNAME_MACHINE}-pc-pw32 + 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 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 i386-pc-interix + echo i586-pc-interix exit 0 ;; i*:UWIN*:*) echo ${UNAME_MACHINE}-pc-uwin exit 0 ;; + amd64:CYGWIN*:*:*) + echo x86_64-unknown-cygwin + exit 0 ;; p*:CYGWIN*:*) echo powerpcle-unknown-cygwin exit 0 ;; @@ -615,180 +814,184 @@ echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit 0 ;; *:GNU:*:*) + # the GNU system echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit 0 ;; - *:Linux:*:*) - # uname on the ARM produces all sorts of strangeness, and we need to - # filter it out. - case "$UNAME_MACHINE" in - armv*) UNAME_MACHINE=$UNAME_MACHINE ;; - arm* | sa110*) UNAME_MACHINE="arm" ;; + *: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 ;; + i*86:Minix:*:*) + echo ${UNAME_MACHINE}-pc-minix + exit 0 ;; + arm*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; + cris:Linux:*:*) + echo cris-axis-linux-gnu + exit 0 ;; + crisv32:Linux:*:*) + echo crisv32-axis-linux-gnu + exit 0 ;; + frv:Linux:*:*) + echo frv-unknown-linux-gnu + exit 0 ;; + ia64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; + m32r*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; + m68*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; + mips:Linux:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU + #undef mips + #undef mipsel + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) + CPU=mipsel + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) + CPU=mips + #else + CPU= + #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 + ;; + mips64:Linux:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU + #undef mips64 + #undef mips64el + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) + CPU=mips64el + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) + CPU=mips64 + #else + CPU= + #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 + ;; + ppc:Linux:*:*) + echo powerpc-unknown-linux-gnu + exit 0 ;; + ppc64:Linux:*:*) + echo powerpc64-unknown-linux-gnu + exit 0 ;; + alpha:Linux:*:*) + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + EV5) UNAME_MACHINE=alphaev5 ;; + EV56) UNAME_MACHINE=alphaev56 ;; + PCA56) UNAME_MACHINE=alphapca56 ;; + PCA57) UNAME_MACHINE=alphapca56 ;; + EV6) UNAME_MACHINE=alphaev6 ;; + EV67) UNAME_MACHINE=alphaev67 ;; + EV68*) UNAME_MACHINE=alphaev68 ;; + esac + 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 ;; + parisc:Linux:*:* | hppa:Linux:*:*) + # Look for CPU level + case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in + PA7*) echo hppa1.1-unknown-linux-gnu ;; + PA8*) echo hppa2.0-unknown-linux-gnu ;; + *) echo hppa-unknown-linux-gnu ;; esac - + exit 0 ;; + parisc64:Linux:*:* | hppa64:Linux:*:*) + echo hppa64-unknown-linux-gnu + exit 0 ;; + s390:Linux:*:* | s390x:Linux:*:*) + echo ${UNAME_MACHINE}-ibm-linux + exit 0 ;; + sh64*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; + sh*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; + sparc:Linux:*:* | sparc64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; + x86_64:Linux:*:*) + echo x86_64-unknown-linux-gnu + 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 # problems with other programs or directories called `ld' in the path. - ld_help_string=`cd /; ld --help 2>&1` - ld_supported_emulations=`echo $ld_help_string \ - | sed -ne '/supported emulations:/!d + # Set LC_ALL=C to ensure ld outputs messages in English. + ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ + | sed -ne '/supported targets:/!d s/[ ][ ]*/ /g - s/.*supported emulations: *// + s/.*supported targets: *// s/ .*// p'` - case "$ld_supported_emulations" in - i?86linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" ; exit 0 ;; - i?86coff) echo "${UNAME_MACHINE}-pc-linux-gnucoff" ; exit 0 ;; - sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;; - armlinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;; - m68klinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;; - elf32ppc) - # Determine Lib Version - cat >$dummy.c < -#if defined(__GLIBC__) -extern char __libc_version[]; -extern char __libc_release[]; -#endif -main(argc, argv) - int argc; - char *argv[]; -{ -#if defined(__GLIBC__) - printf("%s %s\n", __libc_version, __libc_release); -#else - printf("unkown\n"); -#endif - return 0; -} -EOF - LIBC="" - $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null - if test "$?" = 0 ; then - ./$dummy | grep 1\.99 > /dev/null - if test "$?" = 0 ; then - LIBC="libc1" - fi - fi - rm -f $dummy.c $dummy - echo powerpc-unknown-linux-gnu${LIBC} ; exit 0 ;; + case "$ld_supported_targets" in + elf32-i386) + TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" + ;; + a.out-i386-linux) + echo "${UNAME_MACHINE}-pc-linux-gnuaout" + exit 0 ;; + coff-i386) + echo "${UNAME_MACHINE}-pc-linux-gnucoff" + 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 0 ;; esac - - if test "${UNAME_MACHINE}" = "alpha" ; then - sed 's/^ //' <$dummy.s - .globl main - .ent main - main: - .frame \$30,0,\$26,0 - .prologue 0 - .long 0x47e03d80 # implver $0 - lda \$2,259 - .long 0x47e20c21 # amask $2,$1 - srl \$1,8,\$2 - sll \$2,2,\$2 - sll \$0,3,\$0 - addl \$1,\$0,\$0 - addl \$2,\$0,\$0 - ret \$31,(\$26),1 - .end main -EOF - LIBC="" - $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null - if test "$?" = 0 ; then - ./$dummy - case "$?" in - 7) - UNAME_MACHINE="alpha" - ;; - 15) - UNAME_MACHINE="alphaev5" - ;; - 14) - UNAME_MACHINE="alphaev56" - ;; - 10) - UNAME_MACHINE="alphapca56" - ;; - 16) - UNAME_MACHINE="alphaev6" - ;; - esac - - objdump --private-headers $dummy | \ - grep ld.so.1 > /dev/null - if test "$?" = 0 ; then - LIBC="libc1" - fi - fi - rm -f $dummy.s $dummy - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0 - elif test "${UNAME_MACHINE}" = "mips" ; then - cat >$dummy.c </dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0 - rm -f $dummy.c $dummy - else - # Either a pre-BFD a.out linker (linux-gnuoldld) - # or one that does not give us useful --help. - # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout. - # If ld does not provide *any* "supported emulations:" - # that means it is gnuoldld. - echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations:" - test $? != 0 && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0 - - case "${UNAME_MACHINE}" in - i?86) - VENDOR=pc; - ;; - *) - VENDOR=unknown; - ;; - esac - # Determine whether the default compiler is a.out or elf - cat >$dummy.c < -#ifdef __cplusplus - int main (int argc, char *argv[]) { -#else - int main (argc, argv) int argc; char *argv[]; { -#endif -#ifdef __ELF__ -# ifdef __GLIBC__ -# if __GLIBC__ >= 2 - printf ("%s-${VENDOR}-linux-gnu\n", argv[1]); -# else - printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]); -# endif -# else - printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]); -# endif -#else - printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]); -#endif - return 0; -} + # Determine whether the default compiler is a.out or elf + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #include + #ifdef __ELF__ + # ifdef __GLIBC__ + # if __GLIBC__ >= 2 + LIBC=gnu + # else + LIBC=gnulibc1 + # endif + # else + LIBC=gnulibc1 + # endif + #else + #ifdef __INTEL_COMPILER + LIBC=gnu + #else + LIBC=gnuaout + #endif + #endif + #ifdef __dietlibc__ + LIBC=dietlibc + #endif EOF - $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0 - rm -f $dummy.c $dummy - fi ;; -# 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. - i?86:DYNIX/ptx:4*:*) + 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 0 ;; - i?86:UNIX_SV:4.2MP:2.*) + i*86:UNIX_SV:4.2MP:2.*) # Unixware is an offshoot of SVR4, but it has its own version # number series starting with 2... # I am not positive that other SVR4 systems won't match this, @@ -796,33 +999,54 @@ # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} exit 0 ;; - i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*) + 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 ;; + i*86:XTS-300:*:STOP) + echo ${UNAME_MACHINE}-unknown-stop + exit 0 ;; + i*86:atheos:*:*) + echo ${UNAME_MACHINE}-unknown-atheos + exit 0 ;; + i*86:syllable:*:*) + echo ${UNAME_MACHINE}-pc-syllable + exit 0 ;; + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) + echo i386-unknown-lynxos${UNAME_RELEASE} + exit 0 ;; + i*86:*DOS:*:*) + echo ${UNAME_MACHINE}-pc-msdosdjgpp + 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 - echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE} + echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} else - echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE} + echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} fi exit 0 ;; - i?86:*:5:7*) - UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')` - (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486 - (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) && UNAME_MACHINE=i586 - (/bin/uname -X|egrep '^Machine.*Pent.*II' >/dev/null) && UNAME_MACHINE=i686 - (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) && UNAME_MACHINE=i585 - echo ${UNAME_MACHINE}-${UNAME_SYSTEM}${UNAME_VERSION}-sysv${UNAME_RELEASE} + 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 0 ;; - i?86:*:3.2:*) + i*86:*:3.2:*) if test -f /usr/options/cb.name; then UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then - UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')` - (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486 - (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \ + UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` + (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 + (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ && UNAME_MACHINE=i586 - (/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \ + (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ && UNAME_MACHINE=i686 - (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \ + (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ && UNAME_MACHINE=i686 echo ${UNAME_MACHINE}-pc-sco$UNAME_REL else @@ -830,6 +1054,7 @@ fi exit 0 ;; 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 @@ -851,9 +1076,15 @@ # "miniframe" echo m68010-convergent-sysv exit 0 ;; - M68*:*:R3V[567]*:*) + mc68k:UNIX:SYSTEM5:3.51m) + echo m68k-convergent-sysv + exit 0 ;; + M680?0:D-NIX:5.3:*) + echo m68k-diab-dnix + exit 0 ;; + M68*:*:R3V[5678]*:*) test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; - 3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.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` @@ -864,21 +1095,21 @@ 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ && echo i486-ncr-sysv4 && exit 0 ;; - m68*:LynxOS:2.*:*) + m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) echo m68k-unknown-lynxos${UNAME_RELEASE} exit 0 ;; mc68030:UNIX_System_V:4.*:*) echo m68k-atari-sysv4 exit 0 ;; - i?86:LynxOS:2.*:* | i?86:LynxOS:3.[01]*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; TSUNAMI:LynxOS:2.*:*) echo sparc-unknown-lynxos${UNAME_RELEASE} exit 0 ;; - rs6000:LynxOS:2.*:* | PowerPC:LynxOS:2.*:*) + rs6000:LynxOS:2.*:*) echo rs6000-unknown-lynxos${UNAME_RELEASE} exit 0 ;; + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) + echo powerpc-unknown-lynxos${UNAME_RELEASE} + exit 0 ;; SM[BE]S:UNIX_SV:*:*) echo mips-dde-sysv${UNAME_RELEASE} exit 0 ;; @@ -896,8 +1127,8 @@ echo ns32k-sni-sysv fi exit 0 ;; - PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says echo i586-unisys-sysv4 exit 0 ;; *:UNIX_System_V:4*:FTX*) @@ -909,10 +1140,18 @@ # From seanf@swdc.stratus.com. echo i860-stratus-sysv4 exit 0 ;; + i*86:VOS:*:*) + # From Paul.Green@stratus.com. + echo ${UNAME_MACHINE}-stratus-vos + exit 0 ;; + *:VOS:*:*) + # From Paul.Green@stratus.com. + echo hppa1.1-stratus-vos + exit 0 ;; mc68*:A/UX:*:*) echo m68k-apple-aux${UNAME_RELEASE} exit 0 ;; - news*:NEWS-OS:*:6*) + news*:NEWS-OS:6*:*) echo mips-sony-newsos6 exit 0 ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) @@ -937,17 +1176,100 @@ SX-5:SUPER-UX:*:*) echo sx5-nec-superux${UNAME_RELEASE} exit 0 ;; + SX-6:SUPER-UX:*:*) + echo sx6-nec-superux${UNAME_RELEASE} + exit 0 ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} exit 0 ;; *:Rhapsody:*:*) echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} 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 0 ;; + *:procnto*:*:* | *:QNX:[0123456789]*:*) + UNAME_PROCESSOR=`uname -p` + if test "$UNAME_PROCESSOR" = "x86"; then + UNAME_PROCESSOR=i386 + UNAME_MACHINE=pc + fi + echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} + exit 0 ;; + *:QNX:*:4*) + echo i386-pc-qnx + exit 0 ;; + NSE-?:NONSTOP_KERNEL:*:*) + echo nse-tandem-nsk${UNAME_RELEASE} + exit 0 ;; + NSR-?:NONSTOP_KERNEL:*:*) + echo nsr-tandem-nsk${UNAME_RELEASE} + exit 0 ;; + *:NonStop-UX:*:*) + echo mips-compaq-nonstopux + exit 0 ;; + BS2000:POSIX*:*:*) + echo bs2000-siemens-sysv + exit 0 ;; + DS/*:UNIX_System_V:*:*) + echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} + exit 0 ;; + *:Plan9:*:*) + # "uname -m" is not consistent, so use $cputype instead. 386 + # is converted to i386 for consistency with other x86 + # operating systems. + if test "$cputype" = "386"; then + UNAME_MACHINE=i386 + else + UNAME_MACHINE="$cputype" + fi + echo ${UNAME_MACHINE}-unknown-plan9 + exit 0 ;; + *:TOPS-10:*:*) + echo pdp10-unknown-tops10 + exit 0 ;; + *:TENEX:*:*) + echo pdp10-unknown-tenex + exit 0 ;; + KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) + echo pdp10-dec-tops20 + exit 0 ;; + XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) + echo pdp10-xkl-tops20 + exit 0 ;; + *:TOPS-20:*:*) + echo pdp10-unknown-tops20 + exit 0 ;; + *:ITS:*:*) + echo pdp10-unknown-its + exit 0 ;; + SEI:*:*:SEIUX) + echo mips-sei-seiux${UNAME_RELEASE} + exit 0 ;; + *:DragonFly:*:*) + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + exit 0 ;; + *:*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 ;; + esac ;; + *:XENIX:*:SysV) + echo i386-pc-xenix + exit 0 ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 +eval $set_cc_for_build cat >$dummy.c < @@ -1034,11 +1356,24 @@ #endif #if defined (vax) -#if !defined (ultrix) - printf ("vax-dec-bsd\n"); exit (0); -#else - printf ("vax-dec-ultrix\n"); exit (0); -#endif +# if !defined (ultrix) +# include +# if defined (BSD) +# if BSD == 43 + printf ("vax-dec-bsd4.3\n"); exit (0); +# else +# if BSD == 199006 + printf ("vax-dec-bsd4.3reno\n"); exit (0); +# else + printf ("vax-dec-bsd\n"); exit (0); +# endif +# endif +# else + printf ("vax-dec-bsd\n"); exit (0); +# endif +# else + printf ("vax-dec-ultrix\n"); exit (0); +# endif #endif #if defined (alliant) && defined (i860) @@ -1049,8 +1384,7 @@ } EOF -$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm $dummy.c $dummy && exit 0 -rm -f $dummy.c $dummy +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 # Apollos put the system type in the environment. @@ -1082,6 +1416,50 @@ esac fi -#echo '(Unable to guess system type)' 1>&2 +cat >&2 < in order to provide the needed +information to handle your system. + +config.guess timestamp = $timestamp + +uname -m = `(uname -m) 2>/dev/null || echo unknown` +uname -r = `(uname -r) 2>/dev/null || echo unknown` +uname -s = `(uname -s) 2>/dev/null || echo unknown` +uname -v = `(uname -v) 2>/dev/null || echo unknown` + +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` +/bin/uname -X = `(/bin/uname -X) 2>/dev/null` + +hostinfo = `(hostinfo) 2>/dev/null` +/bin/universe = `(/bin/universe) 2>/dev/null` +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` +/bin/arch = `(/bin/arch) 2>/dev/null` +/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` + +UNAME_MACHINE = ${UNAME_MACHINE} +UNAME_RELEASE = ${UNAME_RELEASE} +UNAME_SYSTEM = ${UNAME_SYSTEM} +UNAME_VERSION = ${UNAME_VERSION} +EOF exit 1 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "timestamp='" +# time-stamp-format: "%:y-%02m-%02d" +# time-stamp-end: "'" +# End: --- circuslinux-1.0.3.orig/circuslinux.c +++ circuslinux-1.0.3/circuslinux.c @@ -15,6 +15,11 @@ December 11, 1999 - April 28, 2001 */ +#ifndef SHARED_SCOREFILE_YES +#ifndef SHARED_SCOREFILE_NO +#error something went wrong in configure, either SHARED_SCOREFILE_YES or SHARED_SCOREFILE_NO must be defined. Please tell cts@debian.org how you did this. +#endif +#endif /* Constraints: */ @@ -430,6 +435,9 @@ void drawfuzz(int x, int y, int w, int h); void seticon(void); void usage(int ret); +#ifdef SHARED_SCOREFILE_YES +FILE * open_score_file(char * mode); +#endif FILE * open_option_file(char * mode); void addscore(int player, int inc); int highscorescreen(void); @@ -579,7 +587,37 @@ strcpy(highscorer[i], "TUX"); } + +#ifdef SHARED_SCOREFILE_YES + fi = open_score_file("r"); + if (fi != NULL) { + do { + fgets(temp, sizeof(temp), fi); + + if (!feof(fi)) { + temp[strlen(temp) - 1] = '\0'; + + /* Parse each line: */ + + if (strstr(temp, "highscore") == temp && + temp[9] >= '0' && temp[9] <= '7' && + temp[10] == '=') { + highscore[temp[9] - '0'] = atoi(temp + 11); + } else if (strstr(temp, "highscorer") == temp && + temp[10] >= '0' && temp[10] <= '7' && + temp[11] == '=') { + highscorer[temp[10] - '0'][0] = temp[12]; + highscorer[temp[10] - '0'][1] = temp[13]; + highscorer[temp[10] - '0'][2] = temp[14]; + } + } + } while (!feof(fi)); + + fclose(fi); + } +#endif /* SHARED_SCOREFILE_YES */ + /* Load options: */ fi = open_option_file("r"); @@ -597,7 +635,20 @@ /* Parse each line: */ - if (strstr(temp, "highscore") == temp && + if (strstr(temp, "effects=") == temp) + { + sfx_vol = atoi(temp + 8); + if (sfx_vol > 3 || sfx_vol < 0) + sfx_vol = 3; + } + else if (strstr(temp, "music=") == temp) + { + music_vol = atoi(temp + 6); + if (music_vol > 3 || music_vol < 0) + music_vol = 3; + } +#ifdef SHARED_SCOREFILE_NO + else if (strstr(temp, "highscore") == temp && temp[9] >= '0' && temp[9] <= '7' && temp[10] == '=') { @@ -611,18 +662,7 @@ highscorer[temp[10] - '0'][1] = temp[13]; highscorer[temp[10] - '0'][2] = temp[14]; } - else if (strstr(temp, "effects=") == temp) - { - sfx_vol = atoi(temp + 8); - if (sfx_vol > 3 || sfx_vol < 0) - sfx_vol = 3; - } - else if (strstr(temp, "music=") == temp) - { - music_vol = atoi(temp + 6); - if (music_vol > 3 || music_vol < 0) - music_vol = 3; - } +#endif /* SHARED_SCOREFILE_NO */ } } while (!feof(fi)); @@ -667,8 +707,37 @@ while (!done); + /* Save scores: */ + +#ifdef SHARED_SCOREFILE_YES + fi = open_score_file("w"); + if (fi != NULL) { + /* Comment at the top (I wish _everyone_ did this!) */ + + fprintf(fi, "# Circus Linux! score file\n\n"); + + + /* High scores: */ + + fprintf(fi, "# Highscores:\n\n"); + + for (i = 0; i < 8; i++) { + fprintf(fi, "highscore%d=%d\n", i, highscore[i]); + fprintf(fi, "highscorer%d=%s\n\n", i, highscorer[i]); + } + + fprintf(fi, "\n"); + + /* The end! */ + + fprintf(fi, "# (File automatically created.)\n"); + + fclose(fi); + } +#endif /* SHARED_SCOREFILE_YES */ + /* Save options: */ - + fi = open_option_file("w"); if (fi != NULL) { @@ -677,6 +746,7 @@ fprintf(fi, "# Circus Linux! options file\n\n"); +#ifdef SHARED_SCOREFILE_NO /* High scores: */ fprintf(fi, "# Highscores:\n\n"); @@ -686,9 +756,9 @@ fprintf(fi, "highscore%d=%d\n", i, highscore[i]); fprintf(fi, "highscorer%d=%s\n\n", i, highscorer[i]); } - + fprintf(fi, "\n"); - +#endif /* SHARED_SCOREFILE_NO */ /* Volume settings: */ @@ -2809,7 +2879,7 @@ #ifndef NOSOUND if (use_sound == 1) { - if (Mix_OpenAudio(44100, AUDIO_S16, 2, 256) < 0) + if (Mix_OpenAudio(44100, AUDIO_S16, 2, 4096) < 0) { fprintf(stderr, "\nWarning: I could not set up audio for 44100 Hz " @@ -3424,6 +3494,33 @@ } +#ifdef SHARED_SCOREFILE_YES +FILE * open_score_file(char * mode) +{ + FILE * fi; + + /* Try opening the file: */ + + fi = fopen("/var/games/circuslinux/scorefile", mode); + + if (fi == NULL) + { + fprintf(stderr, "\nWarning: I could not open the score file "); + + if (strcmp(mode, "r") == 0) + fprintf(stderr, "for read:"); + else if (strcmp(mode, "w") == 0) + fprintf(stderr, "for write:"); + + fprintf(stderr, "\n%s\n" + "The error that occured was:\n" + "%s\n\n","/var/games/circuslinux/scorefile" , strerror(errno)); + } + + return(fi); +} +#endif + /* Open the option file: */ FILE * open_option_file(char * mode) @@ -3444,14 +3541,22 @@ else home = "."; - /* Create the buffer for the filename: */ +#ifdef SHARED_SCOREFILE_YES +/* do not touch the old scorefile, options go in the (new) rc file instead */ + filename = (char *) malloc(sizeof(char) * (strlen(home) + + strlen("/.circuslinuxrc") + 1)); + + strcpy(filename, home); + strcat(filename, "/.circuslinuxrc"); +#else filename = (char *) malloc(sizeof(char) * (strlen(home) + strlen("/.circuslinux") + 1)); strcpy(filename, home); strcat(filename, "/.circuslinux"); +#endif #else filename = "circuslinux.dat"; #endif @@ -3474,7 +3579,30 @@ "The error that occured was:\n" "%s\n\n", filename, strerror(errno)); } - +#ifdef SHARED_SCOREFILE_YES + if (strcmp(mode, "r") == 0) { + strcpy(filename, home); + strcat(filename, "/.circuslinux\0\0"); + + fprintf(stderr, "Trying old options file instead...\n"); + + fi = fopen(filename, mode); + + if (fi == NULL) { + fprintf(stderr, "\nWarning: I could not open old options file :"); + fprintf(stderr, "\n%s\n" + "The error that occured was:\n" + "%s\n\n", filename, strerror(errno)); + } else { + fprintf(stderr, "Found %s.\n", filename); + fprintf(stderr, "Your config will be stored in %src upon exit.\n", filename); + fprintf(stderr, +"Once your sysadmin has merged all scorefiles on this system (or you can do\n" +"without your old circuslinux highscores) you can safely delete you old config\n" +"and scorefile :\n %s", filename); + } + } +#endif /* SHARED_SCOREFILE_YES */ return(fi); } --- circuslinux-1.0.3.orig/autogen.sh +++ circuslinux-1.0.3/autogen.sh @@ -1,8 +1,22 @@ #!/bin/bash # +# autogen.sh for circuslinux +# +# Requires: automake, autoconf, dpkg-dev +set -e +# Refresh GNU autotools toolchain. aclocal automake --foreign + +# The automake package already links config.sub/guess to /usr/share/misc/ +for i in config.guess config.sub missing install-sh mkinstalldirs ; do + test -r /usr/share/automake/${i} && cp -f /usr/share/automake/${i} . + chmod 755 ${i} +done + autoconf -./configure $* \ No newline at end of file +#./configure $* + +exit 0 --- circuslinux-1.0.3.orig/aclocal.m4 +++ circuslinux-1.0.3/aclocal.m4 @@ -1,4 +1,4 @@ -dnl aclocal.m4 generated automatically by aclocal 1.4 +dnl aclocal.m4 generated automatically by aclocal 1.4-p4 dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation --- circuslinux-1.0.3.orig/Makefile.in +++ circuslinux-1.0.3/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -83,9 +83,10 @@ CC = @CC@ DATA_PREFIX = $(pkgdatadir)/data/ JOY = @JOY@ +SHARED_SCOREFILE = @SHARED_SCOREFILE@ TARGET_DEF = @TARGET_DEF@ -CFLAGS = @CFLAGS@ -Wall -O2 -DDATA_PREFIX=\"$(DATA_PREFIX)\" -D$(TARGET_DEF) -DJOY_$(JOY) +CFLAGS = @CFLAGS@ -Wall -O2 -DDATA_PREFIX=\"$(DATA_PREFIX)\" -D$(TARGET_DEF) -DJOY_$(JOY) -DSHARED_SCOREFILE_$(SHARED_SCOREFILE) LIBS = @LIBS@ @@ -130,8 +131,9 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = tar GZIP_ENV = --best +DEP_FILES = .deps/circuslinux.P SOURCES = $(circuslinux_SOURCES) OBJECTS = $(circuslinux_OBJECTS) @@ -139,16 +141,16 @@ .SUFFIXES: .SUFFIXES: .S .c .o .s $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps Makefile + cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status $(ACLOCAL_M4): configure.in acinclude.m4 cd $(srcdir) && $(ACLOCAL) -config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +config.status: $(srcdir)/configure.in $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) cd $(srcdir) && $(AUTOCONF) @@ -178,9 +180,6 @@ rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done -.c.o: - $(COMPILE) -c $< - .s.o: $(COMPILE) -c $< @@ -347,6 +346,11 @@ -rm -rf $(distdir) mkdir $(distdir) -chmod 777 $(distdir) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ @@ -368,6 +372,37 @@ fi; \ done +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) + +-include $(DEP_FILES) + +mostlyclean-depend: + +clean-depend: + +distclean-depend: + -rm -rf .deps + +maintainer-clean-depend: + +%.o: %.c + @echo '$(COMPILE) -c $<'; \ + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-cp .deps/$(*F).pp .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm .deps/$(*F).pp + +%.lo: %.c + @echo '$(LTCOMPILE) -c $<'; \ + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ + < .deps/$(*F).pp > .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm -f .deps/$(*F).pp info-am: info: info-recursive dvi-am: @@ -406,24 +441,25 @@ maintainer-clean-generic: mostlyclean-am: mostlyclean-binPROGRAMS mostlyclean-compile \ - mostlyclean-tags mostlyclean-generic + mostlyclean-tags mostlyclean-depend mostlyclean-generic mostlyclean: mostlyclean-recursive -clean-am: clean-binPROGRAMS clean-compile clean-tags clean-generic \ - mostlyclean-am +clean-am: clean-binPROGRAMS clean-compile clean-tags clean-depend \ + clean-generic mostlyclean-am clean: clean-recursive distclean-am: distclean-binPROGRAMS distclean-compile distclean-tags \ - distclean-generic clean-am + distclean-depend distclean-generic clean-am distclean: distclean-recursive -rm -f config.status maintainer-clean-am: maintainer-clean-binPROGRAMS \ maintainer-clean-compile maintainer-clean-tags \ - maintainer-clean-generic distclean-am + maintainer-clean-depend maintainer-clean-generic \ + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." @@ -439,13 +475,14 @@ all-recursive check-recursive installcheck-recursive info-recursive \ dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \ maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ -dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ -install-exec install-data-am install-data install-am install \ -uninstall-local uninstall-am uninstall all-redirect all-am all \ -installdirs-am installdirs mostlyclean-generic distclean-generic \ -clean-generic maintainer-clean-generic clean mostlyclean distclean \ -maintainer-clean +distclean-tags clean-tags maintainer-clean-tags distdir \ +mostlyclean-depend distclean-depend clean-depend \ +maintainer-clean-depend info-am info dvi-am dvi check check-am \ +installcheck-am installcheck install-exec-am install-exec \ +install-data-am install-data install-am install uninstall-local \ +uninstall-am uninstall all-redirect all-am all installdirs-am \ +installdirs mostlyclean-generic distclean-generic clean-generic \ +maintainer-clean-generic clean mostlyclean distclean maintainer-clean uninstall-local: --- circuslinux-1.0.3.orig/Makefile.am +++ circuslinux-1.0.3/Makefile.am @@ -18,11 +18,12 @@ CC=@CC@ DATA_PREFIX=$(pkgdatadir)/data/ JOY=@JOY@ +SHARED_SCOREFILE=@SHARED_SCOREFILE@ TARGET_DEF=@TARGET_DEF@ CFLAGS = @CFLAGS@ -Wall -O2 -DDATA_PREFIX=\"$(DATA_PREFIX)\" \ - -D$(TARGET_DEF) -DJOY_$(JOY) + -D$(TARGET_DEF) -DJOY_$(JOY) -DSHARED_SCOREFILE_$(SHARED_SCOREFILE) LIBS = @LIBS@