--- circlemud-3.1.cvs2003061021.orig/bin/.cvsignore
+++ circlemud-3.1.cvs2003061021/bin/.cvsignore
@@ -2,6 +2,7 @@
 delobjs
 listrent
 mudpasswd
+newpfile
 play2to3
 purgeplay
 shopconv
--- circlemud-3.1.cvs2003061021.orig/configure
+++ circlemud-3.1.cvs2003061021/configure
@@ -530,6 +530,13 @@
 #define CIRCLE_UNIX 1
 EOF
 
+if test "$CIRCLE_FHS"; then
+echo "configuring for filesystem hierarchy standard installation" 1>&6
+cat >> confdefs.h <<\EOF
+#define CIRCLE_FHS 1
+EOF
+fi
+
 
 for ac_prog in less most more cat
 do
--- circlemud-3.1.cvs2003061021.orig/src/comm.c
+++ circlemud-3.1.cvs2003061021/src/comm.c
@@ -76,11 +76,13 @@
 extern char *GREETINGS;
 extern const char *circlemud_version;
 extern int circle_restrict;
+extern int use_syslog;
 extern int mini_mud;
 extern int no_rent_check;
 extern FILE *player_fl;
 extern ush_int DFLT_PORT;
 extern const char *DFLT_DIR;
+extern const char *DFLT_PIDFILE;
 extern const char *DFLT_IP;
 extern const char *LOGNAME;
 extern int max_playing;
@@ -122,7 +124,7 @@
 void echo_on(struct descriptor_data *d);
 void circle_sleep(struct timeval *timeout);
 int get_from_q(struct txt_q *queue, char *dest, int *aliased);
-void init_game(ush_int port);
+int init_game(ush_int port);
 void signal_setup(void);
 void game_loop(socket_t mother_desc);
 socket_t init_socket(ush_int port);
@@ -208,8 +210,10 @@
 int main(int argc, char **argv)
 {
   ush_int port;
-  int pos = 1;
-  const char *dir;
+  int pos = 1, autorun = 0, status = 0;
+  const char *dir, *pidfile;
+  pid_t pid;
+  FILE *pid_fp;
 
 #if CIRCLE_GNU_LIBC_MEMORY_TRACK
   mtrace();	/* This must come before any use of malloc(). */
@@ -227,6 +231,7 @@
 
   port = DFLT_PORT;
   dir = DFLT_DIR;
+  pidfile = DFLT_PIDFILE;
 
   while ((pos < argc) && (*(argv[pos]) == '-')) {
     switch (*(argv[pos] + 1)) {
@@ -250,6 +255,9 @@
 	exit(1);
       }
       break;
+    case 'l':
+      use_syslog = 1;
+      break;
     case 'm':
       mini_mud = 1;
       no_rent_check = 1;
@@ -273,10 +281,11 @@
       break;
     case 'h':
       /* From: Anil Mahajan <amahajan@proxicom.com> */
-      printf("Usage: %s [-c] [-m] [-q] [-r] [-s] [-d pathname] [port #]\n"
+      printf("Usage: %s [-c] [-l] [-m] [-q] [-r] [-s] [-d pathname] [-o pathname] [port #]\n"
               "  -c             Enable syntax check mode.\n"
               "  -d <directory> Specify library directory (defaults to 'lib').\n"
               "  -h             Print this command line argument help.\n"
+	      "  -l             Log to the server's syslog.\n"
               "  -m             Start in mini-MUD mode.\n"
 	      "  -o <file>      Write log to <file> instead of stderr.\n"
               "  -q             Quick boot (doesn't scan rent for object limits)\n"
@@ -294,7 +303,7 @@
 
   if (pos < argc) {
     if (!isdigit(*argv[pos])) {
-      printf("Usage: %s [-c] [-m] [-q] [-r] [-s] [-d pathname] [port #]\n", argv[0]);
+      printf("Usage: %s [-c] [-l] [-m] [-q] [-r] [-s] [-d pathname] [-o pathname] [port #]\n", argv[0]);
       exit(1);
     } else if ((port = atoi(argv[pos])) <= 1024) {
       printf("SYSERR: Illegal port number %d.\n", port);
@@ -302,6 +311,11 @@
     }
   }
 
+  while (autorun == 0) {
+    autorun = 1;
+    pid = fork ();
+    if (pid == 0) {
+
   /* All arguments have been parsed, try to open log file. */
   setup_log(LOGNAME, STDERR_FILENO);
 
@@ -313,7 +327,7 @@
 
   if (chdir(dir) < 0) {
     perror("SYSERR: Fatal error changing to data directory");
-    exit(1);
+    _exit(1);
   }
   log("Using %s as data directory.", dir);
 
@@ -321,7 +335,7 @@
     boot_world();
   else {
     log("Running game on port %d.", port);
-    init_game(port);
+    autorun = init_game(port);
   }
 
   log("Clearing game world.");
@@ -343,13 +357,30 @@
   }
 
   log("Done.");
-  return (0);
+
+      _exit (autorun);
+    }
+    else if (pid < 0) status = -1;
+    else {
+      if (!(pid_fp = fopen(pidfile, "w"))) {
+        perror("SYSERR: Cannot open pidfile");
+        exit(1);
+      }
+      if (fprintf(pid_fp, "%d\n", (int)pid) < 0 || fclose(pid_fp) < 0) {
+        perror("SYSERR: Cannot write to pidfile");
+        exit(1);
+      }
+      if (waitpid (pid, &autorun, 0) != pid) status = -1;
+      unlink(pidfile);
+    }
+  }
+  return status;
 }
 
 
 
 /* Init sockets, run game, and cleanup sockets */
-void init_game(ush_int port)
+int init_game(ush_int port)
 {
   socket_t mother_desc;
 
@@ -392,9 +423,10 @@
 
   if (circle_reboot) {
     log("Rebooting.");
-    exit(52);			/* what's so great about HHGTTG, anyhow? */
+    return (0);
   }
   log("Normal termination of game.");
+  return (1);
 }
 
 
@@ -2100,9 +2132,26 @@
 /* Dying anyway... */
 RETSIGTYPE hupsig(int sig)
 {
-  log("SYSERR: Received SIGHUP, SIGINT, or SIGTERM.  Shutting down...");
-  exit(1);			/* perhaps something more elegant should
-				 * substituted */
+  switch(sig) {
+    case SIGHUP:
+      log("SYSERR: Received SIGHUP.  Rebooting...");
+      circle_shutdown = circle_reboot = 1;
+      send_to_all("Rebooting.. come back in a minute or two.\r\n");
+      break;
+    case SIGTERM:
+      log("SYSERR: Received SIGTERM.  Shutting down...");
+      send_to_all("Shutting down for maintenance.\r\n");
+      circle_shutdown = 1;
+      circle_reboot = 0;
+      break;
+    case SIGINT:
+      log("SYSERR: Received SIGINT.  Bailing out...");
+      exit(1);
+      break;
+    default:
+      log("SYSERR: Received unexpected signal %d.", sig);
+      break;
+  }
 }
 
 #endif	/* CIRCLE_UNIX */
@@ -2441,6 +2490,11 @@
 void setup_log(const char *filename, int fd)
 {
   FILE *s_fp;
+
+  if(use_syslog) {
+    openlog("circlemud", LOG_PID, LOG_DAEMON);
+    return;
+  }
 
 #if defined(__MWERKS__) || defined(__GNUC__)
   s_fp = stderr;
--- circlemud-3.1.cvs2003061021.orig/src/conf.h.in
+++ circlemud-3.1.cvs2003061021/src/conf.h.in
@@ -30,6 +30,9 @@
 /* Define if we're compiling CircleMUD under any type of UNIX system.  */
 #undef CIRCLE_UNIX
 
+/* Define if we're compiling for the Filesystem Hierarchy Standard.  */
+#undef CIRCLE_FHS
+
 /* Define if the system is capable of using crypt() to encrypt.  */
 #undef CIRCLE_CRYPT
 
--- circlemud-3.1.cvs2003061021.orig/src/config.c
+++ circlemud-3.1.cvs2003061021/src/config.c
@@ -215,7 +215,18 @@
 /* const char *DFLT_IP = "192.168.1.1";  -- bind only to one interface */
 
 /* default directory to use as data directory */
+#ifdef CIRCLE_FHS
+const char *DFLT_DIR = "/var/lib/circlemud";
+#else
 const char *DFLT_DIR = "lib";
+#endif
+
+/* default file to contain PID */
+#ifdef CIRCLE_FHS
+const char *DFLT_PIDFILE = "/var/run/circlemud/circlemud.pid";
+#else
+const char *DFLT_PIDFILE = "circlemud.pid";
+#endif
 
 /*
  * What file to log messages to (ex: "log/syslog").  Setting this to NULL
--- circlemud-3.1.cvs2003061021.orig/src/db.c
+++ circlemud-3.1.cvs2003061021/src/db.c
@@ -53,6 +53,7 @@
 long top_idnum = 0;		/* highest idnum in use		 */
 
 int no_mail = 0;		/* mail disabled?		 */
+int use_syslog = 0;		/* log to syslog?		 */
 int mini_mud = 0;		/* mini-mud mode?		 */
 int no_rent_check = 0;		/* skip rent check on boot?	 */
 time_t boot_time = 0;		/* time of mud boot		 */
--- circlemud-3.1.cvs2003061021.orig/src/db.h
+++ circlemud-3.1.cvs2003061021/src/db.h
@@ -29,8 +29,13 @@
 #define SLASH		":"
 #elif defined(CIRCLE_AMIGA) || defined(CIRCLE_UNIX) || defined(CIRCLE_WINDOWS) || defined(CIRCLE_ACORN) || defined(CIRCLE_VMS)
 #define LIB_WORLD	"world/"
+#ifdef CIRCLE_FHS
+#define LIB_TEXT	"/etc/circlemud/"
+#define LIB_TEXT_HELP	"help/"
+#else
 #define LIB_TEXT	"text/"
 #define LIB_TEXT_HELP	"text/help/"
+#endif
 #define LIB_MISC	"misc/"
 #define LIB_ETC		"etc/"
 #define LIB_PLRTEXT	"plrtext/"
@@ -54,6 +59,10 @@
 #define FASTBOOT_FILE	"::.fastboot"	/* autorun: boot without sleep	*/
 #define KILLSCRIPT_FILE	"::.killscript"	/* autorun: shut mud down	*/
 #define PAUSE_FILE	"::pause"	/* autorun: don't restart mud	*/
+#elif defined(CIRCLE_FHS)
+#define FASTBOOT_FILE   "/var/run/circlemud/.fastboot"   /* without sleep */
+#define KILLSCRIPT_FILE "/var/run/circlemud/.killscript" /* shut mud down */
+#define PAUSE_FILE      "/var/run/circlemud/pause"       /* don't restart */
 #else
 #define FASTBOOT_FILE   "../.fastboot"  /* autorun: boot without sleep  */
 #define KILLSCRIPT_FILE "../.killscript"/* autorun: shut mud down       */
@@ -68,7 +77,11 @@
 #define OBJ_PREFIX	LIB_WORLD"obj"SLASH	/* object prototypes	*/
 #define ZON_PREFIX	LIB_WORLD"zon"SLASH	/* zon defs & command tables */
 #define SHP_PREFIX	LIB_WORLD"shp"SLASH	/* shop definitions	*/
+#ifdef CIRCLE_FHS
+#define HLP_PREFIX	"help"SLASH		/* for HELP <keyword>	*/
+#else
 #define HLP_PREFIX	LIB_TEXT"help"SLASH	/* for HELP <keyword>	*/
+#endif
 
 #define CREDITS_FILE	LIB_TEXT"credits" /* for the 'credits' command	*/
 #define NEWS_FILE	LIB_TEXT"news"	/* for the 'news' command	*/
--- circlemud-3.1.cvs2003061021.orig/src/sysdep.h
+++ circlemud-3.1.cvs2003061021/src/sysdep.h
@@ -132,6 +132,7 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <stdarg.h>
+#include <syslog.h>
 
 #ifdef HAVE_STRING_H
 #include <string.h>
--- circlemud-3.1.cvs2003061021.orig/src/utils.c
+++ circlemud-3.1.cvs2003061021/src/utils.c
@@ -202,6 +202,13 @@
 {
   time_t ct = time(0);
   char *time_s = asctime(localtime(&ct));
+  extern int use_syslog;
+
+  if(use_syslog) {
+    if (format == NULL) format = "SYSERR: log() received a NULL format.";
+    vsyslog(LOG_INFO, format, args);
+    return;
+  }
 
   if (logfile == NULL) {
     puts("SYSERR: Using log() before stream was initialized!");
--- circlemud-3.1.cvs2003061021.orig/src/util/Makefile.in
+++ circlemud-3.1.cvs2003061021/src/util/Makefile.in
@@ -26,7 +26,7 @@
 all: $(BINDIR)/autowiz $(BINDIR)/delobjs $(BINDIR)/listrent \
 	$(BINDIR)/mudpasswd $(BINDIR)/play2to3 $(BINDIR)/purgeplay \
 	$(BINDIR)/shopconv $(BINDIR)/showplay $(BINDIR)/sign $(BINDIR)/split \
-	$(BINDIR)/wld2html
+	$(BINDIR)/wld2html $(BINDIR)/newpfile
 
 autowiz: $(BINDIR)/autowiz
 
@@ -36,6 +36,8 @@
 
 mudpasswd: $(BINDIR)/mudpasswd
 
+newpfile: $(BINDIR)/newpfile
+
 play2to3: $(BINDIR)/play2to3
 
 purgeplay: $(BINDIR)/purgeplay
@@ -65,6 +67,10 @@
 $(BINDIR)/mudpasswd: mudpasswd.c $(INCDIR)/conf.h $(INCDIR)/sysdep.h \
 	$(INCDIR)/structs.h $(INCDIR)/utils.h
 	$(CC) $(CFLAGS) -o $(BINDIR)/mudpasswd mudpasswd.c @CRYPTLIB@
+
+$(BINDIR)/newpfile: newpfile.c $(INCDIR)/conf.h $(INCDIR)/db.h \
+	$(INCDIR)/sysdep.h $(INCDIR)/structs.h $(INCDIR)/utils.h
+	$(CC) $(CFLAGS) -o $(BINDIR)/newpfile newpfile.c @CRYPTLIB@
 
 $(BINDIR)/play2to3: play2to3.c $(INCDIR)/conf.h $(INCDIR)/sysdep.h
 	$(CC) $(CFLAGS) -o $(BINDIR)/play2to3 play2to3.c
--- circlemud-3.1.cvs2003061021.orig/src/util/newpfile.c
+++ circlemud-3.1.cvs2003061021/src/util/newpfile.c
@@ -0,0 +1,126 @@
+/* ************************************************************************
+*  file:  newpfile.c (based on mudpasswd.c)           Part of CircleMud   *
+*  Usage: creating a fresh Diku playerifle with only an Implementor       *
+*  Copyright (C) 1990, 1991 - see 'license.doc' for complete information. *
+*  All Rights Reserved                                                    *
+************************************************************************* */
+
+
+#include "conf.h"
+#include "sysdep.h"
+
+#include "structs.h"
+#include "utils.h"
+#include "db.h"
+
+char *CAP(char *txt) {
+  *txt = UPPER(*txt);
+  return (txt);
+}
+
+void newpfile(char *filename, char *name, char *password)
+{
+  FILE *fl;
+  struct char_file_u buf;
+  int i;
+
+  if (!access(filename, F_OK)) {
+    fprintf(stderr, "Cowardly refusing to overwrite existing %s.\nMove or delete it first...\n", filename);
+    exit(1);
+  }
+  else if (!(fl = fopen(filename, "w"))) {
+    perror(filename);
+    exit(1);
+  }
+  
+  strncpy(buf.name, CAP(name), MAX_NAME_LENGTH);
+  strncpy(buf.description, "Bow before your implementor.", EXDSCR_LENGTH);
+  strncpy(buf.title, "the Implementor", MAX_TITLE_LENGTH);
+  buf.sex = 0;
+  buf.chclass = 0;
+  buf.level = LVL_IMPL;
+  buf.hometown = 0;
+  buf.birth = time(NULL);
+  buf.played = 0;
+  buf.weight = 255;
+  buf.height = 255;
+  strncpy(buf.pwd, CRYPT(password, buf.name), MAX_PWD_LENGTH);
+  buf.char_specials_saved.alignment = 0;
+  buf.char_specials_saved.idnum = 1;
+  buf.char_specials_saved.act = 0;
+  buf.char_specials_saved.affected_by = 0;
+  for (i=0;i<5;i++) buf.char_specials_saved.apply_saving_throw[i] = 0;
+  for (i=0;i<MAX_SKILLS;i++) buf.player_specials_saved.skills[i] = 100;
+  buf.player_specials_saved.PADDING0 = 0;
+  for (i=0;i<MAX_TONGUE;i++) buf.player_specials_saved.talks[i] = 1;
+  buf.player_specials_saved.wimp_level = 0;
+  buf.player_specials_saved.freeze_level = 0;
+  buf.player_specials_saved.invis_level = 0;
+  buf.player_specials_saved.load_room = 1204;
+  buf.player_specials_saved.pref = 0;
+  buf.player_specials_saved.bad_pws = 0;
+  for (i=0;i<3;i++) buf.player_specials_saved.conditions[i] = -1;
+  buf.player_specials_saved.spare0 = 0;
+  buf.player_specials_saved.spare1 = 0;
+  buf.player_specials_saved.spare2 = 0;
+  buf.player_specials_saved.spare3 = 0;
+  buf.player_specials_saved.spare4 = 0;
+  buf.player_specials_saved.spare5 = 0;
+  buf.player_specials_saved.spells_to_learn = 0;
+  buf.player_specials_saved.spare7 = 0;
+  buf.player_specials_saved.spare8 = 0;
+  buf.player_specials_saved.spare9 = 0;
+  buf.player_specials_saved.spare10 = 0;
+  buf.player_specials_saved.spare11 = 0;
+  buf.player_specials_saved.spare12 = 0;
+  buf.player_specials_saved.spare13 = 0;
+  buf.player_specials_saved.spare14 = 0;
+  buf.player_specials_saved.spare15 = 0;
+  buf.player_specials_saved.spare16 = 0;
+  buf.player_specials_saved.spare17 = 0;
+  buf.player_specials_saved.spare18 = 0;
+  buf.player_specials_saved.spare19 = 0;
+  buf.player_specials_saved.spare20 = 0;
+  buf.player_specials_saved.spare21 = 0;
+  buf.abilities.str = 25;
+  buf.abilities.str_add = 100;
+  buf.abilities.intel = 25;
+  buf.abilities.wis = 25;
+  buf.abilities.dex = 25;
+  buf.abilities.con = 25;
+  buf.abilities.cha = 25;
+  buf.points.mana = 100;
+  buf.points.max_mana = 100;
+  buf.points.hit = 500;
+  buf.points.max_hit = 500;
+  buf.points.move = 82;
+  buf.points.max_move = 82;
+  buf.points.armor = 100;
+  buf.points.gold = 0;
+  buf.points.bank_gold = 0;
+  buf.points.exp = 7000000;
+  buf.points.hitroll = 0;
+  buf.points.damroll = 0;
+  for (i=0;i<MAX_AFFECT;i++) {
+    buf.affected[i].type = 0;
+    buf.affected[i].duration = 0;
+    buf.affected[i].modifier = 0;
+    buf.affected[i].location = 0;
+    buf.affected[i].bitvector = 0;
+    buf.affected[i].next = 0;
+    buf.last_logon = 0;
+  }
+
+  fwrite(&buf, sizeof(struct char_file_u), 1, fl);
+  fclose(fl);
+}
+
+int main(int argc, char **argv)
+{
+  if (argc != 4)
+    fprintf(stderr, "Usage: %s playerfile implementor-name initial-password\n", argv[0]);
+  else
+    newpfile(argv[1], argv[2], argv[3]);
+
+  return (0);
+}
--- circlemud-3.1.cvs2003061021.orig/config.guess
+++ circlemud-3.1.cvs2003061021/config.guess
@@ -0,0 +1,1325 @@
+#! /bin/sh
+# Attempt to guess a canonical system name.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002 Free Software Foundation, Inc.
+
+timestamp='2002-05-29'
+
+# 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
+# (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.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Originally written by Per Bothner <per@bothner.com>.
+# Please send patches to <config-patches@gnu.org>.  Submit a context
+# diff and a properly formatted ChangeLog entry.
+#
+# 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 build system type.
+
+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 <config-patches@gnu.org>."
+
+version="\
+GNU config.guess ($timestamp)
+
+Originally written by Per Bothner.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+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
+
+
+dummy=dummy-$$
+trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
+
+# CC_FOR_BUILD -- compiler used by this script.
+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
+# use `HOST_CC' if defined, but it is deprecated.
+
+set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,)    echo "int dummy(){}" > $dummy.c ;
+	for c in cc gcc c89 c99 ; do
+	  ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ;
+	  if test $? = 0 ; then
+	     CC_FOR_BUILD="$c"; break ;
+	  fi ;
+	done ;
+	rm -f $dummy.c $dummy.o $dummy.rel ;
+	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 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_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+
+# 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
+	release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+	# 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 ;;
+    amiga:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    arc:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    hp300:OpenBSD:*:*)
+	echo m68k-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 ;;
+    pmax:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sgi:OpenBSD:*:*)
+	echo mipseb-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sun3:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    wgrisc:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    *:OpenBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    alpha:OSF1:*:*)
+	if test $UNAME_RELEASE = "V4.0"; then
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+	fi
+	# 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 <<EOF >$dummy.s
+	.data
+\$Lformat:
+	.byte 37,100,45,37,120,10,0	# "%d-%x\n"
+
+	.text
+	.globl main
+	.align 4
+	.ent main
+main:
+	.frame \$30,16,\$26,0
+	ldgp \$29,0(\$27)
+	.prologue 1
+	.long 0x47e03d80 # implver \$0
+	lda \$2,-1
+	.long 0x47e20c21 # amask \$2,\$1
+	lda \$16,\$Lformat
+	mov \$0,\$17
+	not \$1,\$18
+	jsr \$26,printf
+	ldgp \$29,0(\$26)
+	mov 0,\$16
+	jsr \$26,exit
+	.end main
+EOF
+	eval $set_cc_for_build
+	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
+	if test "$?" = 0 ; then
+		case `./$dummy` in
+			0-0)
+				UNAME_MACHINE="alpha"
+				;;
+			1-0)
+				UNAME_MACHINE="alphaev5"
+				;;
+			1-1)
+				UNAME_MACHINE="alphaev56"
+				;;
+			1-101)
+				UNAME_MACHINE="alphapca56"
+				;;
+			2-303)
+				UNAME_MACHINE="alphaev6"
+				;;
+			2-307)
+				UNAME_MACHINE="alphaev67"
+				;;
+			2-1307)
+				UNAME_MACHINE="alphaev68"
+				;;
+		esac
+	fi
+	rm -f $dummy.s $dummy
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	exit 0 ;;
+    Alpha\ *:Windows_NT*:*)
+	# How do we know it's Interix rather than the generic POSIX subsystem?
+	# Should we change UNAME_MACHINE based on the output of uname instead
+	# of the specific Alpha model?
+	echo alpha-pc-interix
+	exit 0 ;;
+    21064:Windows_NT:50:3)
+	echo alpha-dec-winnt3.5
+	exit 0 ;;
+    Amiga*:UNIX_System_V:4.0:*)
+	echo m68k-unknown-sysv4
+	exit 0;;
+    *:[Aa]miga[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-amigaos
+	exit 0 ;;
+    *:[Mm]orph[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-morphos
+	exit 0 ;;
+    *:OS/390:*:*)
+	echo i370-ibm-openedition
+	exit 0 ;;
+    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+	echo arm-acorn-riscix${UNAME_RELEASE}
+	exit 0;;
+    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
+	echo hppa1.1-hitachi-hiuxmpp
+	exit 0;;
+    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
+	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
+	if test "`(/bin/universe) 2>/dev/null`" = att ; then
+		echo pyramid-pyramid-sysv3
+	else
+		echo pyramid-pyramid-bsd
+	fi
+	exit 0 ;;
+    NILE*:*:*:dcosx)
+	echo pyramid-pyramid-svr4
+	exit 0 ;;
+    sun4H:SunOS:5.*:*)
+	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
+    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
+    i86pc:SunOS:5.*:*)
+	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
+    sun4*:SunOS:6*:*)
+	# According to config.sub, this is the proper way to canonicalize
+	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
+	# it's likely to be more like Solaris than SunOS4.
+	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
+    sun4*:SunOS:*:*)
+	case "`/usr/bin/arch -k`" in
+	    Series*|S4*)
+		UNAME_RELEASE=`uname -v`
+		;;
+	esac
+	# Japanese Language versions have a version number like `4.1.3-JL'.
+	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
+	exit 0 ;;
+    sun3*:SunOS:*:*)
+	echo m68k-sun-sunos${UNAME_RELEASE}
+	exit 0 ;;
+    sun*:*:4.2BSD:*)
+	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+	case "`/bin/arch`" in
+	    sun3)
+		echo m68k-sun-sunos${UNAME_RELEASE}
+		;;
+	    sun4)
+		echo sparc-sun-sunos${UNAME_RELEASE}
+		;;
+	esac
+	exit 0 ;;
+    aushp:SunOS:*:*)
+	echo sparc-auspex-sunos${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
+    # > 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
+    # MiNT.  But MiNT is downward compatible to TOS, so this should
+    # be no problem.
+    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
+        echo m68k-atari-mint${UNAME_RELEASE}
+	exit 0 ;;
+    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
+	echo m68k-atari-mint${UNAME_RELEASE}
+        exit 0 ;;
+    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
+        echo m68k-atari-mint${UNAME_RELEASE}
+	exit 0 ;;
+    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
+        echo m68k-milan-mint${UNAME_RELEASE}
+        exit 0 ;;
+    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+        echo m68k-hades-mint${UNAME_RELEASE}
+        exit 0 ;;
+    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+        echo m68k-unknown-mint${UNAME_RELEASE}
+        exit 0 ;;
+    powerpc:machten:*:*)
+	echo powerpc-apple-machten${UNAME_RELEASE}
+	exit 0 ;;
+    RISC*:Mach:*:*)
+	echo mips-dec-mach_bsd4.3
+	exit 0 ;;
+    RISC*:ULTRIX:*:*)
+	echo mips-dec-ultrix${UNAME_RELEASE}
+	exit 0 ;;
+    VAX*:ULTRIX*:*:*)
+	echo vax-dec-ultrix${UNAME_RELEASE}
+	exit 0 ;;
+    2020:CLIX:*:* | 2430:CLIX:*:*)
+	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 <stdio.h>  /* for printf() prototype */
+	int main (int argc, char *argv[]) {
+#else
+	int main (argc, argv) int argc; char *argv[]; {
+#endif
+	#if defined (host_mips) && defined (MIPSEB)
+	#if defined (SYSTYPE_SYSV)
+	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_SVR4)
+	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
+	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
+	#endif
+	#endif
+	  exit (-1);
+	}
+EOF
+	$CC_FOR_BUILD $dummy.c -o $dummy \
+	  && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+	  && rm -f $dummy.c $dummy && exit 0
+	rm -f $dummy.c $dummy
+	echo mips-mips-riscos${UNAME_RELEASE}
+	exit 0 ;;
+    Motorola:PowerMAX_OS:*:*)
+	echo powerpc-motorola-powermax
+	exit 0 ;;
+    Night_Hawk:*:*:PowerMAX_OS)
+	echo powerpc-harris-powermax
+	exit 0 ;;
+    Night_Hawk:Power_UNIX:*:*)
+	echo powerpc-harris-powerunix
+	exit 0 ;;
+    m88k:CX/UX:7*:*)
+	echo m88k-harris-cxux7
+	exit 0 ;;
+    m88k:*:4*:R4*)
+	echo m88k-motorola-sysv4
+	exit 0 ;;
+    m88k:*:3*:R3*)
+	echo m88k-motorola-sysv3
+	exit 0 ;;
+    AViiON:dgux:*:*)
+        # DG/UX returns AViiON for all architectures
+        UNAME_PROCESSOR=`/usr/bin/uname -p`
+	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
+		echo m88k-dg-dguxbcs${UNAME_RELEASE}
+	    fi
+	else
+	    echo i586-dg-dgux${UNAME_RELEASE}
+	fi
+ 	exit 0 ;;
+    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
+	echo m88k-dolphin-sysv3
+	exit 0 ;;
+    M88*:*:R3*:*)
+	# Delta 88k system running SVR3
+	echo m88k-motorola-sysv3
+	exit 0 ;;
+    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
+	echo m88k-tektronix-sysv3
+	exit 0 ;;
+    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
+	echo m68k-tektronix-bsd
+	exit 0 ;;
+    *:IRIX*:*:*)
+	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
+	exit 0 ;;
+    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
+	exit 0 ;;              # Note that: echo "'`uname -s`'" gives '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 <sys/systemcfg.h>
+
+		main()
+			{
+			if (!__power_pc())
+				exit(1);
+			puts("powerpc-ibm-aix3.2.5");
+			exit(0);
+			}
+EOF
+		$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
+		rm -f $dummy.c $dummy
+		echo rs6000-ibm-aix3.2.5
+	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
+		echo rs6000-ibm-aix3.2.4
+	else
+		echo rs6000-ibm-aix3.2
+	fi
+	exit 0 ;;
+    *:AIX:*:[45])
+	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+		IBM_ARCH=rs6000
+	else
+		IBM_ARCH=powerpc
+	fi
+	if [ -x /usr/bin/oslevel ] ; then
+		IBM_REV=`/usr/bin/oslevel`
+	else
+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+	fi
+	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+	exit 0 ;;
+    *:AIX:*:*)
+	echo rs6000-ibm-aix
+	exit 0 ;;
+    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
+	echo romp-ibm-bsd4.4
+	exit 0 ;;
+    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
+	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
+	exit 0 ;;                           # report: romp-ibm BSD 4.3
+    *:BOSX:*:*)
+	echo rs6000-bull-bosx
+	exit 0 ;;
+    DPX/2?00:B.O.S.:*:*)
+	echo m68k-bull-sysv3
+	exit 0 ;;
+    9000/[34]??:4.3bsd:1.*:*)
+	echo m68k-hp-bsd
+	exit 0 ;;
+    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
+	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])
+		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 <stdlib.h>
+              #include <unistd.h>
+
+              int main ()
+              {
+              #if defined(_SC_KERNEL_BITS)
+                  long bits = sysconf(_SC_KERNEL_BITS);
+              #endif
+                  long cpu  = sysconf (_SC_CPU_VERSION);
+
+                  switch (cpu)
+              	{
+              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+              	case CPU_PA_RISC2_0:
+              #if defined(_SC_KERNEL_BITS)
+              	    switch (bits)
+              		{
+              		case 64: puts ("hppa2.0w"); break;
+              		case 32: puts ("hppa2.0n"); break;
+              		default: puts ("hppa2.0"); break;
+              		} break;
+              #else  /* !defined(_SC_KERNEL_BITS) */
+              	    puts ("hppa2.0"); break;
+              #endif
+              	default: puts ("hppa1.0"); break;
+              	}
+                  exit (0);
+              }
+EOF
+		    (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null) && HP_ARCH=`./$dummy`
+		    if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
+		    rm -f $dummy.c $dummy
+		fi ;;
+	esac
+	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 <unistd.h>
+	int
+	main ()
+	{
+	  long cpu = sysconf (_SC_CPU_VERSION);
+	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
+	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
+	     results, however.  */
+	  if (CPU_IS_PA_RISC (cpu))
+	    {
+	      switch (cpu)
+		{
+		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
+		  default: puts ("hppa-hitachi-hiuxwe2"); break;
+		}
+	    }
+	  else if (CPU_IS_HP_MC68K (cpu))
+	    puts ("m68k-hitachi-hiuxwe2");
+	  else puts ("unknown-hitachi-hiuxwe2");
+	  exit (0);
+	}
+EOF
+	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
+	rm -f $dummy.c $dummy
+	echo unknown-hitachi-hiuxwe2
+	exit 0 ;;
+    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
+	echo hppa1.1-hp-bsd
+	exit 0 ;;
+    9000/8??:4.3bsd:*:*)
+	echo hppa1.0-hp-bsd
+	exit 0 ;;
+    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
+	echo hppa1.0-hp-mpeix
+	exit 0 ;;
+    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
+	echo hppa1.1-hp-osf
+	exit 0 ;;
+    hp8??:OSF1:*:*)
+	echo hppa1.0-hp-osf
+	exit 0 ;;
+    i*86:OSF1:*:*)
+	if [ -x /usr/sbin/sysversion ] ; then
+	    echo ${UNAME_MACHINE}-unknown-osf1mk
+	else
+	    echo ${UNAME_MACHINE}-unknown-osf1
+	fi
+	exit 0 ;;
+    parisc*:Lites*:*:*)
+	echo hppa1.1-hp-lites
+	exit 0 ;;
+    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
+	echo c1-convex-bsd
+        exit 0 ;;
+    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+        exit 0 ;;
+    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
+	echo c34-convex-bsd
+        exit 0 ;;
+    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
+	echo c38-convex-bsd
+        exit 0 ;;
+    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
+	echo c4-convex-bsd
+        exit 0 ;;
+    CRAY*Y-MP:*:*:*)
+	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 's/\.[^.]*$/.X/'
+	exit 0 ;;
+    CRAY*TS:*:*:*)
+	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit 0 ;;
+    CRAY*T3D:*:*:*)
+	echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit 0 ;;
+    CRAY*T3E:*:*:*)
+	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit 0 ;;
+    CRAY*SV1:*:*:*)
+	echo sv1-cray-unicos${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 "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+        exit 0 ;;
+    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+	exit 0 ;;
+    sparc*:BSD/OS:*:*)
+	echo sparc-unknown-bsdi${UNAME_RELEASE}
+	exit 0 ;;
+    *:BSD/OS:*:*)
+	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+	exit 0 ;;
+    *:FreeBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-freebsd`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*:3*)
+	echo i386-pc-interix3
+	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
+	exit 0 ;;
+    i*:UWIN*:*)
+	echo ${UNAME_MACHINE}-pc-uwin
+	exit 0 ;;
+    p*:CYGWIN*:*)
+	echo powerpcle-unknown-cygwin
+	exit 0 ;;
+    prep*:SunOS:5.*:*)
+	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
+    *:GNU:*:*)
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	exit 0 ;;
+    i*86:Minix:*:*)
+	echo ${UNAME_MACHINE}-pc-minix
+	exit 0 ;;
+    arm*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
+    ia64: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=`
+	rm -f $dummy.c
+	test x"${CPU}" != x && echo "${CPU}-pc-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 ;;
+    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.
+	# 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 targets: *//
+				    s/ .*//
+				    p'`
+        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
+	# Determine whether the default compiler is a.out or elf
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#include <features.h>
+	#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
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+	rm -f $dummy.c
+	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.*)
+        # 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,
+	# I just have to hope.  -- rms.
+        # 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.*:*)
+	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_REL}
+	else
+		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
+	fi
+	exit 0 ;;
+    i*86:*:5:[78]*)
+	case `/bin/uname -X | grep "^Machine"` in
+	    *486*)	     UNAME_MACHINE=i486 ;;
+	    *Pentium)	     UNAME_MACHINE=i586 ;;
+	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
+	esac
+	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+	exit 0 ;;
+    i*86:*:3.2:*)
+	if test -f /usr/options/cb.name; then
+		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
+		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
+	elif /bin/uname -X 2>/dev/null >/dev/null ; then
+		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|grep '^Machine.*Pent *II' >/dev/null) \
+			&& UNAME_MACHINE=i686
+		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
+			&& UNAME_MACHINE=i686
+		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
+	else
+		echo ${UNAME_MACHINE}-pc-sysv32
+	fi
+	exit 0 ;;
+    i*86:*DOS:*:*)
+	echo ${UNAME_MACHINE}-pc-msdosdjgpp
+	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
+        exit 0 ;;
+    Intel:Mach:3*:*)
+	echo i386-pc-mach3
+	exit 0 ;;
+    paragon:*:*:*)
+	echo i860-intel-osf1
+	exit 0 ;;
+    i860:*:4.*:*) # i860-SVR4
+	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
+	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
+	else # Add other i860-SVR4 vendors below as they are discovered.
+	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
+	fi
+	exit 0 ;;
+    mini*:CTIX:SYS*5:*)
+	# "miniframe"
+	echo m68010-convergent-sysv
+	exit 0 ;;
+    M68*:*:R3V[567]*:*)
+	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
+    3[34]??:*: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)
+	OS_REL=''
+	test -r /etc/.relid \
+	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
+    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+          && echo i486-ncr-sysv4 && exit 0 ;;
+    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]*:* | i*86:LynxOS:4.0*:*)
+	echo i386-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
+    TSUNAMI:LynxOS:2.*:*)
+	echo sparc-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
+    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 ;;
+    RM*:ReliantUNIX-*:*:*)
+	echo mips-sni-sysv4
+	exit 0 ;;
+    RM*:SINIX-*:*:*)
+	echo mips-sni-sysv4
+	exit 0 ;;
+    *:SINIX-*:*:*)
+	if uname -p 2>/dev/null >/dev/null ; then
+		UNAME_MACHINE=`(uname -p) 2>/dev/null`
+		echo ${UNAME_MACHINE}-sni-sysv4
+	else
+		echo ns32k-sni-sysv
+	fi
+	exit 0 ;;
+    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+                      # says <Richard.M.Bartel@ccMail.Census.GOV>
+        echo i586-unisys-sysv4
+        exit 0 ;;
+    *:UNIX_System_V:4*:FTX*)
+	# From Gerald Hewes <hewes@openmarket.com>.
+	# How about differentiating between stratus architectures? -djm
+	echo hppa1.1-stratus-sysv4
+	exit 0 ;;
+    *:*:*:FTX*)
+	# From seanf@swdc.stratus.com.
+	echo i860-stratus-sysv4
+	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*:*)
+	echo mips-sony-newsos6
+	exit 0 ;;
+    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+	if [ -d /usr/nec ]; then
+	        echo mips-nec-sysv${UNAME_RELEASE}
+	else
+	        echo mips-unknown-sysv${UNAME_RELEASE}
+	fi
+        exit 0 ;;
+    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
+	echo powerpc-be-beos
+	exit 0 ;;
+    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
+	echo powerpc-apple-beos
+	exit 0 ;;
+    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
+	echo i586-pc-beos
+	exit 0 ;;
+    SX-4:SUPER-UX:*:*)
+	echo sx4-nec-superux${UNAME_RELEASE}
+	exit 0 ;;
+    SX-5:SUPER-UX:*:*)
+	echo sx5-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:*:*)
+	echo `uname -p`-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 ;;
+    NSR-[GKLNPTVW]: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 ;;
+    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 ;;
+    *: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 ;;
+    i*86:XTS-300:*:STOP)
+	echo ${UNAME_MACHINE}-unknown-stop
+	exit 0 ;;
+    i*86:atheos:*:*)
+	echo ${UNAME_MACHINE}-unknown-atheos
+	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 <<EOF
+#ifdef _SEQUENT_
+# include <sys/types.h>
+# include <sys/utsname.h>
+#endif
+main ()
+{
+#if defined (sony)
+#if defined (MIPSEB)
+  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
+     I don't know....  */
+  printf ("mips-sony-bsd\n"); exit (0);
+#else
+#include <sys/param.h>
+  printf ("m68k-sony-newsos%s\n",
+#ifdef NEWSOS4
+          "4"
+#else
+	  ""
+#endif
+         ); exit (0);
+#endif
+#endif
+
+#if defined (__arm) && defined (__acorn) && defined (__unix)
+  printf ("arm-acorn-riscix"); exit (0);
+#endif
+
+#if defined (hp300) && !defined (hpux)
+  printf ("m68k-hp-bsd\n"); exit (0);
+#endif
+
+#if defined (NeXT)
+#if !defined (__ARCHITECTURE__)
+#define __ARCHITECTURE__ "m68k"
+#endif
+  int version;
+  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
+  if (version < 4)
+    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+  else
+    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
+  exit (0);
+#endif
+
+#if defined (MULTIMAX) || defined (n16)
+#if defined (UMAXV)
+  printf ("ns32k-encore-sysv\n"); exit (0);
+#else
+#if defined (CMU)
+  printf ("ns32k-encore-mach\n"); exit (0);
+#else
+  printf ("ns32k-encore-bsd\n"); exit (0);
+#endif
+#endif
+#endif
+
+#if defined (__386BSD__)
+  printf ("i386-pc-bsd\n"); exit (0);
+#endif
+
+#if defined (sequent)
+#if defined (i386)
+  printf ("i386-sequent-dynix\n"); exit (0);
+#endif
+#if defined (ns32000)
+  printf ("ns32k-sequent-dynix\n"); exit (0);
+#endif
+#endif
+
+#if defined (_SEQUENT_)
+    struct utsname un;
+
+    uname(&un);
+
+    if (strncmp(un.version, "V2", 2) == 0) {
+	printf ("i386-sequent-ptx2\n"); exit (0);
+    }
+    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
+	printf ("i386-sequent-ptx1\n"); exit (0);
+    }
+    printf ("i386-sequent-ptx\n"); exit (0);
+
+#endif
+
+#if defined (vax)
+# if !defined (ultrix)
+#  include <sys/param.h>
+#  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)
+  printf ("i860-alliant-bsd\n"); exit (0);
+#endif
+
+  exit (1);
+}
+EOF
+
+$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
+rm -f $dummy.c $dummy
+
+# Apollos put the system type in the environment.
+
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
+
+# Convex versions that predate uname can use getsysinfo(1)
+
+if [ -x /usr/convex/getsysinfo ]
+then
+    case `getsysinfo -f cpu_type` in
+    c1*)
+	echo c1-convex-bsd
+	exit 0 ;;
+    c2*)
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+	exit 0 ;;
+    c34*)
+	echo c34-convex-bsd
+	exit 0 ;;
+    c38*)
+	echo c38-convex-bsd
+	exit 0 ;;
+    c4*)
+	echo c4-convex-bsd
+	exit 0 ;;
+    esac
+fi
+
+cat >&2 <<EOF
+$0: unable to guess system type
+
+This script, last modified $timestamp, has failed to recognize
+the operating system you are using. It is advised that you
+download the most up to date version of the config scripts from
+
+    ftp://ftp.gnu.org/pub/gnu/config/
+
+If the version you run ($0) is already up to date, please
+send the following data and any information you think might be
+pertinent to <config-patches@gnu.org> 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:
--- circlemud-3.1.cvs2003061021.orig/config.sub
+++ circlemud-3.1.cvs2003061021/config.sub
@@ -0,0 +1,1460 @@
+#! /bin/sh
+# Configuration validation subroutine script.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002 Free Software Foundation, Inc.
+
+timestamp='2002-06-21'
+
+# 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.
+#
+# 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
+# (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.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Please send patches to <config-patches@gnu.org>.  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.
+# Otherwise, we print the canonical config type on stdout and succeed.
+
+# This file is supposed to be the same for all GNU packages
+# and recognize all the CPU types, system types and aliases
+# that are meaningful with *any* GNU software.
+# Each package is responsible for reporting which valid configurations
+# it does not support.  The user should be able to distinguish
+# a failure to support a valid configuration from a meaningless
+# configuration.
+
+# The goal of this file is to map all the various variations of a given
+# machine specification into a single specification in the form:
+#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or in some cases, the newer four-part form:
+#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+# It is wrong to echo any other type of specification.
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+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 <config-patches@gnu.org>."
+
+version="\
+GNU config.sub ($timestamp)
+
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+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
+  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*)
+    os=-$maybe_os
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+    ;;
+  *)
+    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+    if [ $basic_machine != $1 ]
+    then os=`echo $1 | sed 's/.*-/-/'`
+    else os=; fi
+    ;;
+esac
+
+### Let's recognize common machines as not being operating systems so
+### that things like config.sub decstation-3100 work.  We also
+### recognize some manufacturers as not being operating systems, so we
+### can provide default operating systems below.
+case $os in
+	-sun*os*)
+		# Prevent following clause from handling this invalid input.
+		;;
+	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
+	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
+	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
+	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+	-apple | -axis)
+		os=
+		basic_machine=$1
+		;;
+	-sim | -cisco | -oki | -wec | -winbond)
+		os=
+		basic_machine=$1
+		;;
+	-scout)
+		;;
+	-wrs)
+		os=-vxworks
+		basic_machine=$1
+		;;
+	-chorusos*)
+		os=-chorusos
+		basic_machine=$1
+		;;
+ 	-chorusrdb)
+ 		os=-chorusrdb
+		basic_machine=$1
+ 		;;
+	-hiux*)
+		os=-hiuxwe2
+		;;
+	-sco5)
+		os=-sco3.2v5
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco4)
+		os=-sco3.2v4
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2.[4-9]*)
+		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2v[4-9]*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco*)
+		os=-sco3.2v2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-udk*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-isc)
+		os=-isc2.2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-clix*)
+		basic_machine=clipper-intergraph
+		;;
+	-isc*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-lynx*)
+		os=-lynxos
+		;;
+	-ptx*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
+		;;
+	-windowsnt*)
+		os=`echo $os | sed -e 's/windowsnt/winnt/'`
+		;;
+	-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.
+	1750a | 580 \
+	| a29k \
+	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+	| c4x | clipper \
+	| d10v | d30v | dlx | dsp16xx \
+	| fr30 | frv \
+	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+	| i370 | i860 | i960 | ia64 \
+	| ip2k \
+	| m32r | m68000 | m68k | m88k | mcore \
+	| mips | mipsbe | mipseb | mipsel | mipsle \
+	| mips16 \
+	| mips64 | mips64el \
+	| mips64orion | mips64orionel \
+	| mips64vr4100 | mips64vr4100el \
+	| mips64vr4300 | mips64vr4300el \
+	| mips64vr5000 | mips64vr5000el \
+	| mipsisa32 | mipsisa32el \
+	| mipsisa64 | mipsisa64el \
+	| mipsisa64sb1 | mipsisa64sb1el \
+	| mipstx39 | mipstx39el \
+	| mn10200 | mn10300 \
+	| ns16k | ns32k \
+	| openrisc | or32 \
+	| pdp10 | pdp11 | pj | pjl \
+	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+	| pyramid \
+	| sh | sh[1234] | sh3e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+	| sh64 | sh64le \
+	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
+	| strongarm \
+	| tahoe | thumb | tic80 | tron \
+	| v850 | v850e \
+	| we32k \
+	| x86 | xscale | 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 | 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*86 | x86_64)
+	  basic_machine=$basic_machine-pc
+	  ;;
+	# Object if more than one company name word.
+	*-*-*)
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		exit 1
+		;;
+	# Recognize the basic CPU types with company name.
+	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-* \
+	| bs2000-* \
+	| c[123]* | c30-* | [cjt]90-* | c54x-* \
+	| clipper-* | 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-* \
+	| m32r-* \
+	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+	| m88110-* | m88k-* | mcore-* \
+	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+	| mips16-* \
+	| mips64-* | mips64el-* \
+	| mips64orion-* | mips64orionel-* \
+	| mips64vr4100-* | mips64vr4100el-* \
+	| mips64vr4300-* | mips64vr4300el-* \
+	| mips64vr5000-* | mips64vr5000el-* \
+	| mipsisa32-* | mipsisa32el-* \
+	| mipsisa64-* | mipsisa64el-* \
+	| mipsisa64sb1-* | mipsisa64sb1el-* \
+	| mipstx39 | mipstx39el \
+	| none-* | np1-* | ns16k-* | ns32k-* \
+	| orion-* \
+	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+	| pyramid-* \
+	| romp-* | rs6000-* \
+	| sh-* | sh[1234]-* | sh3e-* | sh[34]eb-* | shbe-* \
+	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
+	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+	| tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
+	| v850-* | v850e-* | vax-* \
+	| we32k-* \
+	| x86-* | x86_64-* | xps100-* | xscale-* | 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.
+	386bsd)
+		basic_machine=i386-unknown
+		os=-bsd
+		;;
+	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+		basic_machine=m68000-att
+		;;
+	3b*)
+		basic_machine=we32k-att
+		;;
+	a29khif)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	adobe68k)
+		basic_machine=m68010-adobe
+		os=-scout
+		;;
+	alliant | fx80)
+		basic_machine=fx80-alliant
+		;;
+	altos | altos3068)
+		basic_machine=m68k-altos
+		;;
+	am29k)
+		basic_machine=a29k-none
+		os=-bsd
+		;;
+	amdahl)
+		basic_machine=580-amdahl
+		os=-sysv
+		;;
+	amiga | amiga-*)
+		basic_machine=m68k-unknown
+		;;
+	amigaos | amigados)
+		basic_machine=m68k-unknown
+		os=-amigaos
+		;;
+	amigaunix | amix)
+		basic_machine=m68k-unknown
+		os=-sysv4
+		;;
+	apollo68)
+		basic_machine=m68k-apollo
+		os=-sysv
+		;;
+	apollo68bsd)
+		basic_machine=m68k-apollo
+		os=-bsd
+		;;
+	aux)
+		basic_machine=m68k-apple
+		os=-aux
+		;;
+	balance)
+		basic_machine=ns32k-sequent
+		os=-dynix
+		;;
+	c90)
+		basic_machine=c90-cray
+		os=-unicos
+		;;
+	convex-c1)
+		basic_machine=c1-convex
+		os=-bsd
+		;;
+	convex-c2)
+		basic_machine=c2-convex
+		os=-bsd
+		;;
+	convex-c32)
+		basic_machine=c32-convex
+		os=-bsd
+		;;
+	convex-c34)
+		basic_machine=c34-convex
+		os=-bsd
+		;;
+	convex-c38)
+		basic_machine=c38-convex
+		os=-bsd
+		;;
+	cray | j90)
+		basic_machine=j90-cray
+		os=-unicos
+		;;
+	crds | unos)
+		basic_machine=m68k-crds
+		;;
+	cris | cris-* | etrax*)
+		basic_machine=cris-axis
+		;;
+	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
+		;;
+	delta88)
+		basic_machine=m88k-motorola
+		os=-sysv3
+		;;
+	dpx20 | dpx20-*)
+		basic_machine=rs6000-bull
+		os=-bosx
+		;;
+	dpx2* | dpx2*-bull)
+		basic_machine=m68k-bull
+		os=-sysv3
+		;;
+	ebmon29k)
+		basic_machine=a29k-amd
+		os=-ebmon
+		;;
+	elxsi)
+		basic_machine=elxsi-elxsi
+		os=-bsd
+		;;
+	encore | umax | mmax)
+		basic_machine=ns32k-encore
+		;;
+	es1800 | OSE68k | ose68k | ose | OSE)
+		basic_machine=m68k-ericsson
+		os=-ose
+		;;
+	fx2800)
+		basic_machine=i860-alliant
+		;;
+	genix)
+		basic_machine=ns32k-ns
+		;;
+	gmicro)
+		basic_machine=tron-gmicro
+		os=-sysv
+		;;
+	go32)
+		basic_machine=i386-pc
+		os=-go32
+		;;
+	h3050r* | hiux*)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	h8300hms)
+		basic_machine=h8300-hitachi
+		os=-hms
+		;;
+	h8300xray)
+		basic_machine=h8300-hitachi
+		os=-xray
+		;;
+	h8500hms)
+		basic_machine=h8500-hitachi
+		os=-hms
+		;;
+	harris)
+		basic_machine=m88k-harris
+		os=-sysv3
+		;;
+	hp300-*)
+		basic_machine=m68k-hp
+		;;
+	hp300bsd)
+		basic_machine=m68k-hp
+		os=-bsd
+		;;
+	hp300hpux)
+		basic_machine=m68k-hp
+		os=-hpux
+		;;
+	hp3k9[0-9][0-9] | hp9[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hp9k2[0-9][0-9] | hp9k31[0-9])
+		basic_machine=m68000-hp
+		;;
+	hp9k3[2-9][0-9])
+		basic_machine=m68k-hp
+		;;
+	hp9k6[0-9][0-9] | hp6[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hp9k7[0-79][0-9] | hp7[0-79][0-9])
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k78[0-9] | hp78[0-9])
+		# FIXME: really hppa2.0-hp
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
+		# FIXME: really hppa2.0-hp
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[0-9][13679] | hp8[0-9][13679])
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[0-9][0-9] | hp8[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hppa-next)
+		os=-nextstep3
+		;;
+	hppaosf)
+		basic_machine=hppa1.1-hp
+		os=-osf
+		;;
+	hppro)
+		basic_machine=hppa1.1-hp
+		os=-proelf
+		;;
+	i370-ibm* | ibm*)
+		basic_machine=i370-ibm
+		;;
+# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
+	i*86v32)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv32
+		;;
+	i*86v4*)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv4
+		;;
+	i*86v)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv
+		;;
+	i*86sol2)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-solaris2
+		;;
+	i386mach)
+		basic_machine=i386-mach
+		os=-mach
+		;;
+	i386-vsta | vsta)
+		basic_machine=i386-unknown
+		os=-vsta
+		;;
+	iris | iris4d)
+		basic_machine=mips-sgi
+		case $os in
+		    -irix*)
+			;;
+		    *)
+			os=-irix4
+			;;
+		esac
+		;;
+	isi68 | isi)
+		basic_machine=m68k-isi
+		os=-sysv
+		;;
+	m88k-omron*)
+		basic_machine=m88k-omron
+		;;
+	magnum | m3230)
+		basic_machine=mips-mips
+		os=-sysv
+		;;
+	merlin)
+		basic_machine=ns32k-utek
+		os=-sysv
+		;;
+	mingw32)
+		basic_machine=i386-pc
+		os=-mingw32
+		;;
+	miniframe)
+		basic_machine=m68000-convergent
+		;;
+	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
+		basic_machine=m68k-atari
+		os=-mint
+		;;
+	mips3*-*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+		;;
+	mips3*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+		;;
+	mmix*)
+		basic_machine=mmix-knuth
+		os=-mmixware
+		;;
+	monitor)
+		basic_machine=m68k-rom68k
+		os=-coff
+		;;
+	morphos)
+		basic_machine=powerpc-unknown
+		os=-morphos
+		;;
+	msdos)
+		basic_machine=i386-pc
+		os=-msdos
+		;;
+	mvs)
+		basic_machine=i370-ibm
+		os=-mvs
+		;;
+	ncr3000)
+		basic_machine=i486-ncr
+		os=-sysv4
+		;;
+	netbsd386)
+		basic_machine=i386-unknown
+		os=-netbsd
+		;;
+	netwinder)
+		basic_machine=armv4l-rebel
+		os=-linux
+		;;
+	news | news700 | news800 | news900)
+		basic_machine=m68k-sony
+		os=-newsos
+		;;
+	news1000)
+		basic_machine=m68030-sony
+		os=-newsos
+		;;
+	news-3600 | risc-news)
+		basic_machine=mips-sony
+		os=-newsos
+		;;
+	necv70)
+		basic_machine=v70-nec
+		os=-sysv
+		;;
+	next | m*-next )
+		basic_machine=m68k-next
+		case $os in
+		    -nextstep* )
+			;;
+		    -ns2*)
+		      os=-nextstep2
+			;;
+		    *)
+		      os=-nextstep3
+			;;
+		esac
+		;;
+	nh3000)
+		basic_machine=m68k-harris
+		os=-cxux
+		;;
+	nh[45]000)
+		basic_machine=m88k-harris
+		os=-cxux
+		;;
+	nindy960)
+		basic_machine=i960-intel
+		os=-nindy
+		;;
+	mon960)
+		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
+		;;
+	OSE68000 | ose68000)
+		basic_machine=m68000-ericsson
+		os=-ose
+		;;
+	os68k)
+		basic_machine=m68k-none
+		os=-os68k
+		;;
+	pa-hitachi)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	paragon)
+		basic_machine=i860-intel
+		os=-osf
+		;;
+	pbd)
+		basic_machine=sparc-tti
+		;;
+	pbb)
+		basic_machine=m68k-tti
+		;;
+        pc532 | pc532-*)
+		basic_machine=ns32k-pc532
+		;;
+	pentium | p5 | k5 | k6 | nexgen | viac3)
+		basic_machine=i586-pc
+		;;
+	pentiumpro | p6 | 6x86 | athlon)
+		basic_machine=i686-pc
+		;;
+	pentiumii | pentium2)
+		basic_machine=i686-pc
+		;;
+	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentiumpro-* | p6-* | 6x86-* | athlon-*)
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentiumii-* | pentium2-*)
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pn)
+		basic_machine=pn-gould
+		;;
+	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
+		;;
+	rm[46]00)
+		basic_machine=mips-siemens
+		;;
+	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
+		;;
+	sequent)
+		basic_machine=i386-sequent
+		;;
+	sh)
+		basic_machine=sh-hitachi
+		os=-hms
+		;;
+	sparclite-wrs | simso-wrs)
+		basic_machine=sparclite-wrs
+		os=-vxworks
+		;;
+	sps7)
+		basic_machine=m68k-bull
+		os=-sysv2
+		;;
+	spur)
+		basic_machine=spur-unknown
+		;;
+	st2000)
+		basic_machine=m68k-tandem
+		;;
+	stratus)
+		basic_machine=i860-stratus
+		os=-sysv4
+		;;
+	sun2)
+		basic_machine=m68000-sun
+		;;
+	sun2os3)
+		basic_machine=m68000-sun
+		os=-sunos3
+		;;
+	sun2os4)
+		basic_machine=m68000-sun
+		os=-sunos4
+		;;
+	sun3os3)
+		basic_machine=m68k-sun
+		os=-sunos3
+		;;
+	sun3os4)
+		basic_machine=m68k-sun
+		os=-sunos4
+		;;
+	sun4os3)
+		basic_machine=sparc-sun
+		os=-sunos3
+		;;
+	sun4os4)
+		basic_machine=sparc-sun
+		os=-sunos4
+		;;
+	sun4sol2)
+		basic_machine=sparc-sun
+		os=-solaris2
+		;;
+	sun3 | sun3-*)
+		basic_machine=m68k-sun
+		;;
+	sun4)
+		basic_machine=sparc-sun
+		;;
+	sun386 | sun386i | roadrunner)
+		basic_machine=i386-sun
+		;;
+        sv1)
+		basic_machine=sv1-cray
+		os=-unicos
+		;;
+	symmetry)
+		basic_machine=i386-sequent
+		os=-dynix
+		;;
+	t3d)
+		basic_machine=alpha-cray
+		os=-unicos
+		;;
+	t3e)
+		basic_machine=alphaev5-cray
+		os=-unicos
+		;;
+	t90)
+		basic_machine=t90-cray
+		os=-unicos
+		;;
+	tic54x | c54x*)
+		basic_machine=tic54x-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
+		;;
+	udi29k)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	ultra3)
+		basic_machine=a29k-nyu
+		os=-sym1
+		;;
+	v810 | necv810)
+		basic_machine=v810-nec
+		os=-none
+		;;
+	vaxv)
+		basic_machine=vax-dec
+		os=-sysv
+		;;
+	vms)
+		basic_machine=vax-dec
+		os=-vms
+		;;
+	vpp*|vx|vx-*)
+               basic_machine=f301-fujitsu
+               ;;
+	vxworks960)
+		basic_machine=i960-wrs
+		os=-vxworks
+		;;
+	vxworks68)
+		basic_machine=m68k-wrs
+		os=-vxworks
+		;;
+	vxworks29k)
+		basic_machine=a29k-wrs
+		os=-vxworks
+		;;
+	w65*)
+		basic_machine=w65-wdc
+		os=-none
+		;;
+	w89k-*)
+		basic_machine=hppa1.1-winbond
+		os=-proelf
+		;;
+	windows32)
+		basic_machine=i386-pc
+		os=-windows32-msvcrt
+		;;
+        xps | xps100)
+		basic_machine=xps100-honeywell
+		;;
+	ymp)
+		basic_machine=ymp-cray
+		os=-unicos
+		;;
+	z8k-*-coff)
+		basic_machine=z8k-unknown
+		os=-sim
+		;;
+	none)
+		basic_machine=none-none
+		os=-none
+		;;
+
+# Here we handle the default manufacturer of certain CPU types.  It is in
+# some cases the only manufacturer, in others, it is the most popular.
+	w89k)
+		basic_machine=hppa1.1-winbond
+		;;
+	op50n)
+		basic_machine=hppa1.1-oki
+		;;
+	op60c)
+		basic_machine=hppa1.1-oki
+		;;
+	romp)
+		basic_machine=romp-ibm
+		;;
+	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
+		;;
+	sh3 | sh4 | sh3eb | sh4eb | sh[1234]le | sh3ele)
+		basic_machine=sh-unknown
+		;;
+	sh64)
+		basic_machine=sh64-unknown
+		;;
+	sparc | sparcv9 | sparcv9b)
+		basic_machine=sparc-sun
+		;;
+        cydra)
+		basic_machine=cydra-cydrome
+		;;
+	orion)
+		basic_machine=orion-highlevel
+		;;
+	orion105)
+		basic_machine=clipper-highlevel
+		;;
+	mac | mpw | mac-mpw)
+		basic_machine=m68k-apple
+		;;
+	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
+		exit 1
+		;;
+esac
+
+# Here we canonicalize certain aliases for manufacturers.
+case $basic_machine in
+	*-digital*)
+		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
+		;;
+	*-commodore*)
+		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
+		;;
+	*)
+		;;
+esac
+
+# Decode manufacturer-specific aliases for certain operating systems.
+
+if [ x"$os" != x"" ]
+then
+case $os in
+        # First match some system type aliases
+        # that might get confused with valid system types.
+	# -solaris* is a basic system type, with this one exception.
+	-solaris1 | -solaris1.*)
+		os=`echo $os | sed -e 's|solaris1|sunos4|'`
+		;;
+	-solaris)
+		os=-solaris2
+		;;
+	-svr4*)
+		os=-sysv4
+		;;
+	-unixware*)
+		os=-sysv4.2uw
+		;;
+	-gnu/linux*)
+		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
+		;;
+	# First accept the basic system types.
+	# The portable systems comes first.
+	# Each alternative MUST END IN A *, to match a version number.
+	# -sysv* is not here because it comes later, after sysvr4.
+	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+	      | -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* \
+	      | -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* | -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*)
+	# Remember, each alternative MUST END IN *, to match a version number.
+		;;
+	-qnx*)
+		case $basic_machine in
+		    x86-* | i*86-*)
+			;;
+		    *)
+			os=-nto$os
+			;;
+		esac
+		;;
+	-nto*)
+		os=-nto-qnx
+		;;
+	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
+	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
+		;;
+	-mac*)
+		os=`echo $os | sed -e 's|mac|macos|'`
+		;;
+	-linux*)
+		os=`echo $os | sed -e 's|linux|linux-gnu|'`
+		;;
+	-sunos5*)
+		os=`echo $os | sed -e 's|sunos5|solaris2|'`
+		;;
+	-sunos6*)
+		os=`echo $os | sed -e 's|sunos6|solaris3|'`
+		;;
+	-opened*)
+		os=-openedition
+		;;
+	-wince*)
+		os=-wince
+		;;
+	-osfrose*)
+		os=-osfrose
+		;;
+	-osf*)
+		os=-osf
+		;;
+	-utek*)
+		os=-bsd
+		;;
+	-dynix*)
+		os=-bsd
+		;;
+	-acis*)
+		os=-aos
+		;;
+	-atheos*)
+		os=-atheos
+		;;
+	-386bsd)
+		os=-bsd
+		;;
+	-ctix* | -uts*)
+		os=-sysv
+		;;
+	-nova*)
+		os=-rtmk-nova
+		;;
+	-ns2 )
+	        os=-nextstep2
+		;;
+	-nsk*)
+		os=-nsk
+		;;
+	# Preserve the version number of sinix5.
+	-sinix5.*)
+		os=`echo $os | sed -e 's|sinix|sysv|'`
+		;;
+	-sinix*)
+		os=-sysv4
+		;;
+	-triton*)
+		os=-sysv3
+		;;
+	-oss*)
+		os=-sysv3
+		;;
+	-svr4)
+		os=-sysv4
+		;;
+	-svr3)
+		os=-sysv3
+		;;
+	-sysvr4)
+		os=-sysv4
+		;;
+	# This must come after -sysvr4.
+	-sysv*)
+		;;
+	-ose*)
+		os=-ose
+		;;
+	-es1800*)
+		os=-ose
+		;;
+	-xenix)
+		os=-xenix
+		;;
+        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+	        os=-mint
+		;;
+	-none)
+		;;
+	*)
+		# Get rid of the `-' at the beginning of $os.
+		os=`echo $os | sed 's/[^-]*-//'`
+		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
+		exit 1
+		;;
+esac
+else
+
+# Here we handle the default operating systems that come with various machines.
+# The value should be what the vendor currently ships out the door with their
+# machine or put another way, the most popular os provided with the machine.
+
+# Note that if you're going to try to match "-MANUFACTURER" here (say,
+# "-sun"), then you have to tell the case statement up towards the top
+# that MANUFACTURER isn't an operating system.  Otherwise, code above
+# will signal an error saying that MANUFACTURER isn't an operating
+# system, and we'll never get to this point.
+
+case $basic_machine in
+	*-acorn)
+		os=-riscix1.2
+		;;
+	arm*-rebel)
+		os=-linux
+		;;
+	arm*-semi)
+		os=-aout
+		;;
+	# This must come before the *-dec entry.
+	pdp10-*)
+		os=-tops20
+		;;
+        pdp11-*)
+		os=-none
+		;;
+	*-dec | vax-*)
+		os=-ultrix4.2
+		;;
+	m68*-apollo)
+		os=-domain
+		;;
+	i386-sun)
+		os=-sunos4.0.2
+		;;
+	m68000-sun)
+		os=-sunos3
+		# This also exists in the configure program, but was not the
+		# default.
+		# os=-sunos4
+		;;
+	m68*-cisco)
+		os=-aout
+		;;
+	mips*-cisco)
+		os=-elf
+		;;
+	mips*-*)
+		os=-elf
+		;;
+	or32-*)
+		os=-coff
+		;;
+	*-tti)	# must be before sparc entry or we get the wrong os.
+		os=-sysv3
+		;;
+	sparc-* | *-sun)
+		os=-sunos4.1.1
+		;;
+	*-be)
+		os=-beos
+		;;
+	*-ibm)
+		os=-aix
+		;;
+	*-wec)
+		os=-proelf
+		;;
+	*-winbond)
+		os=-proelf
+		;;
+	*-oki)
+		os=-proelf
+		;;
+	*-hp)
+		os=-hpux
+		;;
+	*-hitachi)
+		os=-hiux
+		;;
+	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
+		os=-sysv
+		;;
+	*-cbm)
+		os=-amigaos
+		;;
+	*-dg)
+		os=-dgux
+		;;
+	*-dolphin)
+		os=-sysv3
+		;;
+	m68k-ccur)
+		os=-rtu
+		;;
+	m88k-omron*)
+		os=-luna
+		;;
+	*-next )
+		os=-nextstep
+		;;
+	*-sequent)
+		os=-ptx
+		;;
+	*-crds)
+		os=-unos
+		;;
+	*-ns)
+		os=-genix
+		;;
+	i370-*)
+		os=-mvs
+		;;
+	*-next)
+		os=-nextstep3
+		;;
+        *-gould)
+		os=-sysv
+		;;
+        *-highlevel)
+		os=-bsd
+		;;
+	*-encore)
+		os=-bsd
+		;;
+        *-sgi)
+		os=-irix
+		;;
+        *-siemens)
+		os=-sysv4
+		;;
+	*-masscomp)
+		os=-rtu
+		;;
+	f30[01]-fujitsu | f700-fujitsu)
+		os=-uxpv
+		;;
+	*-rom68k)
+		os=-coff
+		;;
+	*-*bug)
+		os=-coff
+		;;
+	*-apple)
+		os=-macos
+		;;
+	*-atari*)
+		os=-mint
+		;;
+	*)
+		os=-none
+		;;
+esac
+fi
+
+# Here we handle the case where we know the os, and the CPU type, but not the
+# manufacturer.  We pick the logical manufacturer.
+vendor=unknown
+case $basic_machine in
+	*-unknown)
+		case $os in
+			-riscix*)
+				vendor=acorn
+				;;
+			-sunos*)
+				vendor=sun
+				;;
+			-aix*)
+				vendor=ibm
+				;;
+			-beos*)
+				vendor=be
+				;;
+			-hpux*)
+				vendor=hp
+				;;
+			-mpeix*)
+				vendor=hp
+				;;
+			-hiux*)
+				vendor=hitachi
+				;;
+			-unos*)
+				vendor=crds
+				;;
+			-dgux*)
+				vendor=dg
+				;;
+			-luna*)
+				vendor=omron
+				;;
+			-genix*)
+				vendor=ns
+				;;
+			-mvs* | -opened*)
+				vendor=ibm
+				;;
+			-ptx*)
+				vendor=sequent
+				;;
+			-vxsim* | -vxworks* | -windiss*)
+				vendor=wrs
+				;;
+			-aux*)
+				vendor=apple
+				;;
+			-hms*)
+				vendor=hitachi
+				;;
+			-mpw* | -macos*)
+				vendor=apple
+				;;
+			-*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:
--- circlemud-3.1.cvs2003061021.orig/debian/README.Debian
+++ circlemud-3.1.cvs2003061021/debian/README.Debian
@@ -0,0 +1,12 @@
+CircleMUD for Debian
+--------------------
+
+  * Installed files to necessary locations to meet Debian Policy.
+  * Renamed executables to have less generic names.
+  * Obsoleted autorun with process forking and extra signal handling.
+  * Added a pidfile creation routine to comm.c and a SysVinit script.
+  * Log to the server's syslog in addition to stderr or file.
+  * Moved licheck routine to installation rather than compilation.
+  * Configure implementor account with newpfile during installation.
+
+ -- The Fungi <fungi@yuggoth.org>, Sun,  8 Jun 2003 18:40:12 +0000
--- circlemud-3.1.cvs2003061021.orig/debian/changelog
+++ circlemud-3.1.cvs2003061021/debian/changelog
@@ -0,0 +1,162 @@
+circlemud (3.1.cvs2003061021-1) unstable; urgency=low
+
+  * New upstream release
+  * Created a newpfile util which addresses the expect dependency
+  * Now the daemon forks a child it can reboot without autorun
+  * Clean shutdown on SIGTERM and reboot on SIGHUP
+
+ -- The Fungi <fungi@yuggoth.org>  Thu, 12 Jun 2003 00:38:17 +0000
+
+circlemud (3.1.cvs2002112709-3) unstable; urgency=low
+
+  * Made debian/rules clean be more thorough
+  * Fixed a NULL return bug in circlemud.config's port detection
+
+ -- The Fungi <fungi@yuggoth.org>  Fri, 30 May 2003 01:00:48 +0000
+
+circlemud (3.1.cvs2002112709-2) unstable; urgency=low
+
+  * Split shadowrealm off to be its own separate project
+  * Daemon now logs to syslog (daemon.info)
+
+ -- The Fungi <fungi@yuggoth.org>  Sun, 19 Jan 2003 22:24:27 +0000
+
+circlemud (3.1.cvs2002112709-1) unstable; urgency=low
+
+  * New upstream release
+  * ShadowRealm 0.97
+
+ -- The Fungi <fungi@yuggoth.org>  Sun,  5 Jan 2003 23:41:14 +0000
+
+circlemud (3.1.cvs2002111820-2) unstable; urgency=low
+
+  * ShadowRealm 0.96
+  * Removed micromini (rolled into shadowrealm patch)
+
+ -- The Fungi <fungi@yuggoth.org>  Fri, 27 Dec 2002 06:45:16 +0000
+
+circlemud (3.1.cvs2002111820-1) unstable; urgency=low
+
+  * New upstream release
+  * ShadowRealm 0.95
+  * Split shadowrealm package file names and locations
+  * Add a separate shadowrealm-world package
+
+ -- The Fungi <fungi@yuggoth.org>  Fri, 22 Nov 2002 04:37:53 +0000
+
+circlemud (3.0.cvs2002102121-2) unstable; urgency=low
+
+  * DGScripts 0.99pl9
+  * ShadowRealm 0.94
+
+ -- The Fungi <fungi@yuggoth.org>  Wed, 30 Oct 2002 03:25:17 +0000
+
+circlemud (3.0.cvs2002102121-1) unstable; urgency=low
+
+  * New upstream release
+  * ShadowRealm 0.93
+
+ -- The Fungi <fungi@yuggoth.org>  Thu, 24 Oct 2002 02:33:44 +0000
+
+circlemud (3.0.cvs2002100407-3) unstable; urgency=low
+
+  * ShadowRealm 0.92
+
+ -- The Fungi <fungi@yuggoth.org>  Sun,  13 Oct 2002 21:33:45 +0000
+
+circlemud (3.0.cvs2002100407-2) unstable; urgency=low
+
+  * ShadowRealm 0.91
+  * Minor docfile cleanup and reorganization
+  * Substantial rewrite of debian/rules
+
+ -- The Fungi <fungi@yuggoth.org>  Sat,  12 Oct 2002 21:49:29 +0000
+
+circlemud (3.0.cvs2002100407-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- The Fungi <fungi@yuggoth.org>  Mon, 07 Oct 2002 01:44:18 +0000
+
+circlemud (3.0.cvs2002062809-8) unstable; urgency=low
+
+  * ShadowRealm 0.90
+  * Renamed circlemud-patched packages to shadowrealm
+
+ -- The Fungi <fungi@yuggoth.org>  Sun, 06 Oct 2002 22:43:11 +0000
+
+circlemud (3.0.cvs2002062809-7) unstable; urgency=low
+
+  * Fixed output from shopping_sell() in shop.c.
+  * Fixed sprintbit() to return int in utils.c and utils.h.
+  * Upgraded DG Scripts to 0.99pl8 in circlemud-patched.
+  * Added ShadowRealm Player Races 1.0 to circlemud-patched.
+
+ -- The Fungi <fungi@yuggoth.org>  Thu, 22 Aug 2002 03:08:16 +0000
+
+circlemud (3.0.cvs2002062809-6) unstable; urgency=low
+
+  * Fixed failure to apply GET_OBJ_PERM() correctly in genobj.c.
+  * Fixed output order creating initial imp account in circlemud-patched.init.
+
+ -- The Fungi <fungi@yuggoth.org>  Tue, 09 Jul 2002 01:29:27 +0000
+
+circlemud (3.0.cvs2002062809-5) unstable; urgency=low
+
+  * Changed >= 0 to != NOBODY in list_detailed_shop().
+  * Removed "CircleMUD" from the hard-coded welcome message and login menus.
+  * Updated DG Scripts to official 0.99pl7 for CircleMUD 3.0bpl21.
+
+ -- The Fungi <fungi@yuggoth.org>  Tue, 09 Jul 2002 01:29:27 +0000
+
+circlemud (3.0.cvs2002062809-4) unstable; urgency=low
+
+  * Fixed missing GET_ROOM_VNUM() in ACMD(do_quit) for circlemud-patched.
+  * Players load wearing their equipment in circlemud-patched.
+  * Move old binary player files if upgrading to circlemud-patched.
+  * Remove dependency on expect for circlemud-patched.
+
+ -- The Fungi <fungi@yuggoth.org>  Sun, 07 Jul 2002 00:06:12 +0000
+
+circlemud (3.0.cvs2002062809-3) unstable; urgency=low
+
+  * Added ASCII PFiles 2.1 to circlemud-patched.
+  * Added camping (return where you quit) to circlemud-patched.
+  * Enabled player killing in circlemud-patched.
+  * Enabled player thieving in circlemud-patched.
+  * The load command puts objects into inventory for circlemud-patched.
+
+ -- The Fungi <fungi@yuggoth.org>  Sat, 06 Jul 2002 02:01:43 +0000
+
+circlemud (3.0.cvs2002062809-2) unstable; urgency=low
+
+  * Reduced minimal world to a single zone (0).
+
+ -- The Fungi <fungi@yuggoth.org>  Tue, 02 Jul 2002 02:35:17 +0000
+
+circlemud (3.0.cvs2002062809-1) unstable; urgency=low
+
+  * New upstream release
+  * Added DG Scripts 0.99pl7 to circlemud-patched.
+
+ -- The Fungi <fungi@yuggoth.org>  Sat, 29 Jun 2002 00:21:28 +0000
+
+circlemud (3.0.cvs2002062116-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- The Fungi <fungi@yuggoth.org>  Sun, 23 Jun 2002 15:10:13 +0000
+
+circlemud (3.0.cvs2002050120-2) unstable; urgency=low
+
+  * Add a circlemud-patched package with OasisOLC 2.0.1, saveall and
+    improved-editor.
+
+ -- The Fungi <fungi@yuggoth.org>  Sun, 16 Jun 2002 17:55:50 +0000
+
+circlemud (3.0.cvs2002050120-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- The Fungi <fungi@yuggoth.org>  Fri, 14 Jun 2002 21:48:27 +0000
+
--- circlemud-3.1.cvs2003061021.orig/debian/circlemud-doc.docs
+++ circlemud-3.1.cvs2003061021/debian/circlemud-doc.docs
@@ -0,0 +1,12 @@
+FAQ
+autorun
+autorun.README
+release_notes.3.1.txt
+doc/Changelog-3.0
+doc/README.UNIX
+doc/old.tar.gz
+doc/pdf.tar.gz
+doc/syserr.txt
+doc/tex.tar.gz
+doc/wizhelp.txt
+lib/README.lib
--- circlemud-3.1.cvs2003061021.orig/debian/circlemud-newpfile.6
+++ circlemud-3.1.cvs2003061021/debian/circlemud-newpfile.6
@@ -0,0 +1,19 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.TH CIRCLEMUD\-NEWPFILE 6 "April 30, 2002"
+.SH NAME
+circlemud\-newpfile \- generate initial playerfile for CircleMUD
+.SH SYNOPSIS
+.B circlemud
+.RI playerfile
+.RI implementor\-name
+.RI initial\-password
+.SH DESCRIPTION
+This utility generates a fresh CircleMUD player file with just an implementor
+account. The complete path to the player file must be given as the first
+argument. The implementor account will be created with the name and password
+provided in the second and third arguments. The player name cannot contain any
+white space and will be truncated to 40 characters in length. For safety, this
+program will not overwrite an existing file.
+.SH AUTHOR
+This manual page was written by The Fungi <fungi@yuggoth.org>,
+for the Debian GNU/Linux system (but may be used by others).
--- circlemud-3.1.cvs2003061021.orig/debian/circlemud-world.conffiles
+++ circlemud-3.1.cvs2003061021/debian/circlemud-world.conffiles
@@ -0,0 +1,116 @@
+/var/lib/circlemud/world/mob/120.mob
+/var/lib/circlemud/world/mob/15.mob
+/var/lib/circlemud/world/mob/150.mob
+/var/lib/circlemud/world/mob/186.mob
+/var/lib/circlemud/world/mob/25.mob
+/var/lib/circlemud/world/mob/31.mob
+/var/lib/circlemud/world/mob/33.mob
+/var/lib/circlemud/world/mob/35.mob
+/var/lib/circlemud/world/mob/36.mob
+/var/lib/circlemud/world/mob/40.mob
+/var/lib/circlemud/world/mob/50.mob
+/var/lib/circlemud/world/mob/51.mob
+/var/lib/circlemud/world/mob/52.mob
+/var/lib/circlemud/world/mob/53.mob
+/var/lib/circlemud/world/mob/54.mob
+/var/lib/circlemud/world/mob/60.mob
+/var/lib/circlemud/world/mob/61.mob
+/var/lib/circlemud/world/mob/62.mob
+/var/lib/circlemud/world/mob/63.mob
+/var/lib/circlemud/world/mob/64.mob
+/var/lib/circlemud/world/mob/65.mob
+/var/lib/circlemud/world/mob/70.mob
+/var/lib/circlemud/world/mob/72.mob
+/var/lib/circlemud/world/mob/79.mob
+/var/lib/circlemud/world/mob/9.mob
+/var/lib/circlemud/world/mob/index
+/var/lib/circlemud/world/obj/120.obj
+/var/lib/circlemud/world/obj/15.obj
+/var/lib/circlemud/world/obj/150.obj
+/var/lib/circlemud/world/obj/186.obj
+/var/lib/circlemud/world/obj/25.obj
+/var/lib/circlemud/world/obj/31.obj
+/var/lib/circlemud/world/obj/33.obj
+/var/lib/circlemud/world/obj/35.obj
+/var/lib/circlemud/world/obj/36.obj
+/var/lib/circlemud/world/obj/40.obj
+/var/lib/circlemud/world/obj/50.obj
+/var/lib/circlemud/world/obj/51.obj
+/var/lib/circlemud/world/obj/52.obj
+/var/lib/circlemud/world/obj/53.obj
+/var/lib/circlemud/world/obj/54.obj
+/var/lib/circlemud/world/obj/60.obj
+/var/lib/circlemud/world/obj/61.obj
+/var/lib/circlemud/world/obj/62.obj
+/var/lib/circlemud/world/obj/63.obj
+/var/lib/circlemud/world/obj/64.obj
+/var/lib/circlemud/world/obj/65.obj
+/var/lib/circlemud/world/obj/71.obj
+/var/lib/circlemud/world/obj/72.obj
+/var/lib/circlemud/world/obj/79.obj
+/var/lib/circlemud/world/obj/9.obj
+/var/lib/circlemud/world/obj/index
+/var/lib/circlemud/world/shp/120.shp
+/var/lib/circlemud/world/shp/150.shp
+/var/lib/circlemud/world/shp/25.shp
+/var/lib/circlemud/world/shp/31.shp
+/var/lib/circlemud/world/shp/33.shp
+/var/lib/circlemud/world/shp/54.shp
+/var/lib/circlemud/world/shp/65.shp
+/var/lib/circlemud/world/shp/index
+/var/lib/circlemud/world/wld/120.wld
+/var/lib/circlemud/world/wld/15.wld
+/var/lib/circlemud/world/wld/150.wld
+/var/lib/circlemud/world/wld/186.wld
+/var/lib/circlemud/world/wld/25.wld
+/var/lib/circlemud/world/wld/31.wld
+/var/lib/circlemud/world/wld/33.wld
+/var/lib/circlemud/world/wld/35.wld
+/var/lib/circlemud/world/wld/36.wld
+/var/lib/circlemud/world/wld/40.wld
+/var/lib/circlemud/world/wld/50.wld
+/var/lib/circlemud/world/wld/51.wld
+/var/lib/circlemud/world/wld/52.wld
+/var/lib/circlemud/world/wld/53.wld
+/var/lib/circlemud/world/wld/54.wld
+/var/lib/circlemud/world/wld/60.wld
+/var/lib/circlemud/world/wld/61.wld
+/var/lib/circlemud/world/wld/62.wld
+/var/lib/circlemud/world/wld/63.wld
+/var/lib/circlemud/world/wld/64.wld
+/var/lib/circlemud/world/wld/65.wld
+/var/lib/circlemud/world/wld/70.wld
+/var/lib/circlemud/world/wld/71.wld
+/var/lib/circlemud/world/wld/72.wld
+/var/lib/circlemud/world/wld/79.wld
+/var/lib/circlemud/world/wld/9.wld
+/var/lib/circlemud/world/wld/index
+/var/lib/circlemud/world/zon/120.zon
+/var/lib/circlemud/world/zon/15.zon
+/var/lib/circlemud/world/zon/150.zon
+/var/lib/circlemud/world/zon/186.zon
+/var/lib/circlemud/world/zon/25.zon
+/var/lib/circlemud/world/zon/31.zon
+/var/lib/circlemud/world/zon/33.zon
+/var/lib/circlemud/world/zon/35.zon
+/var/lib/circlemud/world/zon/36.zon
+/var/lib/circlemud/world/zon/40.zon
+/var/lib/circlemud/world/zon/50.zon
+/var/lib/circlemud/world/zon/51.zon
+/var/lib/circlemud/world/zon/52.zon
+/var/lib/circlemud/world/zon/53.zon
+/var/lib/circlemud/world/zon/54.zon
+/var/lib/circlemud/world/zon/60.zon
+/var/lib/circlemud/world/zon/61.zon
+/var/lib/circlemud/world/zon/62.zon
+/var/lib/circlemud/world/zon/63.zon
+/var/lib/circlemud/world/zon/64.zon
+/var/lib/circlemud/world/zon/65.zon
+/var/lib/circlemud/world/zon/70.zon
+/var/lib/circlemud/world/zon/71.zon
+/var/lib/circlemud/world/zon/72.zon
+/var/lib/circlemud/world/zon/73.zon
+/var/lib/circlemud/world/zon/79.zon
+/var/lib/circlemud/world/zon/9.zon
+/var/lib/circlemud/world/zon/index
+/var/lib/circlemud/world/zone.lst
--- circlemud-3.1.cvs2003061021.orig/debian/circlemud-world.dirs
+++ circlemud-3.1.cvs2003061021/debian/circlemud-world.dirs
@@ -0,0 +1,5 @@
+var/lib/circlemud/world/mob
+var/lib/circlemud/world/obj
+var/lib/circlemud/world/shp
+var/lib/circlemud/world/wld
+var/lib/circlemud/world/zon
--- circlemud-3.1.cvs2003061021.orig/debian/circlemud-world.docs
+++ circlemud-3.1.cvs2003061021/debian/circlemud-world.docs
@@ -0,0 +1,2 @@
+lib/world/README.CAW
+lib/world/README.world
--- circlemud-3.1.cvs2003061021.orig/debian/circlemud-world.postinst
+++ circlemud-3.1.cvs2003061021/debian/circlemud-world.postinst
@@ -0,0 +1,48 @@
+#! /bin/sh
+# postinst script for circlemud-world
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+#
+# quoting from the policy:
+#     Any necessary prompting should almost always be confined to the
+#     post-installation script, and should be protected with a conditional
+#     so that unnecessary prompting doesn't happen if a package's
+#     installation fails and the `postinst' is called with `abort-upgrade',
+#     `abort-remove' or `abort-deconfigure'.
+
+case "$1" in
+    configure)
+	[ -e "/var/run/circlemud/circlemud.pid" ] && \
+	    invoke-rc.d circlemud force-reload || true
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
--- circlemud-3.1.cvs2003061021.orig/debian/circlemud-world.postrm
+++ circlemud-3.1.cvs2003061021/debian/circlemud-world.postrm
@@ -0,0 +1,40 @@
+#! /bin/sh
+# postrm script for circlemud-world
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+	;;
+    purge)
+        [ -e "/var/run/circlemud/circlemud.pid" ] && \
+	    invoke-rc.d circlemud force-reload || true
+        ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 1
+
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
--- circlemud-3.1.cvs2003061021.orig/debian/circlemud.6
+++ circlemud-3.1.cvs2003061021/debian/circlemud.6
@@ -0,0 +1,49 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.TH CIRCLEMUD 6 "April 30, 2002"
+.SH NAME
+circlemud \- multi\-user dungeon game system (MUD)
+.SH SYNOPSIS
+.B circlemud
+.RI [ options ]
+.RI [ port ]
+.SH DESCRIPTION
+CircleMUD is a multi\-user dungeon game system (MUD) written by Jeremy Elson,
+originally at Johns Hopkins University's Department of Computer Science (I
+graduated in May of 1996). CircleMUD is a derivative of DikuMUD Gamma 0.0,
+which was written in 1990 at DIKU, the Department of Computer Science at the
+University of Copenhagen, by Katja Nyboe, Tom Madsen, Hans Henrik Staerfeldt,
+Michael Seifert, and Sebastian Hammer. Note, you probably don't want to run
+this binary directly since it is usually called and managed by the SysVinit
+script of the same name.
+.SH OPTIONS
+A summary of options is included below.
+.TP
+.B \-c
+Enable syntax check mode.
+.TP
+.B \-d <directory>
+Specify library directory (defaults to 'lib').
+.TP
+.B \-h
+Print command line argument help.
+.TP
+.B \-l
+Log to the server's syslog.
+.TP
+.B \-m
+Start in mini\-MUD mode.
+.TP
+.B \-o <file>
+Write log to <file> instead of stderr.
+.TP
+.B \-q
+Quick boot (doesn't scan rent for object limits).
+.TP
+.B \-r
+Restrict MUD \-\- no new players allowed.
+.TP
+.B \-s
+Suppress special procedure assignments.
+.SH AUTHOR
+This manual page was written by The Fungi <fungi@yuggoth.org>,
+for the Debian GNU/Linux system (but may be used by others).
--- circlemud-3.1.cvs2003061021.orig/debian/circlemud.conf
+++ circlemud-3.1.cvs2003061021/debian/circlemud.conf
@@ -0,0 +1,15 @@
+# Debian runtime configuration file for CircleMUD. Change the default values
+# below as needed to suit your tastes.
+
+# The port on which to run the MUD
+PORT=4000
+
+# Initial implementor character name. If /var/lib/circlemud/etc/players doesn't
+# exist, IMPNAME and IMPPASS will be used to recreate the implementor account
+# the next time the service is started.
+IMPNAME=elson
+
+# Initial implementor character account password. You should change this from
+# the menu the first time you log in, just in case someone gets a copy of this
+# configuration file.
+IMPPASS=greer
--- circlemud-3.1.cvs2003061021.orig/debian/circlemud.conffiles
+++ circlemud-3.1.cvs2003061021/debian/circlemud.conffiles
@@ -0,0 +1,31 @@
+/var/lib/circlemud/help/commands.hlp
+/var/lib/circlemud/help/index
+/var/lib/circlemud/help/index.mini
+/var/lib/circlemud/help/info.hlp
+/var/lib/circlemud/help/screen
+/var/lib/circlemud/help/socials.hlp
+/var/lib/circlemud/help/spells.hlp
+/var/lib/circlemud/help/wizhelp.hlp
+/var/lib/circlemud/misc/messages
+/var/lib/circlemud/misc/bugs
+/var/lib/circlemud/misc/ideas
+/var/lib/circlemud/misc/socials
+/var/lib/circlemud/misc/typos
+/var/lib/circlemud/misc/xnames
+/var/lib/circlemud/world/mob/0.mob
+/var/lib/circlemud/world/mob/12.mob
+/var/lib/circlemud/world/mob/30.mob
+/var/lib/circlemud/world/mob/index.mini
+/var/lib/circlemud/world/obj/0.obj
+/var/lib/circlemud/world/obj/30.obj
+/var/lib/circlemud/world/obj/index.mini
+/var/lib/circlemud/world/shp/30.shp
+/var/lib/circlemud/world/shp/index.mini
+/var/lib/circlemud/world/wld/0.wld
+/var/lib/circlemud/world/wld/12.wld
+/var/lib/circlemud/world/wld/30.wld
+/var/lib/circlemud/world/wld/index.mini
+/var/lib/circlemud/world/zon/0.zon
+/var/lib/circlemud/world/zon/12.zon
+/var/lib/circlemud/world/zon/30.zon
+/var/lib/circlemud/world/zon/index.mini
--- circlemud-3.1.cvs2003061021.orig/debian/circlemud.config
+++ circlemud-3.1.cvs2003061021/debian/circlemud.config
@@ -0,0 +1,67 @@
+#!/bin/sh -e
+
+# Source debconf library.
+. /usr/share/debconf/confmodule
+
+CONFFILE=/etc/circlemud/circlemud.conf
+PLRFILE=/var/lib/circlemud/etc/players
+
+if [ ! -s "$PLRFILE" ] ; then
+ db_get circlemud/port ; PORT=$RET ; [ "$PORT" ] || PORT=4000
+ db_get circlemud/impname ; IMPNAME=$RET ; [ "$IMPNAME" ] || IMPNAME=elson
+ db_get circlemud/imppass ; IMPPASS=$RET ; [ "$IMPPASS" ] || IMPPASS=greer
+fi
+
+# CircleMUD has a non-standard open source license.
+db_input high circlemud/license || true
+db_go
+db_get circlemud/license
+AGREE=$RET
+if [ "$AGREE" = "false" ] ; then
+ db_input high circlemud/disagree || true
+ db_go
+fi
+
+function check_ports () {
+ USEDPORTS=`netstat -lnt | sed s/:/\ / | awk '{print $5}' | tail -n+3 | sort -n`
+ HIGHPORTS=`for n in $USEDPORTS ; do [ $n -gt 1023 ] && echo $n ; done`
+}
+
+function port_used () {
+ echo $HIGHPORTS | grep -q -- $1
+}
+
+# Pick the TCP port.
+if [ ! -s "$PLRFILE" ] ; then
+ check_ports || true
+ PORTGOOD=0
+ while [ $PORTGOOD -eq 0 ] ; do
+  PORTUSED=1
+  while [ $PORTUSED -gt 0 ] ; do
+   [ $PORT -gt 65535 -o $PORT -lt 1024 ] && PORT=1024
+   port_used $PORT && PORT=$[$PORT+1] || PORTUSED=0
+  done
+  db_set circlemud/port $PORT
+  db_input high circlemud/port || true
+  db_go
+  db_get circlemud/port
+  PORT=$RET
+  if ( port_used $PORT ) || [ $PORT -gt 65535 -o $PORT -lt 1024 ] ; then
+   db_fset circlemud/port seen false
+  else
+   PORTGOOD=1
+  fi
+ done
+fi
+
+# Set up the implementor account.
+if [ "$AGREE" = "true" -a ! -s "$PLRFILE" ] ; then
+ db_set circlemud/impname $IMPNAME
+ db_set circlemud/imppass $IMPPASS
+ db_beginblock
+  db_input high circlemud/impname || true
+  db_input high circlemud/imppass || true
+ db_endblock
+ db_go
+fi
+
--- circlemud-3.1.cvs2003061021.orig/debian/circlemud.dirs
+++ circlemud-3.1.cvs2003061021/debian/circlemud.dirs
@@ -0,0 +1,10 @@
+etc/circlemud
+etc/init.d
+usr/bin
+var/lib/circlemud/help
+var/lib/circlemud/misc
+var/lib/circlemud/world/mob
+var/lib/circlemud/world/obj
+var/lib/circlemud/world/shp
+var/lib/circlemud/world/wld
+var/lib/circlemud/world/zon
--- circlemud-3.1.cvs2003061021.orig/debian/circlemud.docs
+++ circlemud-3.1.cvs2003061021/debian/circlemud.docs
@@ -0,0 +1 @@
+README
--- circlemud-3.1.cvs2003061021.orig/debian/circlemud.init
+++ circlemud-3.1.cvs2003061021/debian/circlemud.init
@@ -0,0 +1,103 @@
+#! /bin/sh
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=/usr/bin/circlemud
+FLAGS="-l -q"
+NAME=circlemud
+USER=circlemud
+GROUP=circlemud
+RUNDIR=/var/run/circlemud
+PIDFILE=circlemud.pid
+DESC="CircleMUD"
+PLRFILE=/var/lib/circlemud/etc/players
+LIBDIR=/var/lib/circlemud
+CONFDIR=/etc/circlemud
+CONFFILE=circlemud.conf
+AGREEFILE=.agree
+
+. $CONFDIR/$CONFFILE
+
+umask 007
+
+function check_ports () {
+ USEDPORTS=`netstat -lnt | sed s/:/\ / | awk '{print $5}' | tail -n+3 | sort -n`
+ HIGHPORTS=`for n in $USEDPORTS ; do [ $n -gt 1023 ] && echo $n ; done`
+}
+
+function port_used () {
+ echo $HIGHPORTS | grep -q -- $1
+}
+
+set -e
+
+case "$1" in
+  start)
+	echo -n "Starting $DESC: "
+	[ -r "$LIBDIR/world/mob/index" -a -r "$LIBDIR/world/obj/index" -a \
+	  -r "$LIBDIR/world/shp/index" -a -r "$LIBDIR/world/wld/index" -a \
+	  -r "$LIBDIR/world/zon/index" ] || FLAGS="$FLAGS -m"
+	if [ ! -e "$CONFDIR/$AGREEFILE" ] ; then
+	  echo "$CONFDIR/$AGREEFILE doesn't exist!"
+	elif [ ! -x "$DAEMON" ] ; then
+	  echo "can't execute $DAEMON!"
+	elif [ -e "$RUNDIR/$PIDFILE" ] ; then
+	  echo "found existing $RUNDIR/$PIDFILE!"
+	elif [ "$(stat -c%U $CONFDIR)" != "$USER" ] ; then
+	  echo "$CONFDIR not owned by $USER!"
+	elif [ "$(stat -c%U $RUNDIR)" != "$USER" ] ; then
+	  echo "$RUNDIR not owned by $USER!"
+	elif [ "$(stat -c%U $LIBDIR)" != "$USER" ] ; then
+	  echo "$LIBDIR not owned by $USER!"
+	else
+          if [ ! -s "$PLRFILE" ] ; then
+            echo -n "setting up an implementor account for $IMPNAME. "
+            circlemud-newpfile $PLRFILE $IMPNAME $IMPPASS
+            [ -s "$PLRFILE" ] || \
+              echo -e "\nfailed to configure the implementor account!"
+	  fi
+	  start-stop-daemon --start --quiet --background \
+	    --pidfile $RUNDIR/$PIDFILE --chuid $USER:$GROUP --exec $DAEMON -- \
+	    $FLAGS $PORT
+	  RUNNING=0
+	  while [ $RUNNING -eq 0 ] ; do
+	    check_ports || true
+	    port_used $PORT && RUNNING=1 || sleep 1
+	  done
+	  echo "started."
+        fi
+	;;
+  stop)
+	echo -n "Stopping $DESC: "
+	if [ ! -e "$RUNDIR/$PIDFILE" ] ; then
+	  echo "no existing $RUNDIR/$PIDFILE!"
+	else
+	  start-stop-daemon --stop --quiet --pidfile $RUNDIR/$PIDFILE
+	  RUNNING=1
+	  while [ $RUNNING -eq 1 ] ; do
+	    [ -e "$RUNDIR/$PIDFILE" ] && sleep 1 || RUNNING=0
+	  done
+	echo "stopped."
+	fi
+	;;
+  reload)
+	echo -n "Reloading $DESC: "
+	if [ ! -e "$RUNDIR/$PIDFILE" ] ; then
+	  echo "no existing $RUNDIR/$PIDFILE!"
+	else
+	  start-stop-daemon --stop --signal 1 --quiet --pidfile $RUNDIR/$PIDFILE
+	echo "reloaded."
+	fi
+	;;
+  restart|force-reload)
+        $0 stop
+	sleep 1
+	$0 start
+	;;
+  *)
+	N=/etc/init.d/$NAME
+	echo "Usage: $N {start|stop|reload|restart|force-reload}" >&2
+	exit 1
+	;;
+esac
+
+exit 0
--- circlemud-3.1.cvs2003061021.orig/debian/circlemud.manpages
+++ circlemud-3.1.cvs2003061021/debian/circlemud.manpages
@@ -0,0 +1,2 @@
+debian/circlemud.6
+debian/circlemud-newpfile.6
--- circlemud-3.1.cvs2003061021.orig/debian/circlemud.postinst
+++ circlemud-3.1.cvs2003061021/debian/circlemud.postinst
@@ -0,0 +1,96 @@
+#! /bin/sh
+# postinst script for circlemud
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# Source debconf library.
+. /usr/share/debconf/confmodule
+
+CONFFILE=/etc/circlemud/circlemud.conf
+INITFILE=/etc/init.d/circlemud
+LIBDIR=/var/lib/circlemud
+PLRFILE=$LIBDIR/etc/players
+AGREEFILE=/etc/circlemud/.agree
+DATESTAMP=`date`
+db_get circlemud/port
+PORT=$RET
+db_get circlemud/impname
+IMPNAME=$RET
+db_get circlemud/imppass
+IMPPASS=$RET
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+#
+# quoting from the policy:
+#     Any necessary prompting should almost always be confined to the
+#     post-installation script, and should be protected with a conditional
+#     so that unnecessary prompting doesn't happen if a package's
+#     installation fails and the `postinst' is called with `abort-upgrade',
+#     `abort-remove' or `abort-deconfigure'.
+
+case "$1" in
+    configure)
+        if [ ! -e "$AGREEFILE" ] ; then
+	    db_get circlemud/license
+	    if [ "$RET" = "true" ] ; then
+	        echo -e "The presence of this file indicates that you agreed" \
+		    "to the CircleMUD license\non or before $DATESTAMP. A" \
+		    "full copy can be found" \
+		    "in\n/usr/share/doc/circlemud/copyright for your" \
+		    "review." >$AGREEFILE || true
+		db_unregister circlemud/imppass || true
+	    fi
+	fi
+	adduser --quiet --system --home /var/run/circlemud --group \
+	    circlemud || true
+        if [ ! -s "$PLRFILE" ] ; then
+	    mv $CONFFILE $CONFFILE.tmp && \
+	        sed s/^PORT=.*/PORT=$PORT/ $CONFFILE.tmp | \
+	        sed s/^IMPNAME=.*/IMPNAME=$IMPNAME/ | \
+	        sed s/^IMPPASS=.*/IMPPASS=$IMPPASS/ > $CONFFILE && \
+		rm $CONFFILE.tmp || true
+            [ -e "$LIBDIR" ] && for newdir in $LIBDIR/etc $LIBDIR/house \
+	        $LIBDIR/plralias $LIBDIR/plralias/A-E $LIBDIR/plralias/F-J \
+	        $LIBDIR/plralias/K-O $LIBDIR/plralias/P-T $LIBDIR/plralias/U-Z \
+	        $LIBDIR/plralias/ZZZ $LIBDIR/plrobjs $LIBDIR/plrobjs/A-E \
+	        $LIBDIR/plrobjs/F-J $LIBDIR/plrobjs/K-O $LIBDIR/plrobjs/P-T \
+	        $LIBDIR/plrobjs/U-Z $LIBDIR/plrobjs/ZZZ; do
+	        mkdir $newdir || true
+	    done || true
+	    chown -R circlemud:circlemud /etc/circlemud/ /var/lib/circlemud/ \
+	        /var/run/circlemud/ || true
+	    find /etc/circlemud/ /var/lib/circlemud/ /var/run/circlemud/ \
+	        -type d -exec chmod 2770 {} \; || true
+	    find /etc/circlemud/ /var/lib/circlemud/ /var/run/circlemud/ \
+	        -type f -exec chmod 0660 {} \; || true
+	fi
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
--- circlemud-3.1.cvs2003061021.orig/debian/circlemud.postrm
+++ circlemud-3.1.cvs2003061021/debian/circlemud.postrm
@@ -0,0 +1,49 @@
+#! /bin/sh
+# postrm script for circlemud
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    upgrade|failed-upgrade|abort-upgrade)
+        ;;
+
+    remove|abort-install|disappear)
+	grep -q ^circlemud: /etc/passwd /etc/group && \
+	    deluser --quiet circlemud || true
+        ;;
+
+    purge)
+	grep -q ^circlemud: /etc/passwd /etc/group && \
+	    deluser --quiet circlemud || true
+	[ -e "/etc/circlemud" ] &&  rm -rf /etc/circlemud || true
+	[ -e "/var/lib/circlemud" ] &&  rm -rf /var/lib/circlemud || true
+	[ -e "/var/run/circlemud" ] &&  rm -rf /var/run/circlemud || true
+        ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 1
+
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
--- circlemud-3.1.cvs2003061021.orig/debian/circlemud.preinst
+++ circlemud-3.1.cvs2003061021/debian/circlemud.preinst
@@ -0,0 +1,45 @@
+#! /bin/sh
+# preinst script for circlemud
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# Source debconf library.
+. /usr/share/debconf/confmodule
+
+# summary of how this script can be called:
+#        * <new-preinst> `install'
+#        * <new-preinst> `install' <old-version>
+#        * <new-preinst> `upgrade' <old-version>
+#        * <old-preinst> `abort-upgrade' <new-version>
+#
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    install|upgrade)
+#        if [ "$1" = "upgrade" ]
+#
+#        then
+#        fi
+    ;;
+
+    abort-upgrade)
+    ;;
+
+    *)
+        echo "preinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
--- circlemud-3.1.cvs2003061021.orig/debian/circlemud.prerm
+++ circlemud-3.1.cvs2003061021/debian/circlemud.prerm
@@ -0,0 +1,40 @@
+#! /bin/sh
+# prerm script for circlemud
+#
+# see: dh_installdeb(1)
+
+set -e
+
+INITFILE=/etc/init.d/circlemud
+
+# summary of how this script can be called:
+#        * <prerm> `remove'
+#        * <old-prerm> `upgrade' <new-version>
+#        * <new-prerm> `failed-upgrade' <old-version>
+#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
+#        * <deconfigured's-prerm> `deconfigure' `in-favour'
+#          <package-being-installed> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    remove|upgrade|deconfigure)
+        ;;
+    failed-upgrade)
+        ;;
+    *)
+        echo "prerm called with unknown argument \`$1'" >&2
+        exit 1
+        ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
--- circlemud-3.1.cvs2003061021.orig/debian/circlemud.templates
+++ circlemud-3.1.cvs2003061021/debian/circlemud.templates
@@ -0,0 +1,305 @@
+Template: circlemud/license
+Type: boolean
+Default: true
+Description: Do you accept the terms of this license?
+  CircleMUD is freeware (it doesn't cost anything), but it is
+  copyrighted and has a license. You must read and agree to
+  abide by the license before using CircleMUD. 
+ .
+  This message will only appear once (the first time you
+  install the server), but is contained in the file
+  /usr/share/doc/circlemud/copyright if you'd like to refer
+  back to it in the future.
+ .
+  CircleMUD does not conform to one of the standard free open
+  source licenses. Specifically it stipulates that you can't
+  use CircleMUD to make money and you must give the authors
+  credit for their work. If you find the license confusing,
+  take a look at http://www.circlemud.org/license-faq.html
+  before asking the authors, package maintainers or mailing
+  list members any questions answered therein.
+ .
+  The license below has been reformatted for debconf (reduced
+  width to 60 characters and removed double-blank lines) by
+  The Fungi <fungi@yuggoth.org> but the copy referenced above
+  uses the original, unmodified formatting.
+ .
+  /* ********************************************************
+  *  Copyright (C) 1995 by Jeremy Elson                     *
+  *  All Rights Reserved                                    *
+  ********************************************************* */
+ .
+                        CircleMUD License
+ .
+  CircleMUD was created by:
+  Jeremy Elson
+  Department of Computer Science
+  Johns Hopkins University
+  Baltimore, MD  21218  USA
+  jelson@circlemud.org
+ .
+  CircleMUD is licensed software.  This file contains the text
+  of the CircleMUD license.  If you wish to use the CircleMUD
+  system in any way, or use any of its source code, you must
+  read this license and are legally bound to comply with it.
+ .
+  CircleMUD is a derivative work based on the DikuMUD system
+  written by Hans Henrik Staerfeldt, Katja Nyboe, Tom Madsen,
+  Michael Seifert, and Sebastian Hammer.  DikuMUD is also
+  licensed software; you are legally bound to comply with the
+  original DikuMUD license as well as the CircleMUD license if
+  you wish to use CircleMUD.
+ .
+  Use of the CircleMUD code in any capacity implies that you
+  have read, understood, and agreed to abide by the terms and
+  conditions set down by this license and the DikuMUD license.
+  If you use CircleMUD without complying with the license, you
+  are breaking the law.
+ .
+  Using CircleMUD legally is easy.  In short, the license
+  requires three things:
+ .
+  1) You must not use CircleMUD to make money or be
+     compensated in any way.
+ .
+  2) You must give the authors credit for their work.
+ .
+  3) You must comply with the DikuMUD license.
+ .
+  That's it -- those are the main conditions set down by this
+  license.  Unfortunately, past experience has shown that many
+  people are not willing to follow the spirit of the license,
+  so the remainder of this document will clearly define those
+  conditions in an attempt to prevent people from
+  circumventing them.
+ .
+  The first condition says that you must not use CircleMUD to
+  make money in any way or be otherwise compensated.
+  CircleMUD was developed in people's uncompensated spare time
+  and was given to you free of charge, and you must not use it
+  to make money.  CircleMUD must not in any way be used to
+  facilitate your acceptance of fees, donations, or other
+  compensation. Examples include, but are not limited to the
+  following:
+ .
+  -- If you run CircleMUD, you must not require any type of
+     fee or donation in exchange for being able to play
+     CircleMUD.  You must not solicit, offer or accept any
+     kind of donation from your players in exchange for
+     enhanced status in the game such as increased levels,
+     character stats, gold, or equipment.
+ .
+  -- You must not solicit or accept money or other donations
+     in exchange for running CircleMUD.  You must not accept
+     money or other donations from your players for purposes
+     such as hardware upgrades for running CircleMUD.
+ .
+  -- You must not sell CircleMUD.  You must not accept any
+     type of fee in exchange for distributing or copying
+     CircleMUD.
+ .
+  -- If you are a CircleMUD administrator, You must not accept
+     any type of reimbursement for money spent out of pocket
+     for running CircleMUD, i.e., for equipment expenses or
+     fees incurred from service providers.
+ .
+  The second part of the license states that you must give
+  credit to the creators of CircleMUD.  A great deal of work
+  went into the creation of CircleMUD, and it was given to you
+  completely free of charge; claiming that you wrote the MUD
+  yourself is a slap in the face to everyone who worked to
+  bring you a high quality product while asking for nothing
+  but credit for their work in return.
+ .
+  Specifically, the following are required:
+ .
+  -- The text in the 'credits' file distributed with CircleMUD
+     must be preserved.  You may add your own credits to the
+     file, but the existing text must not be removed,
+     abridged, truncated, or changed in any way. This file
+     must be displayed when the 'credits' command is used from
+     within the MUD.
+ .
+  -- The "CIRCLEMUD" help entry must be maintained intact and
+     unchanged, and displayed in its entirety when the 'help
+     circlemud' command is used.
+ .
+  -- The login sequence must contain the names of the DikuMUD
+     and CircleMUD creators.  The 'login sequence' is defined
+     as the text seen by players between the time they connect
+     to the MUD and when they start to play the game itself.
+ .
+  -- This license must be distributed AS IS with all copies or
+     portions of the CircleMUD that you distribute, if any,
+     including works derived from CircleMUD.
+ .
+  -- You must not remove, change, or modify any notices of
+     copyright, licensing or authorship found in any CircleMUD
+     source code files.
+ .
+  -- Claims that any of the above requirements are
+     inapplicable to a particular MUD for reasons such as "our
+     MUD is totally rewritten" or similar are completely
+     invalid.  If you can write a MUD completely from scratch
+     then you are encouraged to do so by all means, but use of
+     any part of the CircleMUD or DikuMUD source code requires
+     that their respective licenses be followed, including the
+     crediting requirements.
+ .
+  The third part of the license simply states that you must
+  comply with the DikuMUD license.  This is required because
+  CircleMUD is a DikuMUD derivative.  The DikuMUD license is
+  included below.
+ .
+  You are allowed to use, modify and redistribute all
+  CircleMUD source code and documentation as long as such use
+  does not violate any of the rules set down by this license.
+ .
+  --Jeremy Elson
+ .
+  CircleMUD 3 -- Copyright (C) 1994-2001, The CircleMUD Group
+  Other portions copyright by authors as noted in ChangeLog
+  and source code.
+ .
+  ============================================================
+ .
+  Everything below this line is the original, DikuMUD license.
+  You must comply with the CircleMUD license above, as well as
+  the DikuMUD license below.
+ .
+  ------------------------------------------------------------
+ .
+  /* ********************************************************
+  *  Copyright (C) 1990, 1991                               *
+  *  All Rights Reserved                                    *
+  ********************************************************* */
+ .
+                         DikuMud License
+ .
+                  Program & Concept created by
+ .
+  Sebastian Hammer
+  Prss. Maries Alle 15, 1
+  1908 Frb. C.
+  DENMARK
+  (email quinn@freja.diku.dk)
+ .
+  Michael Seifert
+  Nr. Soeg. 37C, 1, doer 3
+  1370 Copenhagen K.
+  DENMARK
+  (email seifert@freja.diku.dk)
+ .
+  Hans Henrik St{rfeldt
+  Langs} 19
+  3500 V{rl|se
+  DENMARK
+  (email bombman@freja.diku.dk)
+ .
+  Tom Madsen
+  R|de Mellemvej 94B, 64
+  2300 Copenhagen S.
+  DENMARK
+  (email noop@freja.diku.dk)
+ .
+  Katja Nyboe
+  Kildeg}rdsvej 2
+  2900 Hellerup
+  31 62 82 84
+  DENMARK
+  (email katz@freja.diku.dk)
+ .
+  This document contains the rules by which you can use,
+  alter or publish parts of DikuMud. DikuMud has been created
+  by the above five listed persons in their spare time, at
+  DIKU (Computer Science Instutute at Copenhagen University).
+  You are legally bound to follow the rules described in this
+  document.
+ .
+  Rules:
+ .
+     !! DikuMud is NOT Public Domain, shareware, careware or
+     the like !!
+ .
+     You may under no circumstances make profit on *ANY* part
+     of DikuMud in any possible way. You may under no
+     circumstances charge money for distributing any part of
+     dikumud - this includes the usual $5 charge for "sending
+     the disk" or "just for the disk" etc. By breaking these
+     rules you violate the agreement between us and the
+     University, and hence will be sued.
+ .
+     You may not remove any copyright notices from any of the
+     documents or sources given to you.
+ .
+     This license must *always* be included "as is" if you
+     copy or give away any part of DikuMud (which is to be
+     done as described in this document).
+ .
+     If you publish *any* part of dikumud, we as creators must
+     appear in the article, and the article must be clearly
+     copyrighted subject to this license. Before publishing
+     you must first send us a message, by snail-mail or
+     e-mail, and inform us what, where and when you are
+     publishing (remember to include your address, name etc.)
+ .
+     If you wish to setup a version of DikuMud on any computer
+     system, you must send us a message , by snail-mail or
+     e-mail, and inform us where and when you are running the
+     game. (remember to include your address, name etc.)
+ .
+     Any running version of DikuMud must include our names in
+     the login sequence. Furthermore the "credits" command
+     shall always cointain our name, addresses, and a notice
+     which states we have created DikuMud.
+ .
+     You are allowed to alter DikuMud, source and
+     documentation as long as you do not violate any of the
+     above stated rules.
+ .
+  Regards,
+ .
+  The DikuMud Group
+ .
+  Note:
+ .
+  We hope you will enjoy DikuMud, and encourage you to send us
+  any reports on bugs (when you find 'it'). Remember that we
+  are all using our spare time to write and improve DikuMud,
+  bugs, etc. - and changes will take their time. We have so
+  far put extremely many programming hours into this project.
+  If you make any major improvements on DikuMud we would be
+  happy to hear from you. As you will naturally honor the
+  above rules, you will receive new updates and improvements
+  made to the game.
+
+Template: circlemud/disagree
+Type: note
+Description: You disagreed with the CircleMUD license.
+ CircleMUD will not start up automatically until you read
+ /usr/share/doc/circlemud/copyright and acknowledge your
+ agreement by running:
+ .
+ touch /etc/circlemud/.agree
+
+Template: circlemud/port
+Type: string
+Description: To which TCP port should CircleMUD bind?
+
+Template: circlemud/impname
+Type: string
+Description: Choose a name for your implementor account.
+ This will be your default implementor acount login. It
+ must be a single word containing no white space and will
+ but truncated to 40 characters in length.
+
+Template: circlemud/imppass
+Type: password
+Description: Enter a password for your implementor account.
+ This is the initial password you want set for your default
+ implementor account. It will be stored in circlemud.conf
+ and the local Debian package registry, so you should
+ change it from the game menu as soon as possible. If your
+ playerfile (/var/lib/circlemud/etc/players) ever gets moved
+ or deleted, the account will be recreated with this default
+ password the next time you 'invoke-rc.d circlemud start'.
--- circlemud-3.1.cvs2003061021.orig/debian/control
+++ circlemud-3.1.cvs2003061021/debian/control
@@ -0,0 +1,40 @@
+Source: circlemud
+Section: net
+Priority: optional
+Maintainer: The Fungi <fungi@yuggoth.org>
+Build-Depends: debhelper (>> 3.0.0)
+Standards-Version: 3.5.8.0
+
+Package: circlemud
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Suggests: circlemud-doc, circlemud-world
+Description: multi-user dungeon game system (MUD)
+ CircleMUD is highly developed from the programming side, but highly UNdeveloped
+ on the game-playing side. So, if you're looking for a huge MUD with billions of
+ spells, skills, classes, races, and areas, Circle will probably disappoint you
+ severely. Circle still has only the 4 original Diku classes, the original
+ spells, the original skills, and the minimum necessary areas.
+ . 
+ On the other hand, if you're looking for a highly stable, well-developed,
+ well-organized "blank slate" MUD on which you can put your OWN ideas for
+ spells, skills, classes, and areas, then Circle might be just what you're
+ looking for.
+
+Package: circlemud-doc
+Architecture: all
+Suggests: circlemud
+Description: documentation for CircleMUD
+ Text, LaTex and PDF documentation for the circlemud and circlemud-world
+ packages. These are out-of-game documentation. T