--- netmrg-0.20.orig/config.guess
+++ netmrg-0.20/config.guess
@@ -1,9 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
 #   Free Software Foundation, Inc.
 
-timestamp='2001-09-04'
+timestamp='2008-01-23'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -17,15 +18,18 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
-# Written by Per Bothner <bothner@cygnus.com>.
-# Please send patches to <config-patches@gnu.org>.
+
+# 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
@@ -52,8 +56,8 @@
 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.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 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."
@@ -65,11 +69,11 @@
 while test $# -gt 0 ; do
   case $1 in
     --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
+       echo "$timestamp" ; exit ;;
     --version | -v )
-       echo "$version" ; exit 0 ;;
+       echo "$version" ; exit ;;
     --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
+       echo "$usage"; exit ;;
     -- )     # Stop option processing
        shift; break ;;
     - )	# Use stdin as input.
@@ -87,30 +91,42 @@
   exit 1
 fi
 
+trap 'exit 1' 1 2 15
 
-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. Note that the use of a
+# compiler to aid in system detection is discouraged as it requires
+# temporary files to be created and, as you can see below, it is a
+# headache to deal with in a portable fashion.
 
-# 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 ; do
-	  ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ;
-	  if test $? = 0 ; then
+# Portable tmp directory creation inspired by the Autoconf team.
+
+set_cc_for_build='
+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+: ${TMPDIR=/tmp} ;
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
+dummy=$tmp/dummy ;
+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
+case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,)    echo "int x;" > $dummy.c ;
+	for c in cc gcc c89 c99 ; do
+	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
 	     CC_FOR_BUILD="$c"; break ;
 	  fi ;
 	done ;
-	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'
+esac ; set_cc_for_build= ;'
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (ghazi@noc.rutgers.edu 1994-08-24)
@@ -127,29 +143,31 @@
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:NetBSD:*:*)
-	# Netbsd (nbsd) targets should (where applicable) match one or
+	# 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.
-	# Determine the machine/vendor (is the vendor relevant).
-	case "${UNAME_MACHINE}" in
-	    amiga) machine=m68k-unknown ;;
-	    arm32) machine=arm-unknown ;;
-	    atari*) machine=m68k-atari ;;
-	    sun3*) machine=m68k-sun ;;
-	    mac68k) machine=m68k-apple ;;
-	    macppc) machine=powerpc-apple ;;
-	    hp3[0-9][05]) machine=m68k-hp ;;
-	    ibmrt|romp-ibm) machine=romp-ibm ;;
-	    *) machine=${UNAME_MACHINE}-unknown ;;
+	#
+	# 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 ;;
+	    sh5el) machine=sh5le-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}" in
-	    i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k)
+	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
@@ -166,120 +184,128 @@
 		;;
 	esac
 	# The OS release
-	release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+	# Debian GNU/NetBSD machines have a different userland, and
+	# thus, need a distinct triplet. However, they do not need
+	# kernel version information, so it can be replaced with a
+	# suitable tag, in the style of linux-gnu.
+	case "${UNAME_VERSION}" in
+	    Debian*)
+		release='-gnu'
+		;;
+	    *)
+		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+		;;
+	esac
 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
 	# contains redundant information, the shorter form:
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
-	exit 0 ;;
+	exit ;;
+    *:OpenBSD:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+	exit ;;
+    *:ekkoBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+	exit ;;
+    *:SolidBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+	exit ;;
+    macppc:MirBSD:*:*)
+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
+	exit ;;
+    *:MirBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+	exit ;;
     alpha:OSF1:*:*)
-	if test $UNAME_RELEASE = "V4.0"; then
+	case $UNAME_RELEASE in
+	*4.0)
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-	fi
+		;;
+	*5.*)
+	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		;;
+	esac
+	# According to Compaq, /usr/sbin/psrinfo has been available on
+	# OSF/1 and Tru64 systems produced since 1995.  I hope that
+	# covers most systems running today.  This code pipes the CPU
+	# types through head -n 1, so we only detect the type of CPU 0.
+	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
+	case "$ALPHA_CPU_TYPE" in
+	    "EV4 (21064)")
+		UNAME_MACHINE="alpha" ;;
+	    "EV4.5 (21064)")
+		UNAME_MACHINE="alpha" ;;
+	    "LCA4 (21066/21068)")
+		UNAME_MACHINE="alpha" ;;
+	    "EV5 (21164)")
+		UNAME_MACHINE="alphaev5" ;;
+	    "EV5.6 (21164A)")
+		UNAME_MACHINE="alphaev56" ;;
+	    "EV5.6 (21164PC)")
+		UNAME_MACHINE="alphapca56" ;;
+	    "EV5.7 (21164PC)")
+		UNAME_MACHINE="alphapca57" ;;
+	    "EV6 (21264)")
+		UNAME_MACHINE="alphaev6" ;;
+	    "EV6.7 (21264A)")
+		UNAME_MACHINE="alphaev67" ;;
+	    "EV6.8CB (21264C)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.8AL (21264B)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.8CX (21264D)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.9A (21264/EV69A)")
+		UNAME_MACHINE="alphaev69" ;;
+	    "EV7 (21364)")
+		UNAME_MACHINE="alphaev7" ;;
+	    "EV7.9 (21364A)")
+		UNAME_MACHINE="alphaev79" ;;
+	esac
+	# A Pn.n version is a patched version.
 	# A Vn.n version is a released version.
 	# A Tn.n version is a released field test version.
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
-	cat <<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 ;;
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	exit ;;
     Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# Should we change UNAME_MACHINE based on the output of uname instead
 	# of the specific Alpha model?
 	echo alpha-pc-interix
-	exit 0 ;;
+	exit ;;
     21064:Windows_NT:50:3)
 	echo alpha-dec-winnt3.5
-	exit 0 ;;
+	exit ;;
     Amiga*:UNIX_System_V:4.0:*)
 	echo m68k-unknown-sysv4
-	exit 0;;
-    amiga:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:[Aa]miga[Oo][Ss]:*:*)
 	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit 0 ;;
-    arc64:OpenBSD:*:*)
-	echo mips64el-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    arc:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    hkmips:OpenBSD:*:*)
-	echo mips-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    pmax:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sgi:OpenBSD:*:*)
-	echo mips-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    wgrisc:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
+    *:[Mm]orph[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-morphos
+	exit ;;
     *:OS/390:*:*)
 	echo i370-ibm-openedition
-	exit 0 ;;
+	exit ;;
+    *:z/VM:*:*)
+	echo s390-ibm-zvmoe
+	exit ;;
+    *:OS400:*:*)
+        echo powerpc-ibm-os400
+	exit ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit 0;;
+	exit ;;
+    arm:riscos:*:*|arm:RISCOS:*:*)
+	echo arm-unknown-riscos
+	exit ;;
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
 	echo hppa1.1-hitachi-hiuxmpp
-	exit 0;;
+	exit ;;
     Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
 	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
 	if test "`(/bin/universe) 2>/dev/null`" = att ; then
@@ -287,25 +313,32 @@
 	else
 		echo pyramid-pyramid-bsd
 	fi
-	exit 0 ;;
+	exit ;;
     NILE*:*:*:dcosx)
 	echo pyramid-pyramid-svr4
-	exit 0 ;;
+	exit ;;
+    DRS?6000:unix:4.0:6*)
+	echo sparc-icl-nx6
+	exit ;;
+    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
+	case `/usr/bin/uname -p` in
+	    sparc) echo sparc-icl-nx7; exit ;;
+	esac ;;
     sun4H:SunOS:5.*:*)
 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    i86pc:SunOS:5.*:*)
+	exit ;;
+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
 	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     sun4*:SunOS:6*:*)
 	# According to config.sub, this is the proper way to canonicalize
 	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
 	# it's likely to be more like Solaris than SunOS4.
 	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     sun4*:SunOS:*:*)
 	case "`/usr/bin/arch -k`" in
 	    Series*|S4*)
@@ -314,12 +347,12 @@
 	esac
 	# Japanese Language versions have a version number like `4.1.3-JL'.
 	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit 0 ;;
+	exit ;;
     sun3*:SunOS:*:*)
 	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     sun*:*:4.2BSD:*)
-	UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
 	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
 	case "`/bin/arch`" in
 	    sun3)
@@ -329,16 +362,10 @@
 		echo sparc-sun-sunos${UNAME_RELEASE}
 		;;
 	esac
-	exit 0 ;;
+	exit ;;
     aushp:SunOS:*:*)
 	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit 0 ;;
-    sparc*:NetBSD:*)
-	echo `uname -p`-unknown-netbsd${UNAME_RELEASE}
-	exit 0 ;;
-    atari*:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     # The situation for MiNT is a little confusing.  The machine name
     # can be virtually everything (everything which is not
     # "atarist" or "atariste" at least should have a processor
@@ -349,49 +376,40 @@
     # be no problem.
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
         echo m68k-atari-mint${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
 	echo m68k-atari-mint${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
         echo m68k-atari-mint${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
         echo m68k-milan-mint${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
         echo m68k-hades-mint${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
         echo m68k-unknown-mint${UNAME_RELEASE}
-        exit 0 ;;
-    sun3*:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mac68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme88k:OpenBSD:*:*)
-	echo m88k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
+        exit ;;
+    m68k:machten:*:*)
+	echo m68k-apple-machten${UNAME_RELEASE}
+	exit ;;
     powerpc:machten:*:*)
 	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     RISC*:Mach:*:*)
 	echo mips-dec-mach_bsd4.3
-	exit 0 ;;
+	exit ;;
     RISC*:ULTRIX:*:*)
 	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     VAX*:ULTRIX*:*:*)
 	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     2020:CLIX:*:* | 2430:CLIX:*:*)
 	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     mips:*:*:UMIPS | mips:*:*:RISCos)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
@@ -415,27 +433,33 @@
 	  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
+	$CC_FOR_BUILD -o $dummy $dummy.c &&
+	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+	  SYSTEM_NAME=`$dummy $dummyarg` &&
+	    { echo "$SYSTEM_NAME"; exit; }
 	echo mips-mips-riscos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     Motorola:PowerMAX_OS:*:*)
 	echo powerpc-motorola-powermax
-	exit 0 ;;
+	exit ;;
+    Motorola:*:4.3:PL8-*)
+	echo powerpc-harris-powermax
+	exit ;;
+    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
+	echo powerpc-harris-powermax
+	exit ;;
     Night_Hawk:Power_UNIX:*:*)
 	echo powerpc-harris-powerunix
-	exit 0 ;;
+	exit ;;
     m88k:CX/UX:7*:*)
 	echo m88k-harris-cxux7
-	exit 0 ;;
+	exit ;;
     m88k:*:4*:R4*)
 	echo m88k-motorola-sysv4
-	exit 0 ;;
+	exit ;;
     m88k:*:3*:R3*)
 	echo m88k-motorola-sysv3
-	exit 0 ;;
+	exit ;;
     AViiON:dgux:*:*)
         # DG/UX returns AViiON for all architectures
         UNAME_PROCESSOR=`/usr/bin/uname -p`
@@ -451,29 +475,29 @@
 	else
 	    echo i586-dg-dgux${UNAME_RELEASE}
 	fi
- 	exit 0 ;;
+ 	exit ;;
     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
 	echo m88k-dolphin-sysv3
-	exit 0 ;;
+	exit ;;
     M88*:*:R3*:*)
 	# Delta 88k system running SVR3
 	echo m88k-motorola-sysv3
-	exit 0 ;;
+	exit ;;
     XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
 	echo m88k-tektronix-sysv3
-	exit 0 ;;
+	exit ;;
     Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
 	echo m68k-tektronix-bsd
-	exit 0 ;;
+	exit ;;
     *:IRIX*:*:*)
 	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit 0 ;;
+	exit ;;
     ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
-	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
+	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
+	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
     i*86:AIX:*:*)
 	echo i386-ibm-aix
-	exit 0 ;;
+	exit ;;
     ia64:AIX:*:*)
 	if [ -x /usr/bin/oslevel ] ; then
 		IBM_REV=`/usr/bin/oslevel`
@@ -481,7 +505,7 @@
 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 	fi
 	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit 0 ;;
+	exit ;;
     *:AIX:2:3)
 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
 		eval $set_cc_for_build
@@ -496,17 +520,20 @@
 			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
+		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
+		then
+			echo "$SYSTEM_NAME"
+		else
+			echo rs6000-ibm-aix3.2.5
+		fi
 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
 		echo rs6000-ibm-aix3.2.4
 	else
 		echo rs6000-ibm-aix3.2
 	fi
-	exit 0 ;;
-    *:AIX:*:[45])
-	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
+	exit ;;
+    *:AIX:*:[456])
+	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
@@ -518,38 +545,36 @@
 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 	fi
 	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit 0 ;;
+	exit ;;
     *:AIX:*:*)
 	echo rs6000-ibm-aix
-	exit 0 ;;
+	exit ;;
     ibmrt:4.4BSD:*|romp-ibm:BSD:*)
 	echo romp-ibm-bsd4.4
-	exit 0 ;;
+	exit ;;
     ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
 	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit 0 ;;                           # report: romp-ibm BSD 4.3
+	exit ;;                             # report: romp-ibm BSD 4.3
     *:BOSX:*:*)
 	echo rs6000-bull-bosx
-	exit 0 ;;
+	exit ;;
     DPX/2?00:B.O.S.:*:*)
 	echo m68k-bull-sysv3
-	exit 0 ;;
+	exit ;;
     9000/[34]??:4.3bsd:1.*:*)
 	echo m68k-hp-bsd
-	exit 0 ;;
+	exit ;;
     hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
 	echo m68k-hp-bsd4.4
-	exit 0 ;;
+	exit ;;
     9000/[34678]??:HP-UX:*:*)
 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
 	case "${UNAME_MACHINE}" in
 	    9000/31? )            HP_ARCH=m68000 ;;
 	    9000/[34]?? )         HP_ARCH=m68k ;;
 	    9000/[678][0-9][0-9])
-              case "${HPUX_REV}" in
-                11.[0-9][0-9])
-                  if [ -x /usr/bin/getconf ]; then
-                    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+		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
@@ -558,13 +583,13 @@
                         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 ;;
-              esac
-              if [ "${HP_ARCH}" = "" ]; then
-	      eval $set_cc_for_build
-              sed 's/^              //' << EOF >$dummy.c
+		fi
+		if [ "${HP_ARCH}" = "" ]; then
+		    eval $set_cc_for_build
+		    sed 's/^              //' << EOF >$dummy.c
 
               #define _HPUX_SOURCE
               #include <stdlib.h>
@@ -597,17 +622,37 @@
                   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 ;;
+		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+		    test -z "$HP_ARCH" && HP_ARCH=hppa
+		fi ;;
 	esac
+	if [ ${HP_ARCH} = "hppa2.0w" ]
+	then
+	    eval $set_cc_for_build
+
+	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
+	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
+	    # generating 64-bit code.  GNU and HP use different nomenclature:
+	    #
+	    # $ CC_FOR_BUILD=cc ./config.guess
+	    # => hppa2.0w-hp-hpux11.23
+	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
+	    # => hppa64-hp-hpux11.23
+
+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+		grep __LP64__ >/dev/null
+	    then
+		HP_ARCH="hppa2.0w"
+	    else
+		HP_ARCH="hppa64"
+	    fi
+	fi
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit 0 ;;
+	exit ;;
     ia64:HP-UX:*:*)
 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
 	echo ia64-hp-hpux${HPUX_REV}
-	exit 0 ;;
+	exit ;;
     3050*:HI-UX:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
@@ -635,158 +680,247 @@
 	  exit (0);
 	}
 EOF
-	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
-	rm -f $dummy.c $dummy
+	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
+		{ echo "$SYSTEM_NAME"; exit; }
 	echo unknown-hitachi-hiuxwe2
-	exit 0 ;;
+	exit ;;
     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
 	echo hppa1.1-hp-bsd
-	exit 0 ;;
+	exit ;;
     9000/8??:4.3bsd:*:*)
 	echo hppa1.0-hp-bsd
-	exit 0 ;;
+	exit ;;
     *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
 	echo hppa1.0-hp-mpeix
-	exit 0 ;;
+	exit ;;
     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
 	echo hppa1.1-hp-osf
-	exit 0 ;;
+	exit ;;
     hp8??:OSF1:*:*)
 	echo hppa1.0-hp-osf
-	exit 0 ;;
+	exit ;;
     i*86:OSF1:*:*)
 	if [ -x /usr/sbin/sysversion ] ; then
 	    echo ${UNAME_MACHINE}-unknown-osf1mk
 	else
 	    echo ${UNAME_MACHINE}-unknown-osf1
 	fi
-	exit 0 ;;
+	exit ;;
     parisc*:Lites*:*:*)
 	echo hppa1.1-hp-lites
-	exit 0 ;;
-    hppa*:OpenBSD:*:*)
-	echo hppa-unknown-openbsd
-	exit 0 ;;
+	exit ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 	echo c1-convex-bsd
-        exit 0 ;;
+        exit ;;
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-        exit 0 ;;
+        exit ;;
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
 	echo c34-convex-bsd
-        exit 0 ;;
+        exit ;;
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
 	echo c38-convex-bsd
-        exit 0 ;;
+        exit ;;
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
 	echo c4-convex-bsd
-        exit 0 ;;
-    CRAY*X-MP:*:*:*)
-	echo xmp-cray-unicos
-        exit 0 ;;
+        exit ;;
     CRAY*Y-MP:*:*:*)
 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     CRAY*[A-Z]90:*:*:*)
 	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
 	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
 	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
 	      -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     CRAY*TS:*:*:*)
 	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*T3D:*:*:*)
-	echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     CRAY*T3E:*:*:*)
 	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     CRAY*SV1:*:*:*)
 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY-2:*:*:*)
-	echo cray2-cray-unicos
-        exit 0 ;;
+	exit ;;
+    *:UNICOS/mp:*:*)
+	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit 0 ;;
-    hp300:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
+        exit ;;
+    5000:UNIX_System_V:4.*:*)
+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     sparc*:BSD/OS:*:*)
 	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:BSD/OS:*:*)
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:FreeBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit 0 ;;
-    *:OpenBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-	exit 0 ;;
+	case ${UNAME_MACHINE} in
+	    pc98)
+		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    amd64)
+		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    *)
+		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	esac
+	exit ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
-	exit 0 ;;
-    i*:MINGW*:*)
+	exit ;;
+    *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
-	exit 0 ;;
+	exit ;;
+    i*:windows32*:*)
+    	# uname -m includes "-pc" on this system.
+    	echo ${UNAME_MACHINE}-mingw32
+	exit ;;
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
-	exit 0 ;;
+	exit ;;
+    *:Interix*:[3456]*)
+    	case ${UNAME_MACHINE} in
+	    x86)
+		echo i586-pc-interix${UNAME_RELEASE}
+		exit ;;
+	    EM64T | authenticamd)
+		echo x86_64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	    IA64)
+		echo ia64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	esac ;;
+    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+	echo i${UNAME_MACHINE}-pc-mks
+	exit ;;
     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 ;;
+	echo i586-pc-interix
+	exit ;;
     i*:UWIN*:*)
 	echo ${UNAME_MACHINE}-pc-uwin
-	exit 0 ;;
+	exit ;;
+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
+	echo x86_64-unknown-cygwin
+	exit ;;
     p*:CYGWIN*:*)
 	echo powerpcle-unknown-cygwin
-	exit 0 ;;
+	exit ;;
     prep*:SunOS:5.*:*)
 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     *:GNU:*:*)
+	# the GNU system
 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit 0 ;;
+	exit ;;
+    *:GNU/*:*:*)
+	# other systems with GNU libc and userland
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+	exit ;;
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
-	exit 0 ;;
+	exit ;;
     arm*:Linux:*:*)
+	eval $set_cc_for_build
+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+	    | grep -q __ARM_EABI__
+	then
+	    echo ${UNAME_MACHINE}-unknown-linux-gnu
+	else
+	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	fi
+	exit ;;
+    avr32*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
+    cris:Linux:*:*)
+	echo cris-axis-linux-gnu
+	exit ;;
+    crisv32:Linux:*:*)
+	echo crisv32-axis-linux-gnu
+	exit ;;
+    frv:Linux:*:*)
+    	echo frv-unknown-linux-gnu
+	exit ;;
     ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux
-	exit 0 ;;
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    m32r*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
     m68*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     mips:Linux:*:*)
-	case `sed -n '/^byte/s/^.*: \(.*\) endian/\1/p' < /proc/cpuinfo` in
-	  big)    echo mips-unknown-linux-gnu && exit 0 ;;
-	  little) echo mipsel-unknown-linux-gnu && exit 0 ;;
-	esac
+	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 | sed -n '
+	    /^CPU/{
+		s: ::g
+		p
+	    }'`"
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
+    mips64:Linux:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#undef CPU
+	#undef mips64
+	#undef mips64el
+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+	CPU=mips64el
+	#else
+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+	CPU=mips64
+	#else
+	CPU=
+	#endif
+	#endif
+EOF
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^CPU/{
+		s: ::g
+		p
+	    }'`"
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+	;;
+    or32:Linux:*:*)
+	echo or32-unknown-linux-gnu
+	exit ;;
     ppc:Linux:*:*)
 	echo powerpc-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     ppc64:Linux:*:*)
 	echo powerpc64-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
 	  EV5)   UNAME_MACHINE=alphaev5 ;;
@@ -800,7 +934,7 @@
 	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit 0 ;;
+	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -808,27 +942,37 @@
 	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
 	  *)    echo hppa-unknown-linux-gnu ;;
 	esac
-	exit 0 ;;
+	exit ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
 	echo hppa64-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
-	exit 0 ;;
+	exit ;;
+    sh64*:Linux:*:*)
+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
     sh*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
+    vax:Linux:*:*)
+	echo ${UNAME_MACHINE}-dec-linux-gnu
+	exit ;;
     x86_64:Linux:*:*)
 	echo x86_64-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
+    xtensa*:Linux:*:*)
+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
     i*86:Linux:*:*)
 	# The BFD linker knows what the default object file format is, so
 	# first see if it will tell us. cd to the root directory to prevent
 	# problems with other programs or directories called `ld' in the path.
-	ld_supported_targets=`cd /; ld --help 2>&1 \
+	# 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: *//
@@ -840,52 +984,58 @@
 		;;
 	  a.out-i386-linux)
 		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit 0 ;;		
+		exit ;;
 	  coff-i386)
 		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		exit 0 ;;
+		exit ;;
 	  "")
 		# Either a pre-BFD a.out linker (linux-gnuoldld) or
 		# one that does not give us useful --help.
 		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit 0 ;;
+		exit ;;
 	esac
 	# Determine whether the default compiler is a.out or elf
 	eval $set_cc_for_build
-	cat >$dummy.c <<EOF
-#include <features.h>
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-	int main (int argc, char *argv[]) {
-#else
-	int main (argc, argv) int argc; char *argv[]; {
-#endif
-#ifdef __ELF__
-# ifdef __GLIBC__
-#  if __GLIBC__ >= 2
-    printf ("%s-pc-linux-gnu\n", argv[1]);
-#  else
-    printf ("%s-pc-linux-gnulibc1\n", argv[1]);
-#  endif
-# else
-   printf ("%s-pc-linux-gnulibc1\n", argv[1]);
-# endif
-#else
-  printf ("%s-pc-linux-gnuaout\n", argv[1]);
-#endif
-  return 0;
-}
+	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
+	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
+	LIBC=gnu
+	#else
+	LIBC=gnuaout
+	#endif
+	#endif
+	#ifdef __dietlibc__
+	LIBC=dietlibc
+	#endif
 EOF
-	$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
-	rm -f $dummy.c $dummy
-	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^LIBC/{
+		s: ::g
+		p
+	    }'`"
+	test x"${LIBC}" != x && {
+		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+		exit
+	}
+	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
 	;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
 	# earlier versions are messed up and put the nodename in both
 	# sysname and nodename.
 	echo i386-sequent-sysv4
-	exit 0 ;;
+	exit ;;
     i*86:UNIX_SV:4.2MP:2.*)
         # Unixware is an offshoot of SVR4, but it has its own version
         # number series starting with 2...
@@ -893,7 +1043,27 @@
 	# I just have to hope.  -- rms.
         # Use sysv4.2uw... so that sysv4* matches it.
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	exit 0 ;;
+	exit ;;
+    i*86:OS/2:*:*)
+	# If we were able to find `uname', then EMX Unix compatibility
+	# is probably installed.
+	echo ${UNAME_MACHINE}-pc-os2-emx
+	exit ;;
+    i*86:XTS-300:*:STOP)
+	echo ${UNAME_MACHINE}-unknown-stop
+	exit ;;
+    i*86:atheos:*:*)
+	echo ${UNAME_MACHINE}-unknown-atheos
+	exit ;;
+    i*86:syllable:*:*)
+	echo ${UNAME_MACHINE}-pc-syllable
+	exit ;;
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+	echo i386-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    i*86:*DOS:*:*)
+	echo ${UNAME_MACHINE}-pc-msdosdjgpp
+	exit ;;
     i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
 	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
@@ -901,99 +1071,100 @@
 	else
 		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
 	fi
-	exit 0 ;;
-    i*86:*:5:[78]*)
+	exit ;;
+    i*86:*:5:[678]*)
+    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
 	case `/bin/uname -X | grep "^Machine"` in
 	    *486*)	     UNAME_MACHINE=i486 ;;
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
 	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
 	esac
 	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-	exit 0 ;;
+	exit ;;
     i*86:*:3.2:*)
 	if test -f /usr/options/cb.name; then
 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
 		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
 	elif /bin/uname -X 2>/dev/null >/dev/null ; then
-		UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
-		(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
-		(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
+		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
+		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
+		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
 			&& UNAME_MACHINE=i586
-		(/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
+		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
 			&& UNAME_MACHINE=i686
-		(/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
+		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
 			&& UNAME_MACHINE=i686
 		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
 	else
 		echo ${UNAME_MACHINE}-pc-sysv32
 	fi
-	exit 0 ;;
-    i*86:*DOS:*:*)
-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit 0 ;;
+	exit ;;
     pc:*:*:*)
 	# Left here for compatibility:
         # uname -m prints for DJGPP always 'pc', but it prints nothing about
         # the processor, so we play safe by assuming i386.
 	echo i386-pc-msdosdjgpp
-        exit 0 ;;
+        exit ;;
     Intel:Mach:3*:*)
 	echo i386-pc-mach3
-	exit 0 ;;
+	exit ;;
     paragon:*:*:*)
 	echo i860-intel-osf1
-	exit 0 ;;
+	exit ;;
     i860:*:4.*:*) # i860-SVR4
 	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
 	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
 	else # Add other i860-SVR4 vendors below as they are discovered.
 	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
 	fi
-	exit 0 ;;
+	exit ;;
     mini*:CTIX:SYS*5:*)
 	# "miniframe"
 	echo m68010-convergent-sysv
-	exit 0 ;;
-    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 | 4850:*:4.0:3.0)
+	exit ;;
+    mc68k:UNIX:SYSTEM5:3.51m)
+	echo m68k-convergent-sysv
+	exit ;;
+    M680?0:D-NIX:5.3:*)
+	echo m68k-diab-dnix
+	exit ;;
+    M68*:*:R3V[5678]*:*)
+	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
+    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
 	OS_REL=''
 	test -r /etc/.relid \
 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
+	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
+	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && echo i486-ncr-sysv4 && exit 0 ;;
+          && { echo i486-ncr-sysv4; exit; } ;;
     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
 	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     mc68030:UNIX_System_V:4.*:*)
 	echo m68k-atari-sysv4
-	exit 0 ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     TSUNAMI:LynxOS:2.*:*)
 	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     rs6000:LynxOS:2.*:*)
 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     SM[BE]S:UNIX_SV:*:*)
 	echo mips-dde-sysv${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     RM*:ReliantUNIX-*:*:*)
 	echo mips-sni-sysv4
-	exit 0 ;;
+	exit ;;
     RM*:SINIX-*:*:*)
 	echo mips-sni-sysv4
-	exit 0 ;;
+	exit ;;
     *:SINIX-*:*:*)
 	if uname -p 2>/dev/null >/dev/null ; then
 		UNAME_MACHINE=`(uname -p) 2>/dev/null`
@@ -1001,82 +1172,107 @@
 	else
 		echo ns32k-sni-sysv
 	fi
-	exit 0 ;;
+	exit ;;
     PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
                       # says <Richard.M.Bartel@ccMail.Census.GOV>
         echo i586-unisys-sysv4
-        exit 0 ;;
+        exit ;;
     *:UNIX_System_V:4*:FTX*)
 	# From Gerald Hewes <hewes@openmarket.com>.
 	# How about differentiating between stratus architectures? -djm
 	echo hppa1.1-stratus-sysv4
-	exit 0 ;;
+	exit ;;
     *:*:*:FTX*)
 	# From seanf@swdc.stratus.com.
 	echo i860-stratus-sysv4
-	exit 0 ;;
+	exit ;;
+    i*86:VOS:*:*)
+	# From Paul.Green@stratus.com.
+	echo ${UNAME_MACHINE}-stratus-vos
+	exit ;;
     *:VOS:*:*)
 	# From Paul.Green@stratus.com.
 	echo hppa1.1-stratus-vos
-	exit 0 ;;
+	exit ;;
     mc68*:A/UX:*:*)
 	echo m68k-apple-aux${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     news*:NEWS-OS:6*:*)
 	echo mips-sony-newsos6
-	exit 0 ;;
+	exit ;;
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
 	if [ -d /usr/nec ]; then
 	        echo mips-nec-sysv${UNAME_RELEASE}
 	else
 	        echo mips-unknown-sysv${UNAME_RELEASE}
 	fi
-        exit 0 ;;
+        exit ;;
     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
 	echo powerpc-be-beos
-	exit 0 ;;
+	exit ;;
     BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
 	echo powerpc-apple-beos
-	exit 0 ;;
+	exit ;;
     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
 	echo i586-pc-beos
-	exit 0 ;;
+	exit ;;
     SX-4:SUPER-UX:*:*)
 	echo sx4-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     SX-5:SUPER-UX:*:*)
 	echo sx5-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
+    SX-6:SUPER-UX:*:*)
+	echo sx6-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-7:SUPER-UX:*:*)
+	echo sx7-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8:SUPER-UX:*:*)
+	echo sx8-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8R:SUPER-UX:*:*)
+	echo sx8r-nec-superux${UNAME_RELEASE}
+	exit ;;
     Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:Rhapsody:*:*)
 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:Darwin:*:*)
-	echo `uname -p`-apple-darwin${UNAME_RELEASE}
-	exit 0 ;;
+	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+	case $UNAME_PROCESSOR in
+	    unknown) UNAME_PROCESSOR=powerpc ;;
+	esac
+	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+	exit ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
-	if test "${UNAME_MACHINE}" = "x86pc"; then
+	UNAME_PROCESSOR=`uname -p`
+	if test "$UNAME_PROCESSOR" = "x86"; then
+		UNAME_PROCESSOR=i386
 		UNAME_MACHINE=pc
 	fi
-	echo `uname -p`-${UNAME_MACHINE}-nto-qnx
-	exit 0 ;;
+	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
+	exit ;;
     *:QNX:*:4*)
 	echo i386-pc-qnx
-	exit 0 ;;
-    NSR-[KW]:NONSTOP_KERNEL:*:*)
+	exit ;;
+    NSE-?:NONSTOP_KERNEL:*:*)
+	echo nse-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    NSR-?:NONSTOP_KERNEL:*:*)
 	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:NonStop-UX:*:*)
 	echo mips-compaq-nonstopux
-	exit 0 ;;
+	exit ;;
     BS2000:POSIX*:*:*)
 	echo bs2000-siemens-sysv
-	exit 0 ;;
+	exit ;;
     DS/*:UNIX_System_V:*:*)
 	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:Plan9:*:*)
 	# "uname -m" is not consistent, so use $cputype instead. 386
 	# is converted to i386 for consistency with other x86
@@ -1087,36 +1283,47 @@
 	    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 ;;
+	exit ;;
     *:TOPS-10:*:*)
 	echo pdp10-unknown-tops10
-	exit 0 ;;
+	exit ;;
     *:TENEX:*:*)
 	echo pdp10-unknown-tenex
-	exit 0 ;;
+	exit ;;
     KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
 	echo pdp10-dec-tops20
-	exit 0 ;;
+	exit ;;
     XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
 	echo pdp10-xkl-tops20
-	exit 0 ;;
+	exit ;;
     *:TOPS-20:*:*)
 	echo pdp10-unknown-tops20
-	exit 0 ;;
+	exit ;;
     *:ITS:*:*)
 	echo pdp10-unknown-its
-	exit 0 ;;
-    i*86:XTS-300:*:STOP)
-	echo ${UNAME_MACHINE}-unknown-stop
-	exit 0 ;;
-    i*86:atheos:*:*)
-	echo ${UNAME_MACHINE}-unknown-atheos
-	exit 0 ;;
+	exit ;;
+    SEI:*:*:SEIUX)
+        echo mips-sei-seiux${UNAME_RELEASE}
+	exit ;;
+    *:DragonFly:*:*)
+	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	exit ;;
+    *:*VMS:*:*)
+    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+	case "${UNAME_MACHINE}" in
+	    A*) echo alpha-dec-vms ; exit ;;
+	    I*) echo ia64-dec-vms ; exit ;;
+	    V*) echo vax-dec-vms ; exit ;;
+	esac ;;
+    *:XENIX:*:SysV)
+	echo i386-pc-xenix
+	exit ;;
+    i*86:skyos:*:*)
+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+	exit ;;
+    i*86:rdos:*:*)
+	echo ${UNAME_MACHINE}-pc-rdos
+	exit ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1148,7 +1355,7 @@
 #endif
 
 #if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix"); exit (0);
+  printf ("arm-acorn-riscix\n"); exit (0);
 #endif
 
 #if defined (hp300) && !defined (hpux)
@@ -1237,12 +1444,12 @@
 }
 EOF
 
-$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
-rm -f $dummy.c $dummy
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
+	{ echo "$SYSTEM_NAME"; exit; }
 
 # Apollos put the system type in the environment.
 
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
 
 # Convex versions that predate uname can use getsysinfo(1)
 
@@ -1251,22 +1458,22 @@
     case `getsysinfo -f cpu_type` in
     c1*)
 	echo c1-convex-bsd
-	exit 0 ;;
+	exit ;;
     c2*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-	exit 0 ;;
+	exit ;;
     c34*)
 	echo c34-convex-bsd
-	exit 0 ;;
+	exit ;;
     c38*)
 	echo c38-convex-bsd
-	exit 0 ;;
+	exit ;;
     c4*)
 	echo c4-convex-bsd
-	exit 0 ;;
+	exit ;;
     esac
 fi
 
@@ -1277,7 +1484,9 @@
 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/
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+and
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
 
 If the version you run ($0) is already up to date, please
 send the following data and any information you think might be
--- netmrg-0.20.orig/config.sub
+++ netmrg-0.20/config.sub
@@ -1,9 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
 #   Free Software Foundation, Inc.
 
-timestamp='2001-09-07'
+timestamp='2008-01-16'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -21,15 +22,17 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
-# Please send patches to <config-patches@gnu.org>.
+
+# 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.
@@ -69,8 +72,8 @@
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 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."
@@ -82,11 +85,11 @@
 while test $# -gt 0 ; do
   case $1 in
     --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
+       echo "$timestamp" ; exit ;;
     --version | -v )
-       echo "$version" ; exit 0 ;;
+       echo "$version" ; exit ;;
     --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
+       echo "$usage"; exit ;;
     -- )     # Stop option processing
        shift; break ;;
     - )	# Use stdin as input.
@@ -98,7 +101,7 @@
     *local*)
        # First pass through any local machine types.
        echo $1
-       exit 0;;
+       exit ;;
 
     * )
        break ;;
@@ -117,7 +120,9 @@
 # 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-*)
+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+  storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -143,7 +148,7 @@
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis)
+	-apple | -axis | -knuth | -cray)
 		os=
 		basic_machine=$1
 		;;
@@ -168,6 +173,10 @@
 	-hiux*)
 		os=-hiuxwe2
 		;;
+	-sco6)
+		os=-sco5v6
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
 	-sco5)
 		os=-sco3.2v5
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -184,6 +193,10 @@
 		# Don't forget version if it is 3.2v4 or newer.
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
+	-sco5v6*)
+		# 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/'`
@@ -226,32 +239,53 @@
 	1750a | 580 \
 	| a29k \
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+	| am33_2.0 \
+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+	| bfin \
 	| c4x | clipper \
-	| d10v | d30v | dsp16xx \
-	| fr30 \
+	| d10v | d30v | dlx | dsp16xx \
+	| fido | fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
-	| m32r | m68000 | m68k | m88k | mcore \
-	| mips16 | mips64 | mips64el | mips64orion | mips64orionel \
-	| mips64vr4100 | mips64vr4100el | mips64vr4300 \
-	| mips64vr4300el | mips64vr5000 | mips64vr5000el \
-	| mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \
-	| mipsisa32 \
+	| ip2k | iq2000 \
+	| m32c | m32r | m32rle | m68000 | m68k | m88k \
+	| maxq | mb | microblaze | mcore | mep \
+	| mips | mipsbe | mipseb | mipsel | mipsle \
+	| mips16 \
+	| mips64 | mips64el \
+	| mips64vr | mips64vrel \
+	| mips64orion | mips64orionel \
+	| mips64vr4100 | mips64vr4100el \
+	| mips64vr4300 | mips64vr4300el \
+	| mips64vr5000 | mips64vr5000el \
+	| mips64vr5900 | mips64vr5900el \
+	| mipsisa32 | mipsisa32el \
+	| mipsisa32r2 | mipsisa32r2el \
+	| mipsisa64 | mipsisa64el \
+	| mipsisa64r2 | mipsisa64r2el \
+	| mipsisa64sb1 | mipsisa64sb1el \
+	| mipsisa64sr71k | mipsisa64sr71kel \
+	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
+	| mt \
+	| msp430 \
+	| nios | nios2 \
 	| ns16k | ns32k \
-	| openrisc \
+	| or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
-	| s390 | s390x \
-	| sh | sh[34] | sh[34]eb | shbe | shle \
-	| sparc | sparc64 | sparclet | sparclite | sparcv9 | sparcv9b \
-	| stormy16 | strongarm \
-	| tahoe | thumb | tic80 | tron \
-	| v850 \
+	| score \
+	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+	| sh64 | sh64le \
+	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+	| spu | strongarm \
+	| tahoe | thumb | tic4x | tic80 | tron \
+	| v850 | v850e \
 	| we32k \
-	| x86 | xscale \
+	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
 	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
@@ -262,6 +296,9 @@
 		;;
 	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
 		;;
+	ms1)
+		basic_machine=mt-unknown
+		;;
 
 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
@@ -278,41 +315,68 @@
 	580-* \
 	| a29k-* \
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-	| alphapca5[67]-* | arc-* \
-	| arm-*  | armbe-* | armle-* | armv*-* \
-	| bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c54x-* \
-	| clipper-* | cray2-* | cydra-* \
-	| d10v-* | d30v-* \
+	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+	| avr-* | avr32-* \
+	| bfin-* | bs2000-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+	| clipper-* | craynv-* | cydra-* \
+	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
-	| f30[01]-* | f700-* | fr30-* | fx80-* \
+	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
-	| m32r-* \
-	| m68000-* | m680[01234]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | mcore-* \
-	| mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
-	| mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \
-	| mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \
-	| mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \
+	| ip2k-* | iq2000-* \
+	| m32c-* | m32r-* | m32rle-* \
+	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* \
+	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+	| mips16-* \
+	| mips64-* | mips64el-* \
+	| mips64vr-* | mips64vrel-* \
+	| mips64orion-* | mips64orionel-* \
+	| mips64vr4100-* | mips64vr4100el-* \
+	| mips64vr4300-* | mips64vr4300el-* \
+	| mips64vr5000-* | mips64vr5000el-* \
+	| mips64vr5900-* | mips64vr5900el-* \
+	| mipsisa32-* | mipsisa32el-* \
+	| mipsisa32r2-* | mipsisa32r2el-* \
+	| mipsisa64-* | mipsisa64el-* \
+	| mipsisa64r2-* | mipsisa64r2el-* \
+	| mipsisa64sb1-* | mipsisa64sb1el-* \
+	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+	| mipstx39-* | mipstx39el-* \
+	| mmix-* \
+	| mt-* \
+	| msp430-* \
+	| nios-* | nios2-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
 	| romp-* | rs6000-* \
-	| s390-* | s390x-* \
-	| sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* \
-	| sparc-* | sparc64-* | sparc86x-* | sparclite-* \
-	| sparcv9-* | sparcv9b-* | stormy16-* | strongarm-* | sv1-* \
-	| t3e-* | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
-	| v850-* | vax-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+	| sparclite-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
+	| tahoe-* | thumb-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tron-* \
+	| v850-* | v850e-* | vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xmp-* | xps100-* | xscale-* \
+	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+	| xstormy16-* | xtensa*-* \
 	| ymp-* \
 	| z8k-*)
 		;;
+	# Recognize the basic CPU types without company name, with glob match.
+	xtensa*)
+		basic_machine=$basic_machine-unknown
+		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
 	386bsd)
@@ -329,6 +393,9 @@
 		basic_machine=a29k-amd
 		os=-udi
 		;;
+    	abacus)
+		basic_machine=abacus-unknown
+		;;
 	adobe68k)
 		basic_machine=m68010-adobe
 		os=-scout
@@ -343,6 +410,12 @@
 		basic_machine=a29k-none
 		os=-bsd
 		;;
+	amd64)
+		basic_machine=x86_64-pc
+		;;
+	amd64-*)
+		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	amdahl)
 		basic_machine=580-amdahl
 		os=-sysv
@@ -374,6 +447,18 @@
 		basic_machine=ns32k-sequent
 		os=-dynix
 		;;
+	blackfin)
+		basic_machine=bfin-unknown
+		os=-linux
+		;;
+	blackfin-*)
+		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+	c90)
+		basic_machine=c90-cray
+		os=-unicos
+		;;
 	convex-c1)
 		basic_machine=c1-convex
 		os=-bsd
@@ -394,30 +479,45 @@
 		basic_machine=c38-convex
 		os=-bsd
 		;;
-	cray | ymp)
-		basic_machine=ymp-cray
+	cray | j90)
+		basic_machine=j90-cray
 		os=-unicos
 		;;
-	cray2)
-		basic_machine=cray2-cray
-		os=-unicos
+	craynv)
+		basic_machine=craynv-cray
+		os=-unicosmp
 		;;
-	[cjt]90)
-		basic_machine=${basic_machine}-cray
-		os=-unicos
+	cr16)
+		basic_machine=cr16-unknown
+		os=-elf
 		;;
 	crds | unos)
 		basic_machine=m68k-crds
 		;;
+	crisv32 | crisv32-* | etraxfs*)
+		basic_machine=crisv32-axis
+		;;
 	cris | cris-* | etrax*)
 		basic_machine=cris-axis
 		;;
+	crx)
+		basic_machine=crx-unknown
+		os=-elf
+		;;
 	da30 | da30-*)
 		basic_machine=m68k-da30
 		;;
 	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
 		basic_machine=mips-dec
 		;;
+	decsystem10* | dec10*)
+		basic_machine=pdp10-dec
+		os=-tops10
+		;;
+	decsystem20* | dec20*)
+		basic_machine=pdp10-dec
+		os=-tops20
+		;;
 	delta | 3300 | motorola-3300 | motorola-delta \
 	      | 3300-motorola | delta-motorola)
 		basic_machine=m68k-motorola
@@ -426,6 +526,10 @@
 		basic_machine=m88k-motorola
 		os=-sysv3
 		;;
+	djgpp)
+		basic_machine=i586-pc
+		os=-msdosdjgpp
+		;;
 	dpx20 | dpx20-*)
 		basic_machine=rs6000-bull
 		os=-bosx
@@ -576,6 +680,14 @@
 		basic_machine=m68k-isi
 		os=-sysv
 		;;
+	m68knommu)
+		basic_machine=m68k-unknown
+		os=-linux
+		;;
+	m68knommu-*)
+		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
 	m88k-omron*)
 		basic_machine=m88k-omron
 		;;
@@ -591,6 +703,10 @@
 		basic_machine=i386-pc
 		os=-mingw32
 		;;
+	mingw32ce)
+		basic_machine=arm-unknown
+		os=-mingw32ce
+		;;
 	miniframe)
 		basic_machine=m68000-convergent
 		;;
@@ -598,32 +714,27 @@
 		basic_machine=m68k-atari
 		os=-mint
 		;;
-	mipsel*-linux*)
-		basic_machine=mipsel-unknown
-		os=-linux-gnu
-		;;
-	mips*-linux*)
-		basic_machine=mips-unknown
-		os=-linux-gnu
-		;;
 	mips3*-*)
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
 		;;
 	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
 		;;
+	ms1-*)
+		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+		;;
 	mvs)
 		basic_machine=i370-ibm
 		os=-mvs
@@ -699,6 +810,13 @@
 		basic_machine=hppa1.1-oki
 		os=-proelf
 		;;
+	openrisc | openrisc-*)
+		basic_machine=or32-unknown
+		;;
+	os400)
+		basic_machine=powerpc-ibm
+		os=-os400
+		;;
 	OSE68000 | ose68000)
 		basic_machine=m68000-ericsson
 		os=-ose
@@ -715,55 +833,75 @@
 		basic_machine=i860-intel
 		os=-osf
 		;;
+	parisc)
+		basic_machine=hppa-unknown
+		os=-linux
+		;;
+	parisc-*)
+		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
 	pbd)
 		basic_machine=sparc-tti
 		;;
 	pbb)
 		basic_machine=m68k-tti
 		;;
-        pc532 | pc532-*)
+	pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
-	pentium | p5 | k5 | k6 | nexgen)
+	pc98)
+		basic_machine=i386-pc
+		;;
+	pc98-*)
+		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentium | p5 | k5 | k6 | nexgen | viac3)
 		basic_machine=i586-pc
 		;;
-	pentiumpro | p6 | 6x86 | athlon)
+	pentiumpro | p6 | 6x86 | athlon | athlon_*)
 		basic_machine=i686-pc
 		;;
-	pentiumii | pentium2)
+	pentiumii | pentium2 | pentiumiii | pentium3)
 		basic_machine=i686-pc
 		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-*)
+	pentium4)
+		basic_machine=i786-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-*)
+	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
+	pentium4-*)
+		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	pn)
 		basic_machine=pn-gould
 		;;
 	power)	basic_machine=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/^[^-]*-//'`
 		;;
@@ -774,6 +912,10 @@
 		basic_machine=i586-unknown
 		os=-pw32
 		;;
+	rdos)
+		basic_machine=i386-pc
+		os=-rdos
+		;;
 	rom68k)
 		basic_machine=m68k-rom68k
 		os=-coff
@@ -784,10 +926,30 @@
 	rtpc | rtpc-*)
 		basic_machine=romp-ibm
 		;;
+	s390 | s390-*)
+		basic_machine=s390-ibm
+		;;
+	s390x | s390x-*)
+		basic_machine=s390x-ibm
+		;;
 	sa29200)
 		basic_machine=a29k-amd
 		os=-udi
 		;;
+	sb1)
+		basic_machine=mipsisa64sb1-unknown
+		;;
+	sb1el)
+		basic_machine=mipsisa64sb1el-unknown
+		;;
+	sde)
+		basic_machine=mipsisa32-sde
+		os=-elf
+		;;
+	sei)
+		basic_machine=mips-sei
+		os=-seiux
+		;;
 	sequent)
 		basic_machine=i386-sequent
 		;;
@@ -795,7 +957,13 @@
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
-	sparclite-wrs)
+	sh5el)
+		basic_machine=sh5le-unknown
+		;;
+	sh64)
+		basic_machine=sh64-unknown
+		;;
+	sparclite-wrs | simso-wrs)
 		basic_machine=sparclite-wrs
 		os=-vxworks
 		;;
@@ -862,22 +1030,46 @@
 		os=-dynix
 		;;
 	t3e)
-		basic_machine=t3e-cray
+		basic_machine=alphaev5-cray
+		os=-unicos
+		;;
+	t90)
+		basic_machine=t90-cray
 		os=-unicos
 		;;
 	tic54x | c54x*)
 		basic_machine=tic54x-unknown
 		os=-coff
 		;;
+	tic55x | c55x*)
+		basic_machine=tic55x-unknown
+		os=-coff
+		;;
+	tic6x | c6x*)
+		basic_machine=tic6x-unknown
+		os=-coff
+		;;
+	tile*)
+		basic_machine=tile-unknown
+		os=-linux-gnu
+		;;
 	tx39)
 		basic_machine=mipstx39-unknown
 		;;
 	tx39el)
 		basic_machine=mipstx39el-unknown
 		;;
+	toad1)
+		basic_machine=pdp10-xkl
+		os=-tops20
+		;;
 	tower | tower-32)
 		basic_machine=m68k-ncr
 		;;
+	tpf)
+		basic_machine=s390x-ibm
+		os=-tpf
+		;;
 	udi29k)
 		basic_machine=a29k-amd
 		os=-udi
@@ -899,8 +1091,8 @@
 		os=-vms
 		;;
 	vpp*|vx|vx-*)
-               basic_machine=f301-fujitsu
-               ;;
+		basic_machine=f301-fujitsu
+		;;
 	vxworks960)
 		basic_machine=i960-wrs
 		os=-vxworks
@@ -921,17 +1113,17 @@
 		basic_machine=hppa1.1-winbond
 		os=-proelf
 		;;
-	windows32)
-		basic_machine=i386-pc
-		os=-windows32-msvcrt
-		;;
-	xmp)
-		basic_machine=xmp-cray
-		os=-unicos
+	xbox)
+		basic_machine=i686-pc
+		os=-mingw32
 		;;
-        xps | xps100)
+	xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
+	ymp)
+		basic_machine=ymp-cray
+		os=-unicos
+		;;
 	z8k-*-coff)
 		basic_machine=z8k-unknown
 		os=-sim
@@ -952,16 +1144,12 @@
 	op60c)
 		basic_machine=hppa1.1-oki
 		;;
-	mips)
-		if [ x$os = x-linux-gnu ]; then
-			basic_machine=mips-unknown
-		else
-			basic_machine=mips-mips
-		fi
-		;;
 	romp)
 		basic_machine=romp-ibm
 		;;
+	mmix)
+		basic_machine=mmix-knuth
+		;;
 	rs6000)
 		basic_machine=rs6000-ibm
 		;;
@@ -978,13 +1166,13 @@
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh3 | sh4 | sh3eb | sh4eb)
+	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
 		basic_machine=sh-unknown
 		;;
-	sparc | sparcv9 | sparcv9b)
+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
 		basic_machine=sparc-sun
 		;;
-        cydra)
+	cydra)
 		basic_machine=cydra-cydrome
 		;;
 	orion)
@@ -999,10 +1187,6 @@
 	pmac | pmac-mpw)
 		basic_machine=powerpc-apple
 		;;
-	c4x*)
-		basic_machine=c4x-none
-		os=-coff
-		;;
 	*-unknown)
 		# Make sure to match an already-canonicalized machine name.
 		;;
@@ -1058,17 +1242,23 @@
 	      | -aos* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
-	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+	      | -openbsd* | -solidbsd* \
+	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
+	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+	      | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-	      | -os2* | -vos*)
+	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1080,16 +1270,21 @@
 			;;
 		esac
 		;;
+	-nto-qnx*)
+		;;
 	-nto*)
-		os=-nto-qnx
+		os=`echo $os | sed -e 's|nto|nto-qnx|'`
 		;;
 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
 	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
 		;;
 	-mac*)
 		os=`echo $os | sed -e 's|mac|macos|'`
 		;;
+	-linux-dietlibc)
+		os=-linux-dietlibc
+		;;
 	-linux*)
 		os=`echo $os | sed -e 's|linux|linux-gnu|'`
 		;;
@@ -1102,6 +1297,9 @@
 	-opened*)
 		os=-openedition
 		;;
+        -os400*)
+		os=-os400
+		;;
 	-wince*)
 		os=-wince
 		;;
@@ -1120,14 +1318,23 @@
 	-acis*)
 		os=-aos
 		;;
+	-atheos*)
+		os=-atheos
+		;;
+	-syllable*)
+		os=-syllable
+		;;
 	-386bsd)
 		os=-bsd
 		;;
 	-ctix* | -uts*)
 		os=-sysv
 		;;
+	-nova*)
+		os=-rtmk-nova
+		;;
 	-ns2 )
-	        os=-nextstep2
+		os=-nextstep2
 		;;
 	-nsk*)
 		os=-nsk
@@ -1139,6 +1346,9 @@
 	-sinix*)
 		os=-sysv4
 		;;
+        -tpf*)
+		os=-tpf
+		;;
 	-triton*)
 		os=-sysv3
 		;;
@@ -1166,8 +1376,17 @@
 	-xenix)
 		os=-xenix
 		;;
-        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-	        os=-mint
+	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+		os=-mint
+		;;
+	-aros*)
+		os=-aros
+		;;
+	-kaos*)
+		os=-kaos
+		;;
+	-zvmoe)
+		os=-zvmoe
 		;;
 	-none)
 		;;
@@ -1191,6 +1410,12 @@
 # system, and we'll never get to this point.
 
 case $basic_machine in
+        score-*)
+		os=-elf
+		;;
+        spu-*)
+		os=-elf
+		;;
 	*-acorn)
 		os=-riscix1.2
 		;;
@@ -1200,10 +1425,14 @@
 	arm*-semi)
 		os=-aout
 		;;
+        c4x-* | tic4x-*)
+        	os=-coff
+		;;
+	# This must come before the *-dec entry.
 	pdp10-*)
 		os=-tops20
 		;;
-        pdp11-*)
+	pdp11-*)
 		os=-none
 		;;
 	*-dec | vax-*)
@@ -1224,12 +1453,18 @@
 	m68*-cisco)
 		os=-aout
 		;;
+        mep-*)
+		os=-elf
+		;;
 	mips*-cisco)
 		os=-elf
 		;;
 	mips*-*)
 		os=-elf
 		;;
+	or32-*)
+		os=-coff
+		;;
 	*-tti)	# must be before sparc entry or we get the wrong os.
 		os=-sysv3
 		;;
@@ -1239,9 +1474,15 @@
 	*-be)
 		os=-beos
 		;;
+	*-haiku)
+		os=-haiku
+		;;
 	*-ibm)
 		os=-aix
 		;;
+    	*-knuth)
+		os=-mmixware
+		;;
 	*-wec)
 		os=-proelf
 		;;
@@ -1293,19 +1534,19 @@
 	*-next)
 		os=-nextstep3
 		;;
-        *-gould)
+	*-gould)
 		os=-sysv
 		;;
-        *-highlevel)
+	*-highlevel)
 		os=-bsd
 		;;
 	*-encore)
 		os=-bsd
 		;;
-        *-sgi)
+	*-sgi)
 		os=-irix
 		;;
-        *-siemens)
+	*-siemens)
 		os=-sysv4
 		;;
 	*-masscomp)
@@ -1374,10 +1615,16 @@
 			-mvs* | -opened*)
 				vendor=ibm
 				;;
+			-os400*)
+				vendor=ibm
+				;;
 			-ptx*)
 				vendor=sequent
 				;;
-			-vxsim* | -vxworks*)
+			-tpf*)
+				vendor=ibm
+				;;
+			-vxsim* | -vxworks* | -windiss*)
 				vendor=wrs
 				;;
 			-aux*)
@@ -1401,7 +1648,7 @@
 esac
 
 echo $basic_machine$os
-exit 0
+exit
 
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
--- netmrg-0.20.orig/etc/netmrg.conf.in
+++ netmrg-0.20/etc/netmrg.conf.in
@@ -1,8 +1,11 @@
-Alias /netmrg "@localstatedir@/www/netmrg/webfiles"
-<Directory "@localstatedir@/www/netmrg/webfiles">
+Alias /netmrg "@prefix@/share/netmrg/webfiles"
+<Directory "@prefix@/share/netmrg/webfiles">
     Options Indexes
     AllowOverride None
     Order allow,deny
     Allow from all
+    <IfModule mod_php4.c>
+        php_value session.save_path /var/lib/netmrg/sessions
+    </IfModule>
 </Directory>
 
--- netmrg-0.20.orig/etc/netmrg.xml.in
+++ netmrg-0.20/etc/netmrg.xml.in
@@ -14,7 +14,7 @@
 		<runtimefile>@localstatedir@/log/netmrg/runtime</runtimefile>
 		<libexec>@libexecdir@/netmrg</libexec>
 		<rrds>@localstatedir@/lib/netmrg/rrd</rrds>
-		<webfileroot>@localstatedir@/www/netmrg</webfileroot>
+		<webfileroot>@prefix@/share/netmrg</webfileroot>
 		<locale>@datarootdir@/netmrg/locale</locale>
 	</paths>
 	<threads>
--- netmrg-0.20.orig/libexec/linuxload.sh.debdiff
+++ netmrg-0.20/libexec/linuxload.sh.debdiff
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+# usage linuxload.sh <item>
+#   item can be 1, 2, or 3
+
+if [ -f /proc/loadavg ]; then
+#	if [ "$1" = "1" �o "$1" = "2" -o "$1" = "3" ]; then
+		cat /proc/loadavg | cut -d' ' -f$1
+#	else
+#		echo "U"
+#	fi
+else
+	echo "U"
+fi
--- netmrg-0.20.orig/libexec/lmsensors.pl
+++ netmrg-0.20/libexec/lmsensors.pl
@@ -0,0 +1,28 @@
+#!/usr/bin/perl
+use strict;
+
+### argument processing
+my $sensor=$ARGV[0];
+my $hwmon=$ARGV[1] || "hwmon0";
+if (@ARGV < 1 or @ARGV > 2 or $sensor !~ /^\w+$/ or $hwmon !~ /^\w+$/)
+{
+	print "U\n";
+	print "\n";
+	print "$0 <sensor> [monitor]\n";
+	print "\n";
+	print "Reports sensor gauges for use as a NetMRG test script.\n";
+	print "\n";
+	print "Options:\n";
+	print "  sensor  Is the sensor value to report\n";
+	print "  monitor The hardware monitor the sensor is attached to, 'hwmon0' by default\n";
+	print "\n";
+	exit 1;
+}
+
+
+# read the data from the correct path
+my $path = "/sys/class/hwmon/$hwmon/device/${sensor}_input";
+open(STAT, $path) || die ("U\nERROR: couldn't open $path\n\n");
+my $value = <STAT>;
+close(STAT);
+print $value;
--- netmrg-0.20.orig/libexec/linuxpmu.sh
+++ netmrg-0.20/libexec/linuxpmu.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+# usage linuxpmu.sh <battery number> <command>
+#   battery number can be 0 or 1
+#   command can be 'charge', 'max_charge', 'current', 'voltage'
+
+if [ -f /proc/pmu/battery_$1 ]; then
+	cat /proc/pmu/battery_$1 | grep "^$2 *:" | awk -F: '{print $2}'
+else
+	echo "U"
+fi
--- netmrg-0.20.orig/bin/rrdedit.in
+++ netmrg-0.20/bin/rrdedit.in
@@ -24,17 +24,19 @@
   exit
 fi
 
+workdir="$(mktemp -d rrdedit.XXXXXXXXXX)"
+
 # dump it to temp
-$rrdtool dump $RRD_DIR/$1 > /tmp/$1.xml
+$rrdtool dump $RRD_DIR/$1 > "$workdir/$1.xml"
 
 # make a backup
-cp $RRD_DIR/$1 /tmp/$1.backup
+cp $RRD_DIR/$1 "$workdir/$1.backup"
 
 # edit the xml
-$editor /tmp/$1.xml
+$editor "$workdir/$1.xml"
 
 rm -f $RRD_DIR/$1
 
 # restore the rrd
-$rrdtool restore /tmp/$1.xml $RRD_DIR/$1
+$rrdtool restore "$workdir/$1.xml" $RRD_DIR/$1
 
--- netmrg-0.20.orig/src/monitors.cpp
+++ netmrg-0.20/src/monitors.cpp
@@ -20,6 +20,8 @@
 #include "events.h"
 #include "settings.h"
 
+#include <cstring>
+
 #ifdef OLD_MYSQL
 #define MYSQL_CONNECT(a,b,c,d,e,f,g,h) mysql_connect(a,b,c,d)
 #else
--- netmrg-0.20.orig/src/utils.cpp
+++ netmrg-0.20/src/utils.cpp
@@ -13,6 +13,7 @@
 #include <sys/types.h>
 #include <syslog.h>
 #include <ctype.h>
+#include <cstring>
 
 #include "utils.h"
 #include "db.h"
--- netmrg-0.20.orig/src/netmrg.cpp
+++ netmrg-0.20/src/netmrg.cpp
@@ -33,6 +33,7 @@
 #include <termios.h>
 #include <signal.h>
 #include <time.h>
+#include <cstring>
 
 using namespace std;
 
--- netmrg-0.20.orig/src/include/common.h
+++ netmrg-0.20/src/include/common.h
@@ -35,7 +35,9 @@
 #  include <netinet/in.h>
 #endif
 
-#include "gettext.h"
+/* steinm@debian.org: gettext.h doesn't work on amd64 */
+/* #include "gettext.h" */
+#include <libintl.h>
 #define _(String) gettext(String)
 
 #if HAVE_SYS_WAIT_H
--- netmrg-0.20.orig/debian/copyright
+++ netmrg-0.20/debian/copyright
@@ -0,0 +1,16 @@
+This package was debianized by Uwe Steinmann <steinm@debian.org> on
+Tue, 14 Sep 2004 10:42:21 +0200.
+
+It was downloaded from http://www.netmrg.net
+
+Upstream Authors: Brady Alleman and Douglas E. Warner
+
+Copyright:
+
+   Copyright (C) 2003-2007 Brady Alleman and Douglas E. Warner
+
+This project is licensed under the terms of the MIT License.
+
+This software contains a copy of xajax which is licensed under
+the GNU LESSER GENERAL PUBLIC LICENSE, Version 2.1, February 1999
+
--- netmrg-0.20.orig/debian/netmrg.doc-base
+++ netmrg-0.20/debian/netmrg.doc-base
@@ -0,0 +1,13 @@
+Document: netmrg
+Title: netmrg Manual
+Author: Brady Alleman and Douglas E. Warner
+Abstract: This manual describes what netmrg is
+ and how it can be used.
+Section: Network/Monitoring
+
+Format: text
+Files: /usr/share/doc/netmrg/netmrg.txt.gz
+
+Format: HTML
+Index: /usr/share/doc/netmrg/html/index.html
+Files: /usr/share/doc/netmrg/html/*.html
--- netmrg-0.20.orig/debian/rules
+++ netmrg-0.20/debian/rules
@@ -0,0 +1,113 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+	INSTALL_PROGRAM += -s
+endif
+
+config.status: configure
+	dh_testdir
+	# Add here commands to configure the package.
+	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --sysconfdir=/etc/netmrg --localstatedir=/var --libexecdir=/usr/lib
+
+
+build: build-stamp
+
+build-stamp:  config.status
+	dh_testdir
+
+	# Add here commands to compile the package.
+	$(MAKE)
+	#/usr/bin/docbook-to-man debian/netmrg.sgml > netmrg.1
+	(cd debian; xsltproc -''-nonet /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl rrdedit.xml)
+
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp 
+	rm -f debian/rrdedit.1
+
+	# Add here commands to clean up after the build process.
+	[ ! -f Makefile ] || $(MAKE) distclean
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+	cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+	cp -f /usr/share/misc/config.guess config.guess
+endif
+
+
+	dh_clean 
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k 
+	dh_installdirs
+
+	# Add here commands to install the package into debian/netmrg.
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/netmrg netmrg_share_docdir=/usr/share/doc/netmrg netmrg_share_htmldir=/usr/share/doc/netmrg/html netmrg_wwwdir=/usr/share/netmrg
+	cp $(CURDIR)/debian/netmrg/etc/netmrg/netmrg.xml $(CURDIR)/debian/netmrg/usr/share/netmrg/netmrg.xml.sample
+	rm -f $(CURDIR)/debian/netmrg/usr/share/doc/netmrg/INSTALL
+	rm -f $(CURDIR)/debian/netmrg/usr/share/doc/netmrg/LICENSE
+	chmod 744 $(CURDIR)/debian/netmrg/usr/share/netmrg/contrib/bindstats/dnsstats
+
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs -k share/doc/ChangeLog
+	dh_installdocs
+	dh_installexamples
+#	dh_install
+#	dh_installmenu
+	dh_installdebconf	
+#	dh_installlogrotate
+#	dh_installemacsen
+#	dh_installpam
+#	dh_installmime
+#	dh_installinit
+	dh_installcron
+#	dh_installinfo
+	dh_installman $(CURDIR)/debian/rrdedit.1
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+#	dh_perl
+#	dh_python
+#	dh_makeshlibs
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install 
--- netmrg-0.20.orig/debian/update-from-0.19.sql
+++ netmrg-0.20/debian/update-from-0.19.sql
@@ -0,0 +1,17 @@
+-- update to 0.20
+INSERT INTO updates SET update_version = '0.20', name = 'Device Properties Table', version_applied_to = '0.19', dateapplied = now();
+CREATE TABLE `dev_props` (`id` INT NOT NULL AUTO_INCREMENT, `dev_type_id` INT NOT NULL, `name` VARCHAR( 200 ) NOT NULL, `test_type` TINYINT NOT NULL, `test_id` INT NOT NULL, `test_params` VARCHAR( 150 ) NOT NULL, PRIMARY KEY ( `id` )) TYPE = MYISAM;
+
+INSERT INTO updates SET update_version = '0.20', name = 'Device Properties Values Table', version_applied_to = '0.19', dateapplied = now();
+CREATE TABLE `dev_prop_vals` ( `dev_id` INT NOT NULL, `prop_id` INT NOT NULL, `value` VARCHAR( 250 ) NOT NULL, PRIMARY KEY ( `dev_id` , `prop_id` ));
+
+INSERT INTO updates SET update_version = '0.20', name = 'SNMP Interface Cache New Fields', version_applied_to = '0.19', dateapplied = now();
+ALTER TABLE `snmp_interface_cache` ADD `nexthop` VARCHAR( 20 ) , ADD `vlan` VARCHAR( 20 ) , ADD `mode` TINYINT;
+
+INSERT INTO updates SET update_version = '0.20', name = 'Graph Item Consolidation Function Field', version_applied_to = '0.19', dateapplied = now();
+ALTER TABLE `graph_ds` ADD `cf` TINYINT NOT NULL DEFAULT '1';
+
+INSERT INTO updates SET update_version = '0.20', name = 'Device Unknowns on SNMP Restart Field', version_applied_to = '0.19', dateapplied = now();
+ALTER TABLE `devices` ADD `unknowns_on_snmp_restart` TINYINT NOT NULL DEFAULT '1';
+
+UPDATE `versioninfo` set version = '0.20' where module = 'Main';
--- netmrg-0.20.orig/debian/control
+++ netmrg-0.20/debian/control
@@ -0,0 +1,17 @@
+Source: netmrg
+Section: net
+Priority: optional
+Maintainer: Uwe Steinmann <steinm@debian.org>
+Build-Depends: rrdtool, debhelper (>= 4.1.16), debconf, libxml2-dev, libmysqlclient15-dev, libsnmp-dev, xsltproc, docbook-xsl
+Standards-Version: 3.7.2
+
+Package: netmrg
+Architecture: any
+Depends: adduser, rrdtool, apache2 | httpd, php5 | php4 | php5-cgi | php4-cgi, php5-cli | php4-cli, php5-mysql | php4-mysql, mysql-client, debconf, wwwconfig-common, ${shlibs:Depends}, ${misc:Depends}
+Suggests: mysql-server
+Description: network monitoring tool
+ NetMRG is a database-driven network monitoring
+ and graphing tool for use on Linux systems. It offers an intuitive
+ web-based configuration, customized monitoring capabilities for
+ unusual situations, a fast multi-threaded polling application, and
+ brilliant graphs rendered by RRDTOOL.
--- netmrg-0.20.orig/debian/update-from-0.17.sql
+++ netmrg-0.20/debian/update-from-0.17.sql
@@ -0,0 +1,40 @@
+ALTER TABLE `graph_ds` CHANGE `stats` `stats` SET( 'CURRENT', 'AVERAGE', 'MAXIMUM', 'SUMS', 'INTEGER', 'MULTSUM' ) DEFAULT 'CURRENT,AVERAGE,MAXIMUM' NOT NULL ;
+-- INSERT INTO updates SET update_version = '0.18.1', name = 'Graph Multiply Sum Support', version_applied_to = 'pre-0.17', dateapplied = now();
+
+INSERT INTO tests_internal VALUES (7,'SNMP Failure');
+-- INSERT INTO updates SET update_version = '0.18.1', name = 'New Internal Test - SNMP Failure', version_applied_to = 'pre-0.17', dateapplied = now();
+
+ALTER TABLE `tests_sql` ADD `timeout` INT DEFAULT '10' NOT NULL ;
+-- INSERT INTO updates SET update_version = '0.18.1', name = 'SQL Test Timeout', version_applied_to = 'pre-0.17', dateapplied = now();
+
+UPDATE `versioninfo` set version = '0.18.1' where module = 'Main';
+
+-- Update to 0.18.2
+UPDATE `versioninfo` set version = '0.18.2' where module = 'Main';
+
+-- Update to 0.19
+ALTER TABLE monitors MODIFY test_id INT NOT NULL;
+ALTER TABLE view MODIFY pos INT NOT NULL;
+INSERT INTO tests_internal VALUES (8,'Windows CPU Load');
+INSERT INTO tests_script SET name='Livingston Portmaster Active Modems', cmd='pmmodems.pl %snmp_read_community% %ip%', data_type='2';
+UPDATE graphs SET min=NULL WHERE min=0;
+UPDATE graphs SET max=NULL WHERE max=0;
+UPDATE `versioninfo` set version = '0.19' where module = 'Main';
+
+-- update to 0.20
+INSERT INTO updates SET update_version = '0.20', name = 'Device Properties Table', version_applied_to = '0.19', dateapplied = now();
+CREATE TABLE `dev_props` (`id` INT NOT NULL AUTO_INCREMENT, `dev_type_id` INT NOT NULL, `name` VARCHAR( 200 ) NOT NULL, `test_type` TINYINT NOT NULL, `test_id` INT NOT NULL, `test_params` VARCHAR( 150 ) NOT NULL, PRIMARY KEY ( `id` )) TYPE = MYISAM;
+
+INSERT INTO updates SET update_version = '0.20', name = 'Device Properties Values Table', version_applied_to = '0.19', dateapplied = now();
+CREATE TABLE `dev_prop_vals` ( `dev_id` INT NOT NULL, `prop_id` INT NOT NULL, `value` VARCHAR( 250 ) NOT NULL, PRIMARY KEY ( `dev_id` , `prop_id` ));
+
+INSERT INTO updates SET update_version = '0.20', name = 'SNMP Interface Cache New Fields', version_applied_to = '0.19', dateapplied = now();
+ALTER TABLE `snmp_interface_cache` ADD `nexthop` VARCHAR( 20 ) , ADD `vlan` VARCHAR( 20 ) , ADD `mode` TINYINT;
+
+INSERT INTO updates SET update_version = '0.20', name = 'Graph Item Consolidation Function Field', version_applied_to = '0.19', dateapplied = now();
+ALTER TABLE `graph_ds` ADD `cf` TINYINT NOT NULL DEFAULT '1';
+
+INSERT INTO updates SET update_version = '0.20', name = 'Device Unknowns on SNMP Restart Field', version_applied_to = '0.19', dateapplied = now();
+ALTER TABLE `devices` ADD `unknowns_on_snmp_restart` TINYINT NOT NULL DEFAULT '1';
+
+UPDATE `versioninfo` set version = '0.20' where module = 'Main';
--- netmrg-0.20.orig/debian/templates
+++ netmrg-0.20/debian/templates
@@ -0,0 +1,114 @@
+Template: netmrg/webserver
+Type: select
+_choices: None, Apache2, Apache, Apache-SSL, All
+_description: Web server to configure:
+
+Template: netmrg/db/host
+Type: string
+_default: localhost
+_description: Host name of the mysql database server:
+
+Template: netmrg/db/name
+Type: string
+_default: netmrg
+_description: Name for the database:
+
+Template: netmrg/db/exists
+Type: note
+_default:
+_description: The database already exists
+ A simple test revealed that a database with the name "${dbname}"
+ already exists and appears to be a netmrg database. If you really
+ like to use this database then confirm the name in the next step.
+
+Template: netmrg/db/user/name
+Type: string
+_default: netmrg
+_description: Name of the database user:
+ This user will have read/write access to the netmrg database.
+
+Template: netmrg/db/user/password
+Type: password
+_default: 
+_description: Password of the database user:
+
+Template: netmrg/db/user/password/confirm
+Type: password
+_default: 
+_description: Confirm the password of the database user:
+
+Template: netmrg/db/user/password/mismatch
+Type: text
+_default: 
+_description: Password mismatch
+ The database user passwords you entered didn't match. Please try again.
+
+Template: netmrg/db/admin/name
+Type: string
+_default:
+_description: Name of the database system administrator:
+ In order to be able to create the initial database and database user
+ for netmrg, the account name of the database system administrator
+ is needed.
+
+Template: netmrg/db/admin/password
+Type: password
+_default: 
+_description: Password of the database system administrator:
+
+Template: netmrg/web/host
+Type: string
+_default:
+_description: Name of web host:
+ netmrg's user interface is web based. The hostname of the web server
+ is used for urls within the netmrg web interface. Leaving this
+ entry field empty is usually a good choice.
+
+Template: netmrg/company/name
+Type: string
+_default:
+_description: Name of your company:
+ The web front end of netmrg shows the name of your company in the header
+ of each web page.
+
+Template: netmrg/company/link
+Type: string
+_default: http://
+_description: Url of your companies website:
+ Clicking on the company name will follow a link. It is usualy
+ the url pointing to the start page of your company's web site.
+
+Template: netmrg/postrm
+Type: boolean
+_default: true
+_description: Delete data after purging software?
+ Purging a package usually removes all data collected by the software
+ including the log files.
+ Choose 'no' if you would like to keep the mysql database and
+ the datafiles even if the netmrg package is purged sometime in the
+ future.
+
+Template: netmrg/configuration/note
+Type: note
+_default: 
+_description: Package configuration note
+ The package has been successfully installed and configured. Point your
+ webbrowser towards http://${site}/netmrg/ and log in as user 'admin'
+ with the password 'nimda'. Make sure to change the password as soon
+ as possible since it is the default password for all netmrg installations.
+
+Template: netmrg/db/generation_error
+Type: note
+_default: 
+_description: Error while creating database
+
+Template: netmrg/db/usergen_error
+Type: note
+_default: 
+_description: Error while creating database user
+
+Template: netmrg/db/tablegen_error
+Type: note
+_default: 
+_description: Error while creating database tables
+
--- netmrg-0.20.orig/debian/README.Debian
+++ netmrg-0.20/debian/README.Debian
@@ -0,0 +1,11 @@
+netmrg for Debian
+-----------------
+
+netmrg for debian tries to handle all configuration options by debconf.
+If you update from an earlier version everything is taken care of, including
+updates to the database. There is no need to run netmrg's own updater,
+thought it shouldn't harm.
+In case the automatic update of the database fails, you can always run
+the updater from netmrg.
+
+ -- Uwe Steinmann <steinm@debian.org>, Tue, 14 Sep 2004 10:42:21 +0200
--- netmrg-0.20.orig/debian/update-from-0.18.2.sql
+++ netmrg-0.20/debian/update-from-0.18.2.sql
@@ -0,0 +1,26 @@
+-- Update to 0.19
+ALTER TABLE monitors MODIFY test_id INT NOT NULL;
+ALTER TABLE view MODIFY pos INT NOT NULL;
+INSERT INTO tests_internal VALUES (8,'Windows CPU Load');
+INSERT INTO tests_script SET name='Livingston Portmaster Active Modems', cmd='pmmodems.pl %snmp_read_community% %ip%', data_type='2';
+UPDATE graphs SET min=NULL WHERE min=0;
+UPDATE graphs SET max=NULL WHERE max=0;
+UPDATE `versioninfo` set version = '0.19' where module = 'Main';
+
+-- update to 0.20
+INSERT INTO updates SET update_version = '0.20', name = 'Device Properties Table', version_applied_to = '0.19', dateapplied = now();
+CREATE TABLE `dev_props` (`id` INT NOT NULL AUTO_INCREMENT, `dev_type_id` INT NOT NULL, `name` VARCHAR( 200 ) NOT NULL, `test_type` TINYINT NOT NULL, `test_id` INT NOT NULL, `test_params` VARCHAR( 150 ) NOT NULL, PRIMARY KEY ( `id` )) TYPE = MYISAM;
+
+INSERT INTO updates SET update_version = '0.20', name = 'Device Properties Values Table', version_applied_to = '0.19', dateapplied = now();
+CREATE TABLE `dev_prop_vals` ( `dev_id` INT NOT NULL, `prop_id` INT NOT NULL, `value` VARCHAR( 250 ) NOT NULL, PRIMARY KEY ( `dev_id` , `prop_id` ));
+
+INSERT INTO updates SET update_version = '0.20', name = 'SNMP Interface Cache New Fields', version_applied_to = '0.19', dateapplied = now();
+ALTER TABLE `snmp_interface_cache` ADD `nexthop` VARCHAR( 20 ) , ADD `vlan` VARCHAR( 20 ) , ADD `mode` TINYINT;
+
+INSERT INTO updates SET update_version = '0.20', name = 'Graph Item Consolidation Function Field', version_applied_to = '0.19', dateapplied = now();
+ALTER TABLE `graph_ds` ADD `cf` TINYINT NOT NULL DEFAULT '1';
+
+INSERT INTO updates SET update_version = '0.20', name = 'Device Unknowns on SNMP Restart Field', version_applied_to = '0.19', dateapplied = now();
+ALTER TABLE `devices` ADD `unknowns_on_snmp_restart` TINYINT NOT NULL DEFAULT '1';
+
+UPDATE `versioninfo` set version = '0.20' where module = 'Main';
--- netmrg-0.20.orig/debian/changelog
+++ netmrg-0.20/debian/changelog
@@ -0,0 +1,227 @@
+netmrg (0.20-2.1ubuntu1) intrepid; urgency=low
+
+  * Revert the change to the build-dependency on rrdtool, as we don't
+    have a new enough rrdtool to satisfy it, but ours is old enough
+    that it never caused the problem in the first place. This change
+    can be dropped when merging, assuming we have the new rrdtool.
+
+ -- James Westby <james.westby@canonical.com>  Fri, 10 Oct 2008 15:04:23 +0100
+
+netmrg (0.20-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Version rrdtool build-dependency to >= 1.3.1-4 to avoid
+    rrdtool segfaults during build. (Closes: #494221)
+
+ -- Thomas Viehmann <tv@beamnet.de>  Fri, 03 Oct 2008 23:03:33 +0200
+
+netmrg (0.20-2) unstable; urgency=low
+
+  * Create temp directory in rrdedit (Closes: #496384)
+
+ -- Uwe Steinmann <steinm@debian.org>  Fri, 28 Aug 2008 16:28:06 +0200
+
+netmrg (0.20-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Uwe Steinmann <steinm@debian.org>  Fri, 02 May 2008 09:00:22 +0200
+
+netmrg (0.19-4.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix gcc-4.3 FTBFS, patch by KiBi (Closes: #455445)
+
+ -- Marc 'HE' Brockschmidt <he@debian.org>  Sun, 16 Mar 2008 19:12:14 +0100
+
+netmrg (0.19-4) unstable; urgency=low
+
+  * netmrg-gather is less verbose when run in cron job to prevent
+    sending a mail every five minutes (Closes: #445027)
+
+ -- Uwe Steinmann <steinm@debian.org>  Wed, 03 Oct 2007 22:55:42 +0200
+
+netmrg (0.19-3) unstable; urgency=low
+
+  * do not check if /usr/share/debconf/confmodule is executable
+    in postrm, because it isn't. Only check if it is present.
+
+ -- Uwe Steinmann <steinm@debian.org>  Wed, 29 Aug 2007 16:48:32 +0200
+
+netmrg (0.19-2) unstable; urgency=low
+
+  * do not include gettext.h in src/include/common.h because it doesn't
+    compile on amd64. include libintl.h instead (closes: #439653)
+
+ -- Uwe Steinmann <steinm@debian.org>  Wed, 29 Aug 2007 15:58:33 +0200
+
+netmrg (0.19-1) unstable; urgency=low
+
+  * New upstream release
+  * fixed many lintian errors in deb conf questions
+  * fixed linitan error debian-rules-ignores-make-clean-error
+  * updated translation of debconf po files (Closes: #429347)
+
+ -- Uwe Steinmann <steinm@debian.org>  Wed, 22 Aug 2007 15:10:21 +0200
+
+netmrg (0.18.2-17) unstable; urgency=low
+
+  * set home of new user netmrg to /var/lib/netmrg
+  * added configuration for php5 in apache config file netmrg.conf
+  * setting min/max value of graphs no longer fails. Backport from
+    version 0.19. (Closes: #412548)
+
+ -- Uwe Steinmann <steinm@debian.org>  Tue, 29 May 2007 12:25:25 +0200
+
+netmrg (0.18.2-16) unstable; urgency=low
+
+  * Added new script linuxpmu.sh to read data from /proc/pmu
+  * Fixed error in sql statement in conditions.php because the
+    field name 'condition' is a reserved word.
+  * Fixed lintian error in netmrg.doc-base by removing empty
+    lines from the end of the file
+
+ -- Uwe Steinmann <steinm@debian.org>  Mon, 28 May 2007 12:56:05 +0200
+
+netmrg (0.18.2-15) unstable; urgency=low
+
+  * netmrg_cron.sh doesn't stumple over a stale logfile anymore
+    (Closes: #386109)
+  * added script to get cpu temperature reported by lmsensors (Closes: #412555)
+    many thanks to Francois Gouget for providing this script
+  * improved script linux26diskaccess.pl can now also report the number
+    of read/written blocks (Closes: #412549)
+    many thanks to Francois Gouget for providing the improved script
+
+ -- Uwe Steinmann <steinm@debian.org>  Sun, 20 May 2007 19:08:40 +0200
+
+netmrg (0.18.2-14.1) unstable; urgency=high
+
+  * Non-maintainer upload during BSP.
+  * Fix unconditional use of debconf in postrm (Closes: #417011).
+  * Add php5 alternatives to dependencies (Closes: #424801).
+
+ -- Luk Claes <luk@debian.org>  Sat, 19 May 2007 17:45:35 +0200
+
+netmrg (0.18.2-14) unstable; urgency=low
+
+  * Rebuild against the new libmysqlclient15off with correct symbols.
+    (Ubuntu patch)
+  * added portugese translation (Closes: #375050)
+  * fixed name of text documentation in doc-base.
+
+ -- Uwe Steinmann <steinm@debian.org>  Fri, 28 Jul 2006 07:56:04 +0200
+
+netmrg (0.18.2-13) unstable; urgency=low
+
+  * Build-Depend on libmysqlclient15-dev (Closes: #343786)
+
+ -- Uwe Steinmann <steinm@debian.org>  Tue, 20 Dec 2005 09:12:44 +0100
+
+netmrg (0.18.2-12) unstable; urgency=low
+
+  * Build-Depend on libmysqlclient14
+  * Fixed mysql dump to work with new mysql versions
+    (Closes: #334436, #334436)
+  * Do not remove the database user in case of failure during configuration
+    if the user was not created by postinst itself
+
+ -- Uwe Steinmann <steinm@debian.org>  Tue, 18 Oct 2005 19:48:15 +0200
+
+netmrg (0.18.2-11) unstable; urgency=low
+
+  * run cronjob only if /usr/bin/netmrg_cron.sh is present
+
+ -- Uwe Steinmann <steinm@debian.org>  Tue, 13 Sep 2005 08:39:16 +0200
+
+netmrg (0.18.2-10.1) unstable; urgency=medium
+
+  * NMU during BSP.
+  * var/lib/rrd/zero.xml: Update for rrdtool 1.2.  Closes: #323725.
+  * Link against libsnmp9.
+
+ -- Matej Vela <vela@debian.org>  Mon, 12 Sep 2005 10:56:24 +0200
+
+netmrg (0.18.2-10) unstable; urgency=low
+
+  * be more tidy in clean target of debian/rules
+  * move web files from /var/www to /usr/share/netmrg
+
+ -- Uwe Steinmann <steinm@debian.org>  Tue, 19 Jul 2005 08:54:16 +0200
+
+netmrg (0.18.2-9) unstable; urgency=low
+
+  * added vietnamese translation of debconf template (Closes: #315915)
+
+ -- Uwe Steinmann <steinm@debian.org>  Mon, 27 Jun 2005 10:29:10 +0200
+
+netmrg (0.18.2-8) unstable; urgency=low
+
+  * added missing dependency on mysql-client (Closes: #313660)
+  * fixed typo in debian/po/de.po (Closes: #313947)
+
+ -- Uwe Steinmann <steinm@debian.org>  Wed, 15 Jun 2005 07:38:04 +0200
+
+netmrg (0.18.2-7) unstable; urgency=low
+
+  * added czech translation of debconf template (Closes: #309077)
+
+ -- Uwe Steinmann <steinm@debian.org>  Wed, 18 May 2005 10:32:41 +0100
+
+netmrg (0.18.2-6) unstable; urgency=low
+
+  * depend on adduser since it is used in postinst
+
+ -- Uwe Steinmann <steinm@debian.org>  Tue, 10 May 2005 10:16:21 +0100
+
+netmrg (0.18.2-5) unstable; urgency=low
+
+  * added french translation of debconf template (Closes: #306233)
+  * make it build depend on libmysqlclient12-dev
+
+ -- Uwe Steinmann <steinm@debian.org>  Fri,  6 May 2005 11:01:47 +0100
+
+netmrg (0.18.2-4) unstable; urgency=low
+
+  * fixed error when creating new user netmrg
+  * set shell of user netmrg to /bin/bash in case the user already exists
+  * restart web server after installation and deinstallation
+  * delete user when purging the package
+  * added one missing german translation
+  * remove log files if user gave permission during configuration
+  * allow changing password of netmrg user during reconfiguration
+  * actually rewrite the netmrg configuration file after reconfiguration
+
+ -- Uwe Steinmann <steinm@debian.org>  Tue,  15 Feb 2005 14:30:05 +0100
+
+netmrg (0.18.2-3) unstable; urgency=low
+
+  * new user netmrg gets real shell to make crontab work
+
+ -- Uwe Steinmann <steinm@debian.org>  Tue,  15 Feb 2005 10:10:15 +0100
+
+netmrg (0.18.2-2) unstable; urgency=low
+
+  * Added support for apache2
+
+ -- Uwe Steinmann <steinm@debian.org>  Tue,  8 Feb 2005 08:23:51 +0100
+
+netmrg (0.18.2-1) unstable; urgency=low
+
+  * New upstream release
+  * First official debian release (Closes: #271924)
+
+ -- Uwe Steinmann <steinm@debian.org>  Fri, 14 Jan 2005 16:07:24 +0100
+
+netmrg (0.18.1-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Uwe Steinmann <steinm@debian.org>  Wed,  3 Nov 2004 18:53:19 +0100
+
+netmrg (0.17-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Uwe Steinmann <steinm@debian.org>  Tue, 14 Sep 2004 10:42:21 +0200
+
--- netmrg-0.20.orig/debian/cron.d
+++ netmrg-0.20/debian/cron.d
@@ -0,0 +1,4 @@
+#
+# Regular cron jobs for the netmrg package
+#
+*/5 * * * * netmrg test -x /usr/bin/netmrg-gatherer && /usr/bin/netmrg-gatherer -l31
--- netmrg-0.20.orig/debian/compat
+++ netmrg-0.20/debian/compat
@@ -0,0 +1 @@
+4
--- netmrg-0.20.orig/debian/postinst
+++ netmrg-0.20/debian/postinst
@@ -0,0 +1,205 @@
+#! /bin/sh
+# postinst script for netmrg
+#
+# 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
+#
+
+. /usr/share/debconf/confmodule
+
+if [ "$DPKG_DEBUG" = "developer" ]; then
+	set -x
+fi
+
+if ! id netmrg > /dev/null 2>&1; then
+	adduser --system --ingroup www-data --home /var/lib/netmrg --shell /bin/bash --gecos netmrg netmrg
+else
+	# There has been previous inoffical version where the shell had been
+	# set to /bin/false. This causes problems when running the crontab entry.
+	chsh -s /bin/bash netmrg
+fi
+
+get_db_params () {
+  db_get "netmrg/db/host"
+  dbserver="$RET"
+  db_get "netmrg/db/name"
+  dbname="$RET"
+  db_get "netmrg/db/admin/name"
+  dbadmin="$RET"
+  db_get "netmrg/db/admin/password"
+  dbadmpass="$RET"
+  db_get "netmrg/db/user/name"
+  dbuser="$RET"
+  db_get "netmrg/db/user/password"
+  dbpass="$RET"
+  db_get "netmrg/web/host"
+  webhost="$RET"
+  db_get "netmrg/company/name"
+  companyname="$RET"
+  db_get "netmrg/company/link"
+  companylink="$RET"
+}
+
+case "$1" in
+    configure)
+
+			chown -R netmrg:www-data /var/lib/netmrg
+			chown -R netmrg:www-data /var/log/netmrg
+			if [ ! -d "/var/lib/netmrg/sessions" ] ; then
+				mkdir -p /var/lib/netmrg/sessions
+			fi
+			chown -R www-data:www-data /var/lib/netmrg/sessions
+			chmod 700 /var/lib/netmrg/sessions
+
+			config="/etc/netmrg/netmrg.xml"
+			if [ -s $config ] ; then
+				template=$config
+			else
+				template="/usr/share/netmrg/netmrg.xml.sample"
+			fi
+
+			# Get the web server type.
+			db_get "netmrg/webserver"
+			webserver="$RET"
+			case $webserver in
+				Apache2)		webservers="apache2" ;;
+				Apache)		webservers="apache" ;;
+				Apache-SSL)	webservers="apache-ssl" ;;
+				All)		webservers="apache2 apache apache-ssl" ;;
+				*)		webservers="" ;;
+			esac
+			. /usr/share/wwwconfig-common/php.get
+			. /usr/share/wwwconfig-common/apache-run.get
+
+			# Set up web server.
+			for server in $webservers ; do
+				# prefer conf.d over monolithic form
+				if [ -d "/etc/${server}/conf.d" ] ; then
+					rm -f "/etc/${server}/conf.d/netmrg.conf"
+					if [ ! -e "/etc/${server}/conf.d/netmrg.conf" ] ; then
+						ln -s /etc/netmrg/netmrg.conf "/etc/${server}/conf.d/netmrg.conf"
+					fi
+					restart="$server $restart"
+				else
+					includefile="/etc/netmrg/netmrg.conf"
+					. /usr/share/wwwconfig-common/apache-include_all.sh
+					test "$status" = "uncomment" -o "$status" = "include" && restart="$server $restart"
+				fi
+				
+				for index in index.php; do
+					. /usr/share/wwwconfig-common/apache-index_all.sh
+					test "$status" = "added" && restart="$server $restart"
+				done
+			done
+
+			# Setup the database.
+			get_db_params
+			. /usr/share/wwwconfig-common/mysql-createdb.sh
+			dbcreatestatus=$status
+			if [ "$status" = "create" ]; then
+				if eval $mysqlcmd -f mysql -e '"select User from user;"' | grep $dbuser >/dev/null 2>&1 ; then
+					userexists=true
+				else
+					userexists=false
+				fi
+				. /usr/share/wwwconfig-common/mysql-createuser.sh
+				if [ "$status" != "error" ]; then
+					# Check for one table
+					if ! eval $mysqlcmd $dbname -e '"show tables;"' | grep graphs >/dev/null 2>&1 ; then
+						if ! eval $mysqlcmd $dbname < /usr/share/netmrg/db/netmrg.mysql > /dev/null 2>&1 ; then
+							status=error
+						else
+							status=exec
+						fi
+						if [ "$status" != "exec" ]; then
+							db_fset netmrg/db/tablegen_error seen false
+							db_input high netmrg/db/tablegen_error || true
+							db_go
+							. /usr/share/wwwconfig-common/mysql-dropdb.sh
+							if [ "$userexists" != "true" ]; then
+								. /usr/share/wwwconfig-common/mysql-dropuser.sh
+							fi
+						fi
+					fi
+
+				else
+					db_reset "netmrg/db/admin/password"
+					db_fset netmrg/db/usergen_error seen false
+					db_input high netmrg/db/usergen_error || true
+					db_go
+					# Only delete the database when it was created in this script
+					if [ $dbcreatestatus = "create" ] ; then
+						. /usr/share/wwwconfig-common/mysql-dropdb.sh
+					fi
+				fi
+
+			elif [ "$status" = "nothing" ]; then
+				# run createuser in case the password has been changed during
+				# a reconfiguration of the package
+				. /usr/share/wwwconfig-common/mysql-createuser.sh
+				oldvers=$(eval "$mysqlcmd $dbname -e 'select module, version from versioninfo'" | grep Main | awk '{print $2}')
+				if [ -f /usr/share/doc/netmrg/update-from-$oldvers.sql ] ; then
+					echo "Updating from version $oldvers."
+					sqlfile=/usr/share/doc/netmrg/update-from-$oldvers.sql
+					. /usr/share/wwwconfig-common/mysql-exec.sh
+					if [ $status = "execerror" ] ; then
+						echo "Updating from version $oldvers failed!"
+					fi
+				else
+					echo "No update for database needed."
+				fi
+			else
+				db_reset "netmrg/db/admin/password"
+				db_fset netmrg/db/generation_error seen false
+				db_input high netmrg/db/generation_error || true
+				db_go
+			fi
+
+			# Everything fine so far. Now create an new config file
+			TEMPFILE=`tempfile -s .netmrg_install.tmp` && chown root:www-data $TEMPFILE && chmod 640 $TEMPFILE
+			sed "s:^\(.*\)<host>\(.*\)</host>:\1<host>$dbserver</host>:g" $template | \
+			sed "s:^\(.*\)<user>\(.*\)</user>:\1<user>$dbuser</user>:g" | \
+			sed "s|^\(.*\)<password>\(.*\)</password>|\1<password>$dbpass</password>|g" | \
+			sed "s:^\(.*\)<db>\(.*\)</db>:\1<db>$dbname</db>:g" | \
+			sed "s|^\(.*\)<webhost>\(.*\)</webhost>|\1<webhost>$webhost</webhost>|g" | \
+			sed "s|^\(.*\)<webroot>\(.*\)</webroot>|\1<webroot>/netmrg</webroot>|g" | \
+			sed "s|^\(.*\)<company>\(.*\)</company>|\1<company>$companyname</company>|g" | \
+			sed "s|^\(.*\)<companylink>\(.*\)</companylink>|\1<companylink>$companylink</companylink>|g" > \
+			$TEMPFILE && mv $TEMPFILE $config
+
+			# Restart the servers that need to be restarted
+			servers="apache-ssl apache apache2 mysql"
+			. /usr/share/wwwconfig-common/restart.sh
+
+    ;;
+
+    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
+
+
--- netmrg-0.20.orig/debian/postrm
+++ netmrg-0.20/debian/postrm
@@ -0,0 +1,165 @@
+#! /bin/sh
+# postrm script for netmrg
+#
+# 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
+
+if [ "$DPKG_DEBUG" = "developer" ]; then
+	set -x
+fi
+
+if [ -f /usr/share/debconf/confmodule ]; then
+	. /usr/share/debconf/confmodule
+	db_version 2.0
+	
+	db_get "netmrg/webserver" || true
+	webserver="$RET"
+	
+	# Allows us to loop and substitute in one pass
+	case $webserver in
+		Apache2)		webservers="apache2" ;;
+		Apache)		webservers="apache" ;;
+		Apache-SSL)	webservers="apache-ssl" ;;
+		All)		webservers="apache2 apache apache-ssl" ;;
+		*)		webservers="" ;;
+	esac
+fi
+includefile=/etc/netmrg/netmrg.conf
+
+case "$1" in
+	purge)
+		if [ -f /usr/share/debconf/confmodule ]; then
+			db_get "netmrg/postrm"
+			if [ "$RET" = "true" ] ; then
+				# Get database configuration
+				db_get "netmrg/db/user/name"
+				dbuser="$RET"
+				db_get "netmrg/db/user/password"
+				dbpass="$RET"
+				db_get "netmrg/db/host"
+				dbserver="$RET"
+				db_get "netmrg/db/name"
+				dbname="$RET"
+				db_get "netmrg/db/admin/name"
+				dbadmin="$RET"
+				db_reset "netmrg/db/admin/password"
+				db_input critical "netmrg/db/admin/password" || true
+				db_go || true
+				db_get "netmrg/db/admin/password"
+				dbadmpass="$RET"
+				if [ -e /usr/share/wwwconfig-common/mysql-dropdb.sh ] ; then
+				  . /usr/share/wwwconfig-common/mysql-dropdb.sh
+				else
+				  echo "Cannot drop database (can't find wwwconfig-common script)." >&2
+				fi
+				if [ -e /usr/share/wwwconfig-common/mysql-dropuser.sh ] ; then
+				  . /usr/share/wwwconfig-common/mysql-dropuser.sh
+				else
+				  echo "Cannot drop user (can't find wwwconfig-common script)." >&2
+				fi
+	
+				rm -rf /var/lib/netmrg
+				rm -rf /var/log/netmrg
+	
+				# Get rid of the user if the package is purged
+				if getent passwd netmrg >/dev/null; then
+					if [ -x /usr/sbin/userdel ]; then
+						/usr/sbin/userdel netmrg
+					fi
+				fi
+			fi
+
+			for server in $webservers ; do
+				# prefer conf.d over monolithic form
+				if [ -d "/etc/${server}/conf.d" ] ; then
+					if [ -L "/etc/${server}/conf.d/netmrg.conf" ] ; then
+						rm "/etc/${server}/conf.d/netmrg.conf"
+						status="purge"
+					fi
+				else
+					conffile="/etc/$server/httpd.conf"
+					if [ -e /usr/share/wwwconfig-common/apache-uninclude.sh ] ; then
+						. /usr/share/wwwconfig-common/apache-uninclude.sh
+					else
+						echo "Cannot uninclude apache config part (can't find wwwconfig-common script)." >&2
+					fi
+				fi
+				if [ "$status" = "purge" ] ; then
+					restart="$restart $server"
+				fi
+			done
+		fi
+
+		rm -rf /etc/netmrg
+		servers="apache-ssl apache apache2 mysql"
+		if [ -e /usr/share/wwwconfig-common/restart.sh ] ; then
+			. /usr/share/wwwconfig-common/restart.sh ||
+					echo "Could not restart servers (wwwconfig-common script failed)." >&2
+		else
+			echo "Cannot restart servers (can't find wwwconfig-common script)." >&2
+		fi
+		rm -rf /var/lib/netmrg/sessions
+
+	;;
+	remove)
+		if [ -f /usr/share/debconf/confmodule ]; then
+			for server in $webservers ; do
+				# prefer conf.d over monolithic form
+				if [ -d "/etc/${server}/conf.d" ] ; then
+					if [ -L "/etc/${server}/conf.d/netmrg.conf" ] ; then
+						rm "/etc/${server}/conf.d/netmrg.conf"
+						status="purge"
+					fi
+				else
+					conffile="/etc/$server/httpd.conf"
+					if [ -e /usr/share/wwwconfig-common/apache-uninclude.sh ] ; then
+						. /usr/share/wwwconfig-common/apache-uninclude.sh
+					else
+						echo "Cannot uninclude apache config part (can't find wwwconfig-common script)." >&2
+					fi
+				fi
+				if [ "$status" = "purge" ] ; then
+					restart="$restart $server"
+				fi
+			done
+		fi
+
+		servers="apache-ssl apache apache2 mysql"
+		if [ -e /usr/share/wwwconfig-common/restart.sh ] ; then
+		  . /usr/share/wwwconfig-common/restart.sh ||
+		      echo "Could not restart servers (wwwconfig-common script failed)." >&2
+		else
+		  echo "Cannot restart servers (can't find wwwconfig-common script)." >&2
+		fi
+		rm -rf /var/lib/netmrg/sessions
+
+	;;
+	upgrade)
+	;;
+	failed-upgrade|abort-install|abort-upgrade|disappear)
+	;;
+	*)
+		echo "postrm called with unknown argument \`$1'" >&2
+		exit 0
+	;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
--- netmrg-0.20.orig/debian/rrdedit.xml
+++ netmrg-0.20/debian/rrdedit.xml
@@ -0,0 +1,120 @@
+<?xml version='1.0' encoding='ISO-8859-1'?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+
+<!--
+
+Process this file with an XSLT processor: `xsltproc \
+-''-nonet /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/\
+manpages/docbook.xsl manpage.dbk'.  A manual page
+<package>.<section> will be generated.  You may view the
+manual page with: nroff -man <package>.<section> | less'.  A
+typical entry in a Makefile or Makefile.am is:
+
+DB2MAN=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/\
+manpages/docbook.xsl
+XP=xsltproc -''-nonet
+
+manpage.1: manpage.dbk
+        $(XP) $(DB2MAN) $<
+    
+The xsltproc binary is found in the xsltproc package.  The
+XSL files are in docbook-xsl.  Please remember that if you
+create the nroff version in one of the debian/rules file
+targets (such as build), you will need to include xsltproc
+and docbook-xsl in your Build-Depends control field.
+
+-->
+
+  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
+  <!ENTITY dhfirstname "<firstname>Uwe</firstname>">
+  <!ENTITY dhsurname   "<surname>Steinmann</surname>">
+  <!-- Please adjust the date whenever revising the manpage. -->
+  <!ENTITY dhdate      "<date>September 14, 2004</date>">
+  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
+       allowed: see man(7), man(1). -->
+  <!ENTITY dhsection   "<manvolnum>1</manvolnum>">
+  <!ENTITY dhemail     "<email>steinm@debian.org</email>">
+  <!ENTITY dhusername  "Uwe Steinmann">
+  <!ENTITY dhucpackage "<refentrytitle>RRDEDIT</refentrytitle>">
+  <!ENTITY dhpackage   "rrdedit">
+
+  <!ENTITY debian      "<productname>Debian</productname>">
+  <!ENTITY gnu         "<acronym>GNU</acronym>">
+  <!ENTITY gpl         "&gnu; <acronym>GPL</acronym>">
+]>
+
+<refentry>
+  <refentryinfo>
+    <address>
+      &dhemail;
+    </address>
+    <author>
+      &dhfirstname;
+      &dhsurname;
+    </author>
+    <copyright>
+      <year>2004</year>
+      <holder>&dhusername;</holder>
+    </copyright>
+    &dhdate;
+  </refentryinfo>
+  <refmeta>
+    &dhucpackage;
+
+    &dhsection;
+  </refmeta>
+  <refnamediv>
+    <refname>&dhpackage;</refname>
+
+    <refpurpose>program to edit rrd files</refpurpose>
+  </refnamediv>
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>&dhpackage;</command>
+
+      <arg>FILE</arg>
+    </cmdsynopsis>
+  </refsynopsisdiv>
+  <refsect1>
+    <title>DESCRIPTION</title>
+
+    <para>This manual page documents briefly the
+      <command>&dhpackage;</command> command.</para>
+
+    <para>This manual page was written for the &debian; distribution
+      because the original program does not have a manual page.
+      Instead, it has documentation in the &gnu;
+      <application>Info</application> format; see below.</para>
+
+    <para><command>&dhpackage;</command> is a program to edit rrd files.
+      It uses <command>rrdtool</command> to create an xml export file
+      from the rrd-file, calls <command>vi</command> to modify it and
+      restores it afterwards.
+      The filename passed to the program must be relative to
+      <filename>/var/lib/netmrg/rrd</filename>.</para>
+
+  </refsect1>
+  <refsect1>
+    <title>SEE ALSO</title>
+
+    <para>rrddump (1).</para>
+
+  </refsect1>
+  <refsect1>
+    <title>AUTHOR</title>
+
+    <para>This manual page was written by &dhusername; &dhemail; for
+      the &debian; system (but may be used by others).  Permission is
+      granted to copy, distribute and/or modify this document under
+      the terms of the &gnu; General Public License, Version 2 any 
+   	  later version published by the Free Software Foundation.
+    </para>
+	<para>
+	  On Debian systems, the complete text of the GNU General Public
+	  License can be found in /usr/share/common-licenses/GPL.
+	</para>
+
+  </refsect1>
+</refentry>
+
--- netmrg-0.20.orig/debian/watch
+++ netmrg-0.20/debian/watch
@@ -0,0 +1,6 @@
+# Example watch control file for uscan
+# Rename this file to "watch" and then you can run the "uscan" command
+# to check for upstream updates and more.
+# Site		Directory		Pattern			Version	Script
+version=2
+http://www.netmrg.net/download/release/netmrg-([\d\.]*)\.tar\.gz	debian	uupdate
--- netmrg-0.20.orig/debian/docs
+++ netmrg-0.20/debian/docs
@@ -0,0 +1,2 @@
+README
+debian/update-from-*.sql
--- netmrg-0.20.orig/debian/update-from-0.18.1.sql
+++ netmrg-0.20/debian/update-from-0.18.1.sql
@@ -0,0 +1,28 @@
+UPDATE `versioninfo` set version = '0.18.2' where module = 'Main';
+
+-- Update to 0.19
+ALTER TABLE monitors MODIFY test_id INT NOT NULL;
+ALTER TABLE view MODIFY pos INT NOT NULL;
+INSERT INTO tests_internal VALUES (8,'Windows CPU Load');
+INSERT INTO tests_script SET name='Livingston Portmaster Active Modems', cmd='pmmodems.pl %snmp_read_community% %ip%', data_type='2';
+UPDATE graphs SET min=NULL WHERE min=0;
+UPDATE graphs SET max=NULL WHERE max=0;
+UPDATE `versioninfo` set version = '0.19' where module = 'Main';
+
+-- update to 0.20
+INSERT INTO updates SET update_version = '0.20', name = 'Device Properties Table', version_applied_to = '0.19', dateapplied = now();
+CREATE TABLE `dev_props` (`id` INT NOT NULL AUTO_INCREMENT, `dev_type_id` INT NOT NULL, `name` VARCHAR( 200 ) NOT NULL, `test_type` TINYINT NOT NULL, `test_id` INT NOT NULL, `test_params` VARCHAR( 150 ) NOT NULL, PRIMARY KEY ( `id` )) TYPE = MYISAM;
+
+INSERT INTO updates SET update_version = '0.20', name = 'Device Properties Values Table', version_applied_to = '0.19', dateapplied = now();
+CREATE TABLE `dev_prop_vals` ( `dev_id` INT NOT NULL, `prop_id` INT NOT NULL, `value` VARCHAR( 250 ) NOT NULL, PRIMARY KEY ( `dev_id` , `prop_id` ));
+
+INSERT INTO updates SET update_version = '0.20', name = 'SNMP Interface Cache New Fields', version_applied_to = '0.19', dateapplied = now();
+ALTER TABLE `snmp_interface_cache` ADD `nexthop` VARCHAR( 20 ) , ADD `vlan` VARCHAR( 20 ) , ADD `mode` TINYINT;
+
+INSERT INTO updates SET update_version = '0.20', name = 'Graph Item Consolidation Function Field', version_applied_to = '0.19', dateapplied = now();
+ALTER TABLE `graph_ds` ADD `cf` TINYINT NOT NULL DEFAULT '1';
+
+INSERT INTO updates SET update_version = '0.20', name = 'Device Unknowns on SNMP Restart Field', version_applied_to = '0.19', dateapplied = now();
+ALTER TABLE `devices` ADD `unknowns_on_snmp_restart` TINYINT NOT NULL DEFAULT '1';
+
+UPDATE `versioninfo` set version = '0.20' where module = 'Main';
--- netmrg-0.20.orig/debian/config
+++ netmrg-0.20/debian/config
@@ -0,0 +1,188 @@
+#!/bin/bash
+
+set -e
+
+. /usr/share/debconf/confmodule
+
+if [ "$DPKG_DEBUG" = "developer" ]; then
+	set -x
+fi
+
+db_version 2.0
+
+if [ "$1" = "reconfigure" ] ; then
+	# Rotate old configuration
+	configs="/etc/netmrg/netmrg.xml"
+	for config in $configs ; do
+		for i in $(seq 8 -1 0) ; do
+			if [ -f ${config}.$i ]
+				then mv ${config}.$i ${config}.$(($i +1))
+			fi
+		done
+		cp ${config} ${config}.0
+	done
+fi
+
+step=1
+finished="false"
+checkagain="true"
+dbexists="false"
+db_capb backup
+while ! $finished ; do
+    skip="false"
+    password=""
+    confirm=""
+    case $step in
+	1)	# Ask for web server type.
+	    db_input medium "netmrg/webserver" || true
+	    next=`expr $step + 1`
+	    previous="-1"
+	    ;;
+	2)	# Ask on wich host the DBMS is installed.
+	    db_input critical "netmrg/db/host" || true
+	    previous=`expr $step - 1`
+	    next=`expr $step + 1`
+	    ;;
+	3)	# Get the database administrator name and password.
+	    db_get "netmrg/db/admin/name"
+	    if [ -z "$RET" ] ; then
+		    dbadmname="root"
+				if [ -n "$dbadmname" ] ; then
+		    		db_set "netmrg/db/admin/name" $dbadmname
+				fi
+	    fi
+	    db_beginblock
+	     db_input critical "netmrg/db/admin/name" || true
+	     db_input critical "netmrg/db/admin/password" || true
+	    db_endblock
+	    previous=`expr $step - 1`
+	    next=`expr $step + 1`
+	    ;;
+	4)	# Ask for DB name.
+	    db_input critical "netmrg/db/name" || true
+	    previous=`expr $step - 1`
+	    next=`expr $step + 1`
+	    ;;
+	5)	# Check if DB already exists 
+			if [ "$1" = "configure" ] ; then
+				if $checkagain ; then 
+					db_get "netmrg/db/name"
+					dbname="$RET"
+					db_get "netmrg/db/admin/name"
+					dbadmin="$RET"
+					db_get "netmrg/db/admin/password"
+					dbadmpass="$RET"
+					. /usr/share/wwwconfig-common/mysql.get
+					if eval $mysqlcmd $dbname -e '"show tables;"' | grep graphs >/dev/null 2>&1 ; then
+	    			db_subst "netmrg/db/exists" "dbname" $dbname
+						db_input critical "netmrg/db/exists" || true
+						db_go
+#						db_fset  "netmrg/db/name" "seen" "false" || true
+	    			db_input critical "netmrg/db/name" || true
+						next=`expr $step + 1`
+						previous=`expr $step - 1`
+					else
+						skip="true"
+						next=`expr $step + 1`
+					fi
+					checkagain="false"
+				else
+					skip="true"
+					next=`expr $step + 1`
+				fi
+			else
+				checkagain="false"
+				skip="true"
+				next=`expr $step + 1`
+			fi
+	    ;;
+	6)	# Get the DBMS account username
+	    db_input critical "netmrg/db/user/name" || true
+	    previous=`expr $step - 1`
+	    next=`expr $step + 1`
+	    ;;
+	7) # Get the DBMS account password
+	    db_beginblock
+	     db_input critical "netmrg/db/user/password" || true
+	     db_input critical "netmrg/db/user/password/confirm" || true
+	    db_endblock
+	    previous=`expr $step - 1`
+	    next=`expr $step + 1`
+	    ;;
+	8)	# Check if passwords match.
+	    db_get "netmrg/db/user/password"
+	    password="$RET"
+	    db_get "netmrg/db/user/password/confirm"
+	    confirm="$RET"
+	    if [ "$password" != "$confirm" ] ; then
+		# Reset the template used
+		db_reset "netmrg/db/user/password" || true
+		db_fset  "netmrg/db/user/password" "seen" "false" || true
+		db_reset "netmrg/db/user/password/confirm" || true
+		db_fset  "netmrg/db/user/password/confirm" "seen" "false" || true
+		# Promt the user
+		db_input critical "netmrg/db/user/password/mismatch" || true
+		# Do one step back anyway.
+		next=`expr $step - 1`
+		previous=`expr $step - 1`
+	    else
+		# Do not prompt, go to the next step.
+		skip="true"
+		next=`expr $step + 1`
+	    fi
+	    ;;
+	9)	# Ask for deleting all the database on package purge.
+	    db_input medium "netmrg/postrm" || true
+	    next=`expr $step + 1`
+	    previous=`expr $step - 1`
+	    ;;
+	10)	# Ask for web host.
+	    db_input medium "netmrg/web/host" || true
+	    next=`expr $step + 1`
+			previous=`expr $step - 1`
+	    ;;
+	11)	# Ask for company name.
+	    db_input medium "netmrg/company/name" || true
+	    next=`expr $step + 1`
+			previous=`expr $step - 1`
+	    ;;
+	12)	# Ask for company url.
+	    db_input medium "netmrg/company/link" || true
+	    next=-1
+			previous=`expr $step - 1`
+	    ;;
+	-1) finished="true"
+			# if this is an initial configure run and the database is fresh
+			# then warn the user about the predefined password
+			if [ "$1" = "configure" -a ! $dbexists ] ; then
+				db_fset "netmrg/configuration/note" "seen" "false" || true
+			fi
+			db_beginblock
+			db_subst "netmrg/configuration/note" "site" `hostname -f`
+			db_input medium "netmrg/configuration/note" || true
+			db_endblock
+	    ;;
+	*)
+	    skip="true"
+	    message="Unknown step #$step."
+	    if [ $step -gt 12 ] || [ $step -le 0 ] ; then
+		finished="true"
+	    fi
+	    ;;
+    esac
+	
+    if ! $skip ; then
+	db_title "netmrg" || true
+	if db_go ; then
+	    step=$next
+	else
+	    step=$previous
+	fi
+    else
+	step=$next
+    fi
+done
+
+db_stop
+
+exit 0
--- netmrg-0.20.orig/debian/dirs
+++ netmrg-0.20/debian/dirs
@@ -0,0 +1 @@
+usr/bin
--- netmrg-0.20.orig/debian/po/POTFILES.in
+++ netmrg-0.20/debian/po/POTFILES.in
@@ -0,0 +1 @@
+[type: gettext/rfc822deb] templates
--- netmrg-0.20.orig/debian/po/vi.po
+++ netmrg-0.20/debian/po/vi.po
@@ -0,0 +1,235 @@
+# Vietnamese translation for netmrg.
+# Copyright © 2007 Free Software Foundation, Inc.
+# Clytie Siddall <clytie@riverland.net.au>, 2005-2007.
+# 
+msgid ""
+""
+msgstr "Project-Id-Version: netmrg 0.18.2-8\n"
+"Report-Msgid-Bugs-To: steinm@debian.org\n"
+"POT-Creation-Date: 2007-05-30 08:32+0200\n"
+"PO-Revision-Date: 2007-06-05 14:39+0930\n"
+"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
+"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: LocFactoryEditor 1.6.3b1\n"
+
+#.Type: select
+#.choices
+#: ../templates:1001
+msgid "None, Apache2, Apache, Apache-SSL, All"
+msgstr "Không có, Apache2, Apache, Apache-SSL, Tất cả"
+
+#.Type: select
+#.description
+#: ../templates:1002
+msgid "Web server to configure:"
+msgstr "Trình phục vụ Mạng cần cấu hình:"
+
+#.Type: string
+#.default
+#: ../templates:2001
+msgid "localhost"
+msgstr "localhost"
+
+#.Type: string
+#.description
+#: ../templates:2002
+msgid "Host name of the mysql database server:"
+msgstr "Tên máy của máy phục vụ cơ sở dữ liệu MySQL:"
+
+#.Type: string
+#.default
+#.Type: string
+#.default
+#: ../templates:3001
+#: ../templates:5001
+msgid "netmrg"
+msgstr "netmrg"
+
+#.Type: string
+#.description
+#: ../templates:3002
+msgid "Name for the database:"
+msgstr "Tên cho cơ sở dữ liệu :"
+
+#.Type: note
+#.description
+#: ../templates:4002
+msgid "The database already exists"
+msgstr "Cơ sở dữ liệu đã có"
+
+#.Type: note
+#.description
+#: ../templates:4002
+msgid ""
+"A simple test revealed that a database with the name \"${dbname}\" already "
+"exists and appears to be a netmrg database. If you really like to use this "
+"database then confirm the name in the next step."
+msgstr "Một cơ sở dữ liệu tên « ${dbname} » đã tồn tại, cũng có vẻ là nó là cơ sở dữ liệu kiểu netmrg. Thật muốn sử dụng cơ sở dữ liệu này thì bạn xác nhận tên trong bước kế tiếp."
+
+#.Type: string
+#.description
+#: ../templates:5002
+msgid "Name of the database user:"
+msgstr "Tên của người dùng cơ sở dữ liệu :"
+
+#.Type: string
+#.description
+#: ../templates:5002
+msgid "This user will have read/write access to the netmrg database."
+msgstr "Người dùng này sẽ có quyền đọc/ghi trong cơ sở dữ liệu netmrg."
+
+#.Type: password
+#.description
+#: ../templates:6002
+msgid "Password of the database user:"
+msgstr "Mật khẩu của người dùng cơ sở dữ liệu :"
+
+#.Type: password
+#.description
+#: ../templates:7002
+msgid "Confirm the password of the database user:"
+msgstr "Hãy xác nhận mật khẩu của người dùng cơ sở dữ liệu :"
+
+#.Type: text
+#.description
+#: ../templates:8002
+msgid "Password mismatch"
+msgstr "Hai mật khẩu không trùng"
+
+#.Type: text
+#.description
+#: ../templates:8002
+msgid "The database user passwords you entered didn't match. Please try again."
+msgstr "Bạn đã gõ hai mật khẩu người dùng cơ sở dữ liệu không phải trùng với nhau. Hãy thử lại."
+
+#.Type: string
+#.description
+#: ../templates:9002
+msgid "Name of the database system administrator:"
+msgstr "Tên của quản trị hệ thống cơ sở dữ liệu :"
+
+#.Type: string
+#.description
+#: ../templates:9002
+msgid ""
+"In order to be able to create the initial database and database user for "
+"netmrg, the account name of the database system administrator is needed."
+msgstr "Để có khả năng tạo cơ sở dữ liệu và người dùng đầu tiên cho netmrg, cần thiết tên tài khoản của người dùng quản trị hệ thống cơ sở dữ liệu."
+
+#.Type: password
+#.description
+#: ../templates:10002
+msgid "Password of the database system administrator:"
+msgstr "Mật khẩu của quản trị hệ thống cơ sở dữ liệu :"
+
+#.Type: string
+#.description
+#: ../templates:11002
+msgid "Name of web host:"
+msgstr "Tên của máy hỗ trợ dịch vụ Mạng:"
+
+#.Type: string
+#.description
+#: ../templates:11002
+msgid ""
+"netmrg's user interface is web based. The hostname of the web server is used "
+"for urls within the netmrg web interface. Leaving this entry field empty is "
+"usually a good choice."
+msgstr "Giao diện người dùng của netmrg dựa vào Mạng. Tên máy của máy phục vụ Mạng được dùng cho địa chỉ URL bên trong giao diện Mạng của netmrg. Thường nên bỏ rỗng trường này."
+
+#.Type: string
+#.description
+#: ../templates:12002
+msgid "Name of your company:"
+msgstr "Tên của công ty bạn:"
+
+#.Type: string
+#.description
+#: ../templates:12002
+msgid ""
+"The web front end of netmrg shows the name of your company in the header of "
+"each web page."
+msgstr "Giao diện Mạng của netmrg thì hiển thị tên của công ty của bạn trong phần đầu của mỗi trang Mạng."
+
+#.Type: string
+#.default
+#: ../templates:13001
+msgid "http://"
+msgstr "http://"
+
+#.Type: string
+#.description
+#: ../templates:13002
+msgid "Url of your companies website:"
+msgstr "URL của nơi Mạng của công ty:"
+
+#.Type: string
+#.description
+#: ../templates:13002
+msgid ""
+"Clicking on the company name will follow a link. It is usualy the url "
+"pointing to the start page of your company's web site."
+msgstr "Việc nhấn vào tên công ty sẽ theo liên kết. Thường là địa chỉ URL chỉ tới trang chính của nơi Mạng của công ty của bạn."
+
+#.Type: boolean
+#.default
+#: ../templates:14001
+msgid "true"
+msgstr "đúng"
+
+#.Type: boolean
+#.description
+#: ../templates:14002
+msgid "Delete data after purging software?"
+msgstr "Xoá dữ liệu sau khi tẩy phần mềm không?"
+
+#.Type: boolean
+#.description
+#: ../templates:14002
+msgid ""
+"Purging a package usually removes all data collected by the software "
+"including the log files. Choose 'no' if you would like to keep the mysql "
+"database and the datafiles even if the netmrg package is purged sometime in "
+"the future."
+msgstr "Việc tẩy gói thường gỡ bỏ mọi dữ liệu do phần mềm thu thập, gồm các tập tin ghi lưu. Hãy chọn « Không » nếu bạn muốn giữ lại cơ sở dữ liệu MySQL, thậm chí nếu gói netmrg bị tẩy vào lúc sau."
+
+#.Type: note
+#.description
+#: ../templates:15002
+msgid "Package configuration note"
+msgstr "Ghi chú cấu hình gói"
+
+#.Type: note
+#.description
+#: ../templates:15002
+msgid ""
+"The package has been successfully installed and configured. Point your "
+"webbrowser towards http://${site}/netmrg/ and log in as user 'admin' with "
+"the password 'nimda'. Make sure to change the password as soon as possible "
+"since it is the default password for all netmrg installations."
+msgstr "Gói đã được cài đặt và cấu hình. Chỉ trình duyệt Mạng tới địa chỉ « http://${site}/netmrg/ » rồi đăng nhập với tên người dùng « admin » và mật khẩu « nimda ». Bạn nên thay đổi mật khẩu càng sớm càng có thể, vì nó là mật khẩu mặc định cho mọi bản cài đặt netmrg."
+
+#.Type: note
+#.description
+#: ../templates:16002
+msgid "Error while creating database"
+msgstr "Gặp lỗi khi tạo cơ sở dữ liệu"
+
+#.Type: note
+#.description
+#: ../templates:17002
+msgid "Error while creating database user"
+msgstr "Gặp lỗi khi tạo người dùng cơ sở dữ liệu"
+
+#.Type: note
+#.description
+#: ../templates:18002
+msgid "Error while creating database tables"
+msgstr "Gặp lỗi khi tạo bảng cơ sở dữ liệu"
+
+#~ msgid "Which name would you like for the database user?"
+#~ msgstr "Cho người dùng cơ sở dỡ liệu ấy, bạn muốn chọn tên nào?"
--- netmrg-0.20.orig/debian/po/pt.po
+++ netmrg-0.20/debian/po/pt.po
@@ -0,0 +1,253 @@
+# Portuguese translation of netmrg debconf messages.
+# Copyright (C) 2006 Free Software Foundation, Inc.
+# Rui Branco <ruipb@debianpt.org>, 2006.
+# 05-06-2007 - Rui Branco <ruipb@debianpt.org>
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: netmrg 0.18.2-13\n"
+"Report-Msgid-Bugs-To: steinm@debian.org\n"
+"POT-Creation-Date: 2007-05-30 08:32+0200\n"
+"PO-Revision-Date: 2007-06-05 18:31+0100\n"
+"Last-Translator: Rui Branco <ruipb@debianpt.org>\n"
+"Language-Team: Portuguese <traduz@debianpt.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit"
+
+#. Type: select
+#. choices
+#: ../templates:1001
+msgid "None, Apache2, Apache, Apache-SSL, All"
+msgstr "Nenhum, Apache2, Apache, Apache-SSL, Todos"
+
+#. Type: select
+#. description
+#: ../templates:1002
+msgid "Web server to configure:"
+msgstr "Servidor web a configurar:"
+
+#. Type: string
+#. default
+#: ../templates:2001
+msgid "localhost"
+msgstr "máquina local"
+
+#. Type: string
+#. description
+#: ../templates:2002
+msgid "Host name of the mysql database server:"
+msgstr "Nome de máquina do servidor de base de dados mysql:"
+
+#. Type: string
+#. default
+#. Type: string
+#. default
+#: ../templates:3001 ../templates:5001
+msgid "netmrg"
+msgstr "netmrg"
+
+#. Type: string
+#. description
+#: ../templates:3002
+msgid "Name for the database:"
+msgstr "Nome para a base de dados:"
+
+#. Type: note
+#. description
+#: ../templates:4002
+msgid "The database already exists"
+msgstr "A base de dados já existe"
+
+#. Type: note
+#. description
+#: ../templates:4002
+msgid ""
+"A simple test revealed that a database with the name \"${dbname}\" already "
+"exists and appears to be a netmrg database. If you really like to use this "
+"database then confirm the name in the next step."
+msgstr ""
+"Um teste simples revelou que uma base de dados com o nome \"${dbname}\" já "
+"existe e parece ser uma base de dados netmrg. Se realmente deseja usar esta "
+"base de dados confirme o nome no próximo passo."
+
+#. Type: string
+#. description
+#: ../templates:5002
+msgid "Name of the database user:"
+msgstr "Nome do utilizador da base de dados:"
+
+#. Type: string
+#. description
+#: ../templates:5002
+msgid "This user will have read/write access to the netmrg database."
+msgstr "Este utilizador terá acesso de leitura/escrita à base de dados netmrg."
+
+#. Type: password
+#. description
+#: ../templates:6002
+msgid "Password of the database user:"
+msgstr "Palavra-chave do utilizador da base de dados:"
+
+#. Type: password
+#. description
+#: ../templates:7002
+msgid "Confirm the password of the database user:"
+msgstr "Confirme a palavra-chave do utilizador da base de dados:"
+
+#. Type: text
+#. description
+#: ../templates:8002
+msgid "Password mismatch"
+msgstr "A palavra-chave não coincide"
+
+#. Type: text
+#. description
+#: ../templates:8002
+msgid "The database user passwords you entered didn't match. Please try again."
+msgstr "As palavras-chaves que introduziu não coincidem. Por favor tente outra vez."
+
+#. Type: string
+#. description
+#: ../templates:9002
+msgid "Name of the database system administrator:"
+msgstr "Nome do administrador da base de dados sistema:"
+
+#. Type: string
+#. description
+#: ../templates:9002
+msgid ""
+"In order to be able to create the initial database and database user for "
+"netmrg, the account name of the database system administrator is needed."
+msgstr ""
+"Para ser capaz de criar a base de dados inicial e um utilizador da mesma "
+"para o netmrg, necessita do nome da conta do administrador da base de dados "
+"sistema."
+
+#. Type: password
+#. description
+#: ../templates:10002
+msgid "Password of the database system administrator:"
+msgstr "Palavra-chave do administrador da base de dados sistema:"
+
+#. Type: string
+#. description
+#: ../templates:11002
+msgid "Name of web host:"
+msgstr "Nome da máquina do servidor web:"
+
+#. Type: string
+#. description
+#: ../templates:11002
+msgid ""
+"netmrg's user interface is web based. The hostname of the web server is used "
+"for urls within the netmrg web interface. Leaving this entry field empty is "
+"usually a good choice."
+msgstr ""
+"O interface para o utilizador do netmrg é baseado na web. O nome da máquina "
+"servidor web é utilizado para 'urls' dentro da interface web do netmrg. "
+"Deixar esta entrada em branco normalmente é uma boa opção."
+
+#. Type: string
+#. description
+#: ../templates:12002
+msgid "Name of your company:"
+msgstr "Nome da sua companhia:"
+
+#. Type: string
+#. description
+#: ../templates:12002
+msgid ""
+"The web front end of netmrg shows the name of your company in the header of "
+"each web page."
+msgstr ""
+"O interface de visualização web do netmrg mostra o nome da sua companhia no "
+"cabeçalho cada página."
+
+#. Type: string
+#. default
+#: ../templates:13001
+msgid "http://"
+msgstr "http://"
+
+#. Type: string
+#. description
+#: ../templates:13002
+msgid "Url of your companies website:"
+msgstr "'Url' da página web da sua empresa:"
+
+#. Type: string
+#. description
+#: ../templates:13002
+msgid ""
+"Clicking on the company name will follow a link. It is usualy the url "
+"pointing to the start page of your company's web site."
+msgstr ""
+"Ao clicar no nome da companhia será activado o link. Normalmente é o link "
+"'url' que aponta para a página de início do site da sua companhia."
+
+#. Type: boolean
+#. default
+#: ../templates:14001
+msgid "true"
+msgstr "verdadeiro"
+
+#. Type: boolean
+#. description
+#: ../templates:14002
+msgid "Delete data after purging software?"
+msgstr "Apagar data depois de eliminar o software?"
+
+#. Type: boolean
+#. description
+#: ../templates:14002
+msgid ""
+"Purging a package usually removes all data collected by the software "
+"including the log files. Choose 'no' if you would like to keep the mysql "
+"database and the datafiles even if the netmrg package is purged sometime in "
+"the future."
+msgstr ""
+"Eliminar um pacote normalmente elimina toda a informação recolhida pelo "
+"pacote incluindo ficheiros de relatório. Escolha 'não' se preferir manter a "
+"base de dados mysql e os ficheiros de data, mesmo que o pacote netmrg seja "
+"eliminado um dia mais tarde."
+
+#. Type: note
+#. description
+#: ../templates:15002
+msgid "Package configuration note"
+msgstr "Nota de configuração do pacote"
+
+#. Type: note
+#. description
+#: ../templates:15002
+msgid ""
+"The package has been successfully installed and configured. Point your "
+"webbrowser towards http://${site}/netmrg/ and log in as user 'admin' with "
+"the password 'nimda'. Make sure to change the password as soon as possible "
+"since it is the default password for all netmrg installations."
+msgstr ""
+"O pacote foi instalado e configurado com sucesso. Aponte o seu cliente web "
+"para http://${site}/netmrg/ e entre como um utilizador 'admin' com a palavra-"
+"chave 'nimda'. Garanta que a palavra-chave seja modificada o mais depressa "
+"possível, já que é a palavra-chave por omissão para todas as instalações "
+"netmrg."
+
+#. Type: note
+#. description
+#: ../templates:16002
+msgid "Error while creating database"
+msgstr "Erro ao criar a base de dados"
+
+#. Type: note
+#. description
+#: ../templates:17002
+msgid "Error while creating database user"
+msgstr "Erro ao criar o utilizador da base de dados"
+
+#. Type: note
+#. description
+#: ../templates:18002
+msgid "Error while creating database tables"
+msgstr "Erro ao criar as tabelas da base de dados"
+
--- netmrg-0.20.orig/debian/po/fr.po
+++ netmrg-0.20/debian/po/fr.po
@@ -0,0 +1,267 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: netmrg_0.18.2-17\n"
+"Report-Msgid-Bugs-To: steinm@debian.org\n"
+"POT-Creation-Date: 2007-05-30 08:32+0200\n"
+"PO-Revision-Date: 2007-06-05 22:27+0100\n"
+"Last-Translator: Steve Petruzzello <dlist@bluewin.ch>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-SourceCharset: iso-8859-1\n"
+
+#. Type: select
+#. choices
+#: ../templates:1001
+msgid "None, Apache2, Apache, Apache-SSL, All"
+msgstr "Aucun, Apache2, Apache, Apache-SSL, Tous"
+
+#. Type: select
+#. description
+#: ../templates:1002
+msgid "Web server to configure:"
+msgstr "Serveur Web à configurer :"
+
+#. Type: string
+#. default
+#: ../templates:2001
+msgid "localhost"
+msgstr "localhost"
+
+#. Type: string
+#. description
+#: ../templates:2002
+msgid "Host name of the mysql database server:"
+msgstr "Nom d'hôte du serveur de bases de données MySQL :"
+
+#. Type: string
+#. default
+#. Type: string
+#. default
+#: ../templates:3001 ../templates:5001
+msgid "netmrg"
+msgstr "netmrg"
+
+#. Type: string
+#. description
+#: ../templates:3002
+msgid "Name for the database:"
+msgstr "Nom de la base de données :"
+
+#. Type: note
+#. description
+#: ../templates:4002
+msgid "The database already exists"
+msgstr "La base de données existe déjà"
+
+#. Type: note
+#. description
+#: ../templates:4002
+msgid ""
+"A simple test revealed that a database with the name \"${dbname}\" already "
+"exists and appears to be a netmrg database. If you really like to use this "
+"database then confirm the name in the next step."
+msgstr ""
+"Une base de données nommée « ${dbname} » existe déjà et semble être une base "
+"de données de netmrg. Si vous souhaitez utiliser cette base de données, "
+"veuillez le confirmer à la prochaine étape."
+
+#. Type: string
+#. description
+#: ../templates:5002
+msgid "Name of the database user:"
+msgstr "Mot de passe de l'utilisateur de la base de données :"
+
+#. Type: string
+#. description
+#: ../templates:5002
+msgid "This user will have read/write access to the netmrg database."
+msgstr ""
+"Veuillez choisir l'identifiant qui aura les droits de lecture et d'écriture "
+"sur la base de données de netmrg."
+
+#. Type: password
+#. description
+#: ../templates:6002
+msgid "Password of the database user:"
+msgstr "Mot de passe de l'utilisateur de la base de données :"
+
+#. Type: password
+#. description
+#: ../templates:7002
+msgid "Confirm the password of the database user:"
+msgstr "Confirmation du mot de passe de l'utilisateur de la base de données :"
+
+#. Type: text
+#. description
+#: ../templates:8002
+msgid "Password mismatch"
+msgstr "Mots de passe différents"
+
+#. Type: text
+#. description
+#: ../templates:8002
+msgid "The database user passwords you entered didn't match. Please try again."
+msgstr ""
+"Les mots de passe pour l'utilisateur de la base de données ne correspondent "
+"pas. Veuillez réessayer."
+
+#. Type: string
+#. description
+#: ../templates:9002
+msgid "Name of the database system administrator:"
+msgstr "Mot de passe de l'administrateur du serveur de bases de données:"
+
+#. Type: string
+#. description
+#: ../templates:9002
+msgid ""
+"In order to be able to create the initial database and database user for "
+"netmrg, the account name of the database system administrator is needed."
+msgstr ""
+"Pour créer la base de données initiale pour netmrg ainsi que son "
+"utilisateur, vous devez indiquer l'identifiant de l'administrateur du "
+"serveur de bases de données."
+
+#. Type: password
+#. description
+#: ../templates:10002
+msgid "Password of the database system administrator:"
+msgstr "Mot de passe de l'administrateur du serveur de bases de données :"
+
+#. Type: string
+#. description
+#: ../templates:11002
+msgid "Name of web host:"
+msgstr "Nom d'hôte de netmrg :"
+
+#. Type: string
+#. description
+#: ../templates:11002
+msgid ""
+"netmrg's user interface is web based. The hostname of the web server is used "
+"for urls within the netmrg web interface. Leaving this entry field empty is "
+"usually a good choice."
+msgstr ""
+"Netmrg utilise une interface web. Le nom d'hôte du serveur web déterminera "
+"les URL utilisées. Il est conseillé de laisser ce champ vide."
+
+#. Type: string
+#. description
+#: ../templates:12002
+msgid "Name of your company:"
+msgstr "Nom de l'entreprise :"
+
+#. Type: string
+#. description
+#: ../templates:12002
+msgid ""
+"The web front end of netmrg shows the name of your company in the header of "
+"each web page."
+msgstr ""
+"L'interface web de netmrg affiche le nom de l'entreprise dans l'en-tête de "
+"chaque page web."
+
+#. Type: string
+#. default
+#: ../templates:13001
+msgid "http://"
+msgstr "http://"
+
+#. Type: string
+#. description
+#: ../templates:13002
+msgid "Url of your companies website:"
+msgstr "URL du site web de l'entreprise :"
+
+#. Type: string
+#. description
+#: ../templates:13002
+msgid ""
+"Clicking on the company name will follow a link. It is usualy the url "
+"pointing to the start page of your company's web site."
+msgstr ""
+"Veuillez indiquer l'URL qui sera atteinte en cliquant sur le nom "
+"l'entreprise."
+
+#. Type: boolean
+#. default
+#: ../templates:14001
+msgid "true"
+msgstr "vrai"
+
+#. Type: boolean
+#. description
+#: ../templates:14002
+msgid "Delete data after purging software?"
+msgstr "Faut-il effacer les données à la purge du paquet ?"
+
+#. Type: boolean
+#. description
+#: ../templates:14002
+msgid ""
+"Purging a package usually removes all data collected by the software "
+"including the log files. Choose 'no' if you would like to keep the mysql "
+"database and the datafiles even if the netmrg package is purged sometime in "
+"the future."
+msgstr ""
+"La purge d'un paquet supprime toutes les données ainsi que les fichiers "
+"journaux créés par le programme. Refusez cette option si vous désirez "
+"conserver la base de données MySQL ainsi que les fichiers de données même "
+"dans l'éventualité d'une purge future du paquet netmrg."
+
+#. Type: note
+#. description
+#: ../templates:15002
+msgid "Package configuration note"
+msgstr "Note sur la configuration du paquet"
+
+#. Type: note
+#. description
+#: ../templates:15002
+msgid ""
+"The package has been successfully installed and configured. Point your "
+"webbrowser towards http://${site}/netmrg/ and log in as user 'admin' with "
+"the password 'nimda'. Make sure to change the password as soon as possible "
+"since it is the default password for all netmrg installations."
+msgstr ""
+"L'installation et la configuration du paquet se sont terminées avec succès. "
+"Vous pouvez maintenant pointer votre navigateur sur http://${site}/netmrg/ "
+"et vous connecter en tant qu'utilisateur « admin » avec le mot de passe "
+"« nimda ». N'oubliez pas de modifier ce mot de passe puisque c'est celui "
+"utilisé par défaut par toutes les installations de netmrg."
+
+#. Type: note
+#. description
+#: ../templates:16002
+msgid "Error while creating database"
+msgstr "Erreur lors de la création de la base de données"
+
+#. Type: note
+#. description
+#: ../templates:17002
+msgid "Error while creating database user"
+msgstr "Erreur lors de la création du propriétaire de la base de données"
+
+#. Type: note
+#. description
+#: ../templates:18002
+msgid "Error while creating database tables"
+msgstr "Erreur lors de la création des tables de la base de données"
+
+#~ msgid "Which name would you like for the database user?"
+#~ msgstr "Identifiant pour la base de données :"
--- netmrg-0.20.orig/debian/po/cs.po
+++ netmrg-0.20/debian/po/cs.po
@@ -0,0 +1,250 @@
+# Czech translation of netmrg templates
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: netmrg 0.18.2-5\n"
+"Report-Msgid-Bugs-To: steinm@debian.org\n"
+"POT-Creation-Date: 2007-05-30 08:32+0200\n"
+"PO-Revision-Date: 2007-06-05 09:02+0200\n"
+"Last-Translator: Martin Sin <martin.sin@zshk.cz>\n"
+"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. choices
+#: ../templates:1001
+msgid "None, Apache2, Apache, Apache-SSL, All"
+msgstr "Žádný, Apache2, Apache, Apache-SSL, Všechny"
+
+#. Type: select
+#. description
+#: ../templates:1002
+msgid "Web server to configure:"
+msgstr "Nastavit webový server:"
+
+#. Type: string
+#. default
+#: ../templates:2001
+msgid "localhost"
+msgstr "localhost"
+
+#. Type: string
+#. description
+#: ../templates:2002
+msgid "Host name of the mysql database server:"
+msgstr "Jméno počítače s databází mysql:"
+
+#. Type: string
+#. default
+#. Type: string
+#. default
+#: ../templates:3001 ../templates:5001
+msgid "netmrg"
+msgstr "netmrg"
+
+#. Type: string
+#. description
+#: ../templates:3002
+msgid "Name for the database:"
+msgstr "Název databáze:"
+
+#. Type: note
+#. description
+#: ../templates:4002
+msgid "The database already exists"
+msgstr "Databáze již existuje"
+
+#. Type: note
+#. description
+#: ../templates:4002
+msgid ""
+"A simple test revealed that a database with the name \"${dbname}\" already "
+"exists and appears to be a netmrg database. If you really like to use this "
+"database then confirm the name in the next step."
+msgstr ""
+"Jednoduchý test ukázal, že databáze se jménem \"${dbname}\" již existuje. "
+"Pravděpodobně se jedná o databázi netmrg. Pokud si skutečně přejete používat "
+"tuto databázi, pak v dalším kroku potvrďte její název."
+
+#. Type: string
+#. description
+#: ../templates:5002
+msgid "Name of the database user:"
+msgstr "Jméno uživatele databáze:"
+
+#. Type: string
+#. description
+#: ../templates:5002
+msgid "This user will have read/write access to the netmrg database."
+msgstr "Tento uživatel bude mít práva čtení/zápisu k databázi netmrg."
+
+#. Type: password
+#. description
+#: ../templates:6002
+msgid "Password of the database user:"
+msgstr "Heslo uživatele databáze:"
+
+#. Type: password
+#. description
+#: ../templates:7002
+msgid "Confirm the password of the database user:"
+msgstr "Potvrďte heslo uživatele databáze:"
+
+#. Type: text
+#. description
+#: ../templates:8002
+msgid "Password mismatch"
+msgstr "Hesla nesouhlasí"
+
+#. Type: text
+#. description
+#: ../templates:8002
+msgid "The database user passwords you entered didn't match. Please try again."
+msgstr "Hesla, která jste zadali nesouhlasí. Zadejte je prosím znovu."
+
+#. Type: string
+#. description
+#: ../templates:9002
+msgid "Name of the database system administrator:"
+msgstr "Jméno administrátora databázového systému:"
+
+#. Type: string
+#. description
+#: ../templates:9002
+msgid ""
+"In order to be able to create the initial database and database user for "
+"netmrg, the account name of the database system administrator is needed."
+msgstr ""
+"Abych (pro program netmrg) mohl vytvořit požadovanou databázi a uživatele "
+"databáze, potřebuji znát přihlašovací jméno administrátora databázového "
+"systému."
+
+#. Type: password
+#. description
+#: ../templates:10002
+msgid "Password of the database system administrator:"
+msgstr "Heslo administrátora databázového systému:"
+
+#. Type: string
+#. description
+#: ../templates:11002
+msgid "Name of web host:"
+msgstr "Jméno webového počítače:"
+
+#. Type: string
+#. description
+#: ../templates:11002
+msgid ""
+"netmrg's user interface is web based. The hostname of the web server is used "
+"for urls within the netmrg web interface. Leaving this entry field empty is "
+"usually a good choice."
+msgstr ""
+"Uživatelské rozhraní programu netmrg používá web. Adresy url webového "
+"rozhraní netmrg používají hostitelský název webového serveru. Obvykle stačí "
+"ponechat toto políčko prázdné."
+
+#. Type: string
+#. description
+#: ../templates:12002
+msgid "Name of your company:"
+msgstr "Jméno vaší společnosti:"
+
+#. Type: string
+#. description
+#: ../templates:12002
+msgid ""
+"The web front end of netmrg shows the name of your company in the header of "
+"each web page."
+msgstr ""
+"Webová aplikace netmrg zobrazuje jméno vaší společnosti v záhlaví každé "
+"webové stránky."
+
+#. Type: string
+#. default
+#: ../templates:13001
+msgid "http://"
+msgstr "http://"
+
+#. Type: string
+#. description
+#: ../templates:13002
+msgid "Url of your companies website:"
+msgstr "Adresa Url webových stránek vaší společnosti:"
+
+#. Type: string
+#. description
+#: ../templates:13002
+msgid ""
+"Clicking on the company name will follow a link. It is usualy the url "
+"pointing to the start page of your company's web site."
+msgstr ""
+"Kliknutím na jméno společnosti přejdete na tento odkaz. Obvykle se "
+"zde zadává url adresa směřující na úvodní webovou stránku vaší společnosti."
+
+#. Type: boolean
+#. default
+#: ../templates:14001
+msgid "true"
+msgstr "ano"
+
+#. Type: boolean
+#. description
+#: ../templates:14002
+msgid "Delete data after purging software?"
+msgstr "Smazat data po odstranění programu?"
+
+#. Type: boolean
+#. description
+#: ../templates:14002
+msgid ""
+"Purging a package usually removes all data collected by the software "
+"including the log files. Choose 'no' if you would like to keep the mysql "
+"database and the datafiles even if the netmrg package is purged sometime in "
+"the future."
+msgstr ""
+"Odstranění balíčku obvykle odstraní všechna data získaná tímto programem "
+"včetně souborů logu. Zvolte 'ne', pokud si přejete zachovat databázi mysql "
+"a datové soubory i když někdy v budoucnu odstraníte balíček netmrg."
+
+#. Type: note
+#. description
+#: ../templates:15002
+msgid "Package configuration note"
+msgstr "Konfigurační poznámka balíčku"
+
+#. Type: note
+#. description
+#: ../templates:15002
+msgid ""
+"The package has been successfully installed and configured. Point your "
+"webbrowser towards http://${site}/netmrg/ and log in as user 'admin' with "
+"the password 'nimda'. Make sure to change the password as soon as possible "
+"since it is the default password for all netmrg installations."
+msgstr ""
+"Balíček byl úspěšně nainstalován a nastaven. Ve svém prohlížeči zadejte "
+"adresu http://${site}/netmrg/ a přihlaste se jako uživatel 'admin' s heslem "
+"'nimda'. Toto heslo prosím změňte co nejdříve, protože se jedná o výchozí "
+"heslo instalace netmrg."
+
+#. Type: note
+#. description
+#: ../templates:16002
+msgid "Error while creating database"
+msgstr "Chyba při vytváření databáze"
+
+#. Type: note
+#. description
+#: ../templates:17002
+msgid "Error while creating database user"
+msgstr "Chyba při vytváření uživatele databáze"
+
+#. Type: note
+#. description
+#: ../templates:18002
+msgid "Error while creating database tables"
+msgstr "Chyba při vytváření databázových tabulek"
+
+#~ msgid "Which name would you like for the database user?"
+#~ msgstr "Jaké jméno si přejete pouşít pro databázového uÅŸivatele?"
--- netmrg-0.20.orig/debian/po/de.po
+++ netmrg-0.20/debian/po/de.po
@@ -0,0 +1,264 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: steinm@debian.org\n"
+"POT-Creation-Date: 2007-05-30 08:32+0200\n"
+"PO-Revision-Date: 2007-05-29 19:41+0200\n"
+"Last-Translator: Uwe Steinmann <steinm@debian.org>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. choices
+#: ../templates:1001
+msgid "None, Apache2, Apache, Apache-SSL, All"
+msgstr "Keiner, Apache2, Apache, Apache-SSL, Alle"
+
+#. Type: select
+#. description
+#: ../templates:1002
+msgid "Web server to configure:"
+msgstr "Zu konfigurierender Web-Server:"
+
+#. Type: string
+#. default
+#: ../templates:2001
+msgid "localhost"
+msgstr "localhost"
+
+#. Type: string
+#. description
+#: ../templates:2002
+msgid "Host name of the mysql database server:"
+msgstr "Name des Rechners auf dem sich der mysql Datenbank-Server befindet:"
+
+#. Type: string
+#. default
+#. Type: string
+#. default
+#: ../templates:3001 ../templates:5001
+msgid "netmrg"
+msgstr "netmrg"
+
+#. Type: string
+#. description
+#: ../templates:3002
+msgid "Name for the database:"
+msgstr "Name der Datenbank:"
+
+#. Type: note
+#. description
+#: ../templates:4002
+msgid "The database already exists"
+msgstr "Die Datenbank existiert bereits"
+
+#. Type: note
+#. description
+#: ../templates:4002
+msgid ""
+"A simple test revealed that a database with the name \"${dbname}\" already "
+"exists and appears to be a netmrg database. If you really like to use this "
+"database then confirm the name in the next step."
+msgstr ""
+"Ein einfacher Test deutet darauf hin, dass eine Datenbank mit dem Namen "
+"\"${dbname}\" schon existiert und es sich dabei um eine netmrg Datenbank "
+"handelt. Wenn Sie diese Datenbank tats�chlich verwenden wollen, dann "
+"best�tigen Sie den Namen im n�chsten Schritt."
+
+#. Type: string
+#. description
+#: ../templates:5002
+msgid "Name of the database user:"
+msgstr "Name des Datenbank-Benutzer:"
+
+#. Type: string
+#. description
+#: ../templates:5002
+msgid "This user will have read/write access to the netmrg database."
+msgstr ""
+"Dieser Benutzer greift sp�ter lesend und schreibend auf die Datenbank zu."
+
+#. Type: password
+#. description
+#: ../templates:6002
+msgid "Password of the database user:"
+msgstr "Passwort des Datenbank-Benutzer:"
+
+#. Type: password
+#. description
+#: ../templates:7002
+msgid "Confirm the password of the database user:"
+msgstr "Best�tigen Sie das Passwort f�r den Datenbank-Benutzer:"
+
+#. Type: text
+#. description
+#: ../templates:8002
+msgid "Password mismatch"
+msgstr "Passw�rter sind ungleich"
+
+#. Type: text
+#. description
+#: ../templates:8002
+msgid "The database user passwords you entered didn't match. Please try again."
+msgstr ""
+"Die beiden Passw�rter des Datenbank-Benutzers sind unterschiedlich. "
+"Versuchen Sie es nochmal"
+
+#. Type: string
+#. description
+#: ../templates:9002
+msgid "Name of the database system administrator:"
+msgstr "Name des Datenbank-Systemadministrators:"
+
+#. Type: string
+#. description
+#: ../templates:9002
+msgid ""
+"In order to be able to create the initial database and database user for "
+"netmrg, the account name of the database system administrator is needed."
+msgstr ""
+"Um die initiale Datenbank und den Datenbank-Benutzer von netmrg anzulegen, "
+"bedarf es des Anmeldenamens des Datenbank-Systemadministrators."
+
+#. Type: password
+#. description
+#: ../templates:10002
+msgid "Password of the database system administrator:"
+msgstr "Passwort des Datenbank-Systemadministrator:"
+
+#. Type: string
+#. description
+#: ../templates:11002
+msgid "Name of web host:"
+msgstr "Name des Web-Hosts:"
+
+#. Type: string
+#. description
+#: ../templates:11002
+msgid ""
+"netmrg's user interface is web based. The hostname of the web server is used "
+"for urls within the netmrg web interface. Leaving this entry field empty is "
+"usually a good choice."
+msgstr ""
+"netmrgs Bedienschnittstelle ist webbasiert. Der Hostname des Webservers wird "
+"f�r URLs innerhalb der Bedienschnittstelle verwendet. In der Regel kann "
+"dieses Feld leer gelassen werden."
+
+#. Type: string
+#. description
+#: ../templates:12002
+msgid "Name of your company:"
+msgstr "Name Ihrer Firma:"
+
+#. Type: string
+#. description
+#: ../templates:12002
+msgid ""
+"The web front end of netmrg shows the name of your company in the header of "
+"each web page."
+msgstr ""
+"Das Web-Frontend von netmrg zeigt im Kopf jeder Web-Seite "
+"ihren Firmennamen an."
+
+#. Type: string
+#. default
+#: ../templates:13001
+msgid "http://"
+msgstr "http://"
+
+#. Type: string
+#. description
+#: ../templates:13002
+msgid "Url of your companies website:"
+msgstr "URL ihre Firmen-Website:"
+
+#. Type: string
+#. description
+#: ../templates:13002
+msgid ""
+"Clicking on the company name will follow a link. It is usualy the url "
+"pointing to the start page of your company's web site."
+msgstr ""
+"Ein Mausklick auf den Firmennamen verfolgt diesen Link. Es ist f�r "
+"gew�hnlich die URL der Startseite Ihrer Firmen-Website."
+
+#. Type: boolean
+#. default
+#: ../templates:14001
+msgid "true"
+msgstr "true"
+
+#. Type: boolean
+#. description
+#: ../templates:14002
+msgid "Delete data after purging software?"
+msgstr "Sollen die Daten nach dem L�schen der Software auch gel�scht werden?"
+
+#. Type: boolean
+#. description
+#: ../templates:14002
+msgid ""
+"Purging a package usually removes all data collected by the software "
+"including the log files. Choose 'no' if you would like to keep the mysql "
+"database and the datafiles even if the netmrg package is purged sometime in "
+"the future."
+msgstr ""
+"Das vollst�ndige L�schen eines Pakets entfernt f�r gew�hnlich auch alle "
+"gesammelten Daten und die Log-Dateien. W�hlen Sie 'nein', wenn Sie die mysql "
+"Datenbank und die Datendateien behalten wollen, auch wenn das Paket zu einem "
+"sp�teren Zeitpunkt vollst�ndig gel�scht wird."
+
+#. Type: note
+#. description
+#: ../templates:15002
+msgid "Package configuration note"
+msgstr "Bemerkung zur Paket-Konfiguration"
+
+#. Type: note
+#. description
+#: ../templates:15002
+msgid ""
+"The package has been successfully installed and configured. Point your "
+"webbrowser towards http://${site}/netmrg/ and log in as user 'admin' with "
+"the password 'nimda'. Make sure to change the password as soon as possible "
+"since it is the default password for all netmrg installations."
+msgstr ""
+"Das Paket wurde erfolgreich installiert und konfiguriert. Besuchen Sie nun "
+"mit ihrem Web-Browser die Seite http://${site}/netmrg/ und melden Sie sich "
+"als Benutzer 'admin' mit dem Passwort 'nimda' an. Stellen Sie sicher, dass "
+"das Passwort so schnell wie m�glich ge�ndert wird, weil es das "
+"voreingestellte Passwort aller netmrg-Installationen ist."
+
+#. Type: note
+#. description
+#: ../templates:16002
+msgid "Error while creating database"
+msgstr "Fehler beim Anlegen der Datenbank"
+
+#. Type: note
+#. description
+#: ../templates:17002
+msgid "Error while creating database user"
+msgstr "Fehler beim Anlegen des Datenbank-Benutzers"
+
+#. Type: note
+#. description
+#: ../templates:18002
+msgid "Error while creating database tables"
+msgstr "Fehler beim Anlegen der Datenbank-Tabellen"
+
--- netmrg-0.20.orig/debian/po/templates.pot
+++ netmrg-0.20/debian/po/templates.pot
@@ -0,0 +1,231 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: steinm@debian.org\n"
+"POT-Creation-Date: 2007-05-30 08:32+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. choices
+#: ../templates:1001
+msgid "None, Apache2, Apache, Apache-SSL, All"
+msgstr ""
+
+#. Type: select
+#. description
+#: ../templates:1002
+msgid "Web server to configure:"
+msgstr ""
+
+#. Type: string
+#. default
+#: ../templates:2001
+msgid "localhost"
+msgstr ""
+
+#. Type: string
+#. description
+#: ../templates:2002
+msgid "Host name of the mysql database server:"
+msgstr ""
+
+#. Type: string
+#. default
+#. Type: string
+#. default
+#: ../templates:3001 ../templates:5001
+msgid "netmrg"
+msgstr ""
+
+#. Type: string
+#. description
+#: ../templates:3002
+msgid "Name for the database:"
+msgstr ""
+
+#. Type: note
+#. description
+#: ../templates:4002
+msgid "The database already exists"
+msgstr ""
+
+#. Type: note
+#. description
+#: ../templates:4002
+msgid ""
+"A simple test revealed that a database with the name \"${dbname}\" already "
+"exists and appears to be a netmrg database. If you really like to use this "
+"database then confirm the name in the next step."
+msgstr ""
+
+#. Type: string
+#. description
+#: ../templates:5002
+msgid "Name of the database user:"
+msgstr ""
+
+#. Type: string
+#. description
+#: ../templates:5002
+msgid "This user will have read/write access to the netmrg database."
+msgstr ""
+
+#. Type: password
+#. description
+#: ../templates:6002
+msgid "Password of the database user:"
+msgstr ""
+
+#. Type: password
+#. description
+#: ../templates:7002
+msgid "Confirm the password of the database user:"
+msgstr ""
+
+#. Type: text
+#. description
+#: ../templates:8002
+msgid "Password mismatch"
+msgstr ""
+
+#. Type: text
+#. description
+#: ../templates:8002
+msgid "The database user passwords you entered didn't match. Please try again."
+msgstr ""
+
+#. Type: string
+#. description
+#: ../templates:9002
+msgid "Name of the database system administrator:"
+msgstr ""
+
+#. Type: string
+#. description
+#: ../templates:9002
+msgid ""
+"In order to be able to create the initial database and database user for "
+"netmrg, the account name of the database system administrator is needed."
+msgstr ""
+
+#. Type: password
+#. description
+#: ../templates:10002
+msgid "Password of the database system administrator:"
+msgstr ""
+
+#. Type: string
+#. description
+#: ../templates:11002
+msgid "Name of web host:"
+msgstr ""
+
+#. Type: string
+#. description
+#: ../templates:11002
+msgid ""
+"netmrg's user interface is web based. The hostname of the web server is used "
+"for urls within the netmrg web interface. Leaving this entry field empty is "
+"usually a good choice."
+msgstr ""
+
+#. Type: string
+#. description
+#: ../templates:12002
+msgid "Name of your company:"
+msgstr ""
+
+#. Type: string
+#. description
+#: ../templates:12002
+msgid ""
+"The web front end of netmrg shows the name of your company in the header of "
+"each web page."
+msgstr ""
+
+#. Type: string
+#. default
+#: ../templates:13001
+msgid "http://"
+msgstr ""
+
+#. Type: string
+#. description
+#: ../templates:13002
+msgid "Url of your companies website:"
+msgstr ""
+
+#. Type: string
+#. description
+#: ../templates:13002
+msgid ""
+"Clicking on the company name will follow a link. It is usualy the url "
+"pointing to the start page of your company's web site."
+msgstr ""
+
+#. Type: boolean
+#. default
+#: ../templates:14001
+msgid "true"
+msgstr ""
+
+#. Type: boolean
+#. description
+#: ../templates:14002
+msgid "Delete data after purging software?"
+msgstr ""
+
+#. Type: boolean
+#. description
+#: ../templates:14002
+msgid ""
+"Purging a package usually removes all data collected by the software "
+"including the log files. Choose 'no' if you would like to keep the mysql "
+"database and the datafiles even if the netmrg package is purged sometime in "
+"the future."
+msgstr ""
+
+#. Type: note
+#. description
+#: ../templates:15002
+msgid "Package configuration note"
+msgstr ""
+
+#. Type: note
+#. description
+#: ../templates:15002
+msgid ""
+"The package has been successfully installed and configured. Point your "
+"webbrowser towards http://${site}/netmrg/ and log in as user 'admin' with "
+"the password 'nimda'. Make sure to change the password as soon as possible "
+"since it is the default password for all netmrg installations."
+msgstr ""
+
+#. Type: note
+#. description
+#: ../templates:16002
+msgid "Error while creating database"
+msgstr ""
+
+#. Type: note
+#. description
+#: ../templates:17002
+msgid "Error while creating database user"
+msgstr ""
+
+#. Type: note
+#. description
+#: ../templates:18002
+msgid "Error while creating database tables"
+msgstr ""